Changeset 6616 in josm

Timestamp:

2014-01-03T22:17:50+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #4073 - colour coding of conflicting tags/memberships in way combining dialog

Location:

trunk/src/org/openstreetmap/josm/gui/conflict

Files:

• ConflictColors.java (modified) (2 diffs)
• pair/nodes/NodeListTableCellRenderer.java (modified) (1 diff)
• pair/relation/RelationMemberTableCellRenderer.java (modified) (2 diffs)
• tags/MultiValueCellRenderer.java (modified) (6 diffs)
• tags/RelationMemberConflictDecisionRenderer.java (modified) (2 diffs)
• tags/RelationMemberConflictResolver.java (modified) (2 diffs)
• tags/RelationMemberConflictResolverColumnModel.java (modified) (5 diffs)
• tags/TagConflictResolver.java (modified) (1 diff)
• tags/TagConflictResolverColumnModel.java (modified) (1 diff)
• tags/TagConflictResolverModel.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java

@@ -25 +25 @@
     BGCOLOR_EMPTY_ROW(marktr("Conflict background: empty row"), new Color(234,234,234)),
     BGCOLOR_FROZEN(marktr("Conflict background: frozen"), new Color(234,234,234)),
-    BGCOLOR_PARTICIPAING_IN_COMPARISON(marktr("Conflict background: in comparison"), Color.black),
-    FGCOLOR_PARTICIPAING_IN_COMPARISON(marktr("Conflict foreground: in comparison"), Color.white),
+    BGCOLOR_PARTICIPATING_IN_COMPARISON(marktr("Conflict background: in comparison"), Color.black),
+    FGCOLOR_PARTICIPATING_IN_COMPARISON(marktr("Conflict foreground: in comparison"), Color.white),
     BGCOLOR(marktr("Conflict background"), Color.white),
     FGCOLOR(marktr("Conflict foreground"), Color.black),
@@ -32 +32 @@
     BGCOLOR_NOT_IN_OPPOSITE(marktr("Conflict background: not in opposite"), new Color(255,197,197)),
     BGCOLOR_IN_OPPOSITE(marktr("Conflict background: in opposite"), new Color(255,234,213)),
-    BGCOLOR_SAME_POSITION_IN_OPPOSITE(marktr("Conflict background: same position in opposite"), new Color(217,255,217));
+    BGCOLOR_SAME_POSITION_IN_OPPOSITE(marktr("Conflict background: same position in opposite"), new Color(217,255,217)),
+
+    BGCOLOR_TAG_KEEP_ONE (marktr("Conflict background: keep one tag"), new Color(217,255,217)),
+    FGCOLOR_TAG_KEEP_ONE (marktr("Conflict foreground: keep one tag"), Color.black),
+    BGCOLOR_TAG_KEEP_NONE(marktr("Conflict background: drop tag"), Color.lightGray),
+    FGCOLOR_TAG_KEEP_NONE(marktr("Conflict foreground: drop tag"), Color.black),
+    BGCOLOR_TAG_KEEP_ALL (marktr("Conflict background: keep all tags"), new Color(255,234,213)),
+    FGCOLOR_TAG_KEEP_ALL (marktr("Conflict foreground: keep all tags"), Color.black),
+
+    BGCOLOR_MEMBER_KEEP  (marktr("Conflict background: keep member"), new Color(217,255,217)),
+    FGCOLOR_MEMBER_KEEP  (marktr("Conflict foreground: keep member"), Color.black),
+    BGCOLOR_MEMBER_REMOVE(marktr("Conflict background: remove member"), Color.lightGray),
+    FGCOLOR_MEMBER_REMOVE(marktr("Conflict foreground: remove member"), Color.black);
 
     private final String name;

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java

@@ -146 +146 @@
             setBackground(ConflictColors.BGCOLOR_FROZEN.get());
         } else if (model.isParticipatingInCurrentComparePair()) {
-            setBackground(ConflictColors.BGCOLOR_PARTICIPAING_IN_COMPARISON.get());
-            setForeground(ConflictColors.FGCOLOR_PARTICIPAING_IN_COMPARISON.get());
+            setBackground(ConflictColors.BGCOLOR_PARTICIPATING_IN_COMPARISON.get());
+            setForeground(ConflictColors.FGCOLOR_PARTICIPATING_IN_COMPARISON.get());
         }
         setText(Integer.toString(row+1));

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java

@@ -87 +87 @@
                 bgc = ConflictColors.BGCOLOR_FROZEN.get();
             } else if (model.isParticipatingInCurrentComparePair()) {
-                bgc = ConflictColors.BGCOLOR_PARTICIPAING_IN_COMPARISON.get();
+                bgc = ConflictColors.BGCOLOR_PARTICIPATING_IN_COMPARISON.get();
             } else if (isSelected) {
                 bgc = ConflictColors.BGCOLOR_SELECTED.get();
@@ -116 +116 @@
         Color fgc = ConflictColors.FGCOLOR.get();
         if (col == 0 && model.isParticipatingInCurrentComparePair() && ! model.getListMergeModel().isFrozen()) {
-            fgc = ConflictColors.FGCOLOR_PARTICIPAING_IN_COMPARISON.get();
+            fgc = ConflictColors.FGCOLOR_PARTICIPATING_IN_COMPARISON.get();
         }
         setForeground(fgc);

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java

@@ -29 +29 @@
     private JosmComboBox cbDecisionRenderer;
 
+    /**
+     * Constructs a new {@code MultiValueCellRenderer}.
+     */
     public MultiValueCellRenderer() {
         setOpaque(true);
@@ -36 +39 @@
     }
 
-    protected void renderColors(MultiValueResolutionDecision decision, boolean selected) {
+    protected void renderColors(MultiValueResolutionDecision decision, boolean selected, boolean conflict) {
         if (selected) {
             setForeground(UIManager.getColor("Table.selectionForeground"));
             setBackground(UIManager.getColor("Table.selectionBackground"));
-        } else{
-            switch(decision.getDecisionType()) {
+        } else {
+            switch (decision.getDecisionType()) {
             case UNDECIDED:
-                setForeground(UIManager.getColor("Table.foreground"));
+                setForeground(ConflictColors.FGCOLOR_UNDECIDED.get());
                 setBackground(ConflictColors.BGCOLOR_UNDECIDED.get());
                 break;
             case KEEP_NONE:
-                setForeground(UIManager.getColor("Panel.foreground"));
-                setBackground(UIManager.getColor("Panel.background"));
+                setForeground(ConflictColors.FGCOLOR_TAG_KEEP_NONE.get());
+                setBackground(ConflictColors.BGCOLOR_TAG_KEEP_NONE.get());
                 break;
             default:
-                setForeground(UIManager.getColor("Table.foreground"));
-                setBackground(UIManager.getColor("Table.background"));
+                if (conflict) {
+                    switch (decision.getDecisionType()) {
+                    case KEEP_ONE:
+                        setForeground(ConflictColors.FGCOLOR_TAG_KEEP_ONE.get());
+                        setBackground(ConflictColors.BGCOLOR_TAG_KEEP_ONE.get());
+                        break;
+                    case KEEP_ALL:
+                        setForeground(ConflictColors.FGCOLOR_TAG_KEEP_ALL.get());
+                        setBackground(ConflictColors.BGCOLOR_TAG_KEEP_ALL.get());
+                        break;
+                    }
+                } else {
+                    setForeground(UIManager.getColor("Table.foreground"));
+                    setBackground(UIManager.getColor("Table.background"));
+                }
                 break;
             }
@@ -60 +76 @@
     protected void renderValue(MultiValueResolutionDecision decision) {
         model.removeAllElements();
-        switch(decision.getDecisionType()) {
+        switch (decision.getDecisionType()) {
         case UNDECIDED:
             model.addElement(tr("Choose a value"));
@@ -88 +104 @@
      */
     protected void renderToolTipText(MultiValueResolutionDecision decision) {
-        switch(decision.getDecisionType()) {
+        String toolTipText;
+        switch (decision.getDecisionType()) {
         case UNDECIDED:
-        {
-            String toolTipText = tr("Please decide which values to keep");
+            toolTipText = tr("Please decide which values to keep");
             setToolTipText(toolTipText);
             cbDecisionRenderer.setToolTipText(toolTipText);
             break;
-        }
         case KEEP_ONE:
-        {
-            String toolTipText = tr("Value ''{0}'' is going to be applied for key ''{1}''", decision.getChosenValue(), decision.getKey());
+            toolTipText = tr("Value ''{0}'' is going to be applied for key ''{1}''", decision.getChosenValue(), decision.getKey());
             setToolTipText(toolTipText);
             cbDecisionRenderer.setToolTipText(toolTipText);
             break;
-        }
         case KEEP_NONE:
-        {
-            String toolTipText = tr("The key ''{0}'' and all its values are going to be removed", decision.getKey());
+            toolTipText = tr("The key ''{0}'' and all its values are going to be removed", decision.getKey());
             setToolTipText(toolTipText);
             cbDecisionRenderer.setToolTipText(toolTipText);
             break;
-        }
         case KEEP_ALL:
-            String toolTipText = tr("All values joined as ''{0}'' are going to be applied for key ''{1}''", decision.getChosenValue(), decision.getKey());
+            toolTipText = tr("All values joined as ''{0}'' are going to be applied for key ''{1}''", decision.getChosenValue(), decision.getKey());
             setToolTipText(toolTipText);
             cbDecisionRenderer.setToolTipText(toolTipText);
@@ -125 +136 @@
 
     @Override
-    public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
-            int row, int column) {
+    public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
 
         reset();
@@ -133 +143 @@
 
         MultiValueResolutionDecision decision = (MultiValueResolutionDecision)value;
-        renderColors(decision,isSelected);
+        TagConflictResolverModel model = (TagConflictResolverModel) table.getModel();
+        boolean conflict = model.getKeysWithConflicts().contains(model.getKey(row));
+        renderColors(decision, isSelected, conflict);
         renderToolTipText(decision);
         switch(column) {

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 
-public class RelationMemberConflictDecisionRenderer extends JLabel implements TableCellRenderer, ListCellRenderer{
+public class RelationMemberConflictDecisionRenderer extends JLabel implements TableCellRenderer, ListCellRenderer {
 
     private JosmComboBox cbDecisionTypes;
@@ -32 +32 @@
     }
 
+    /**
+     * Constructs a new {@code RelationMemberConflictDecisionRenderer}.
+     */
     public RelationMemberConflictDecisionRenderer() {
         cbDecisionTypes = new JosmComboBox(RelationMemberConflictDecisionType.values());

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java

@@ -115 +115 @@
     }
 
+    /**
+     * Constructs a new {@code RelationMemberConflictResolver}.
+     */
     public RelationMemberConflictResolver() {
         build();
     }
 
+    /**
+     * Initializes for way combining.
+     */
     public void initForWayCombining() {
-        lblHeader.setText(tr("<html>The combined ways are members in one ore more relations. "
+        lblHeader.setText(tr("<html>The combined ways are members in one or more relations. "
                 + "Please decide whether you want to <strong>keep</strong> these memberships "
                 + "for the combined way or whether you want to <strong>remove</strong> them.<br>"
@@ -130 +136 @@
     }
 
+    /**
+     * Initializes for node merging.
+     */
     public void initForNodeMerging() {
-        lblHeader.setText(tr("<html>The merged nodes are members in one ore more relations. "
+        lblHeader.setText(tr("<html>The merged nodes are members in one or more relations. "
                 + "Please decide whether you want to <strong>keep</strong> these memberships "
                 + "for the target node or whether you want to <strong>remove</strong> them.<br>"

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Component;
+
+import javax.swing.JTable;
+import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.DefaultTableColumnModel;
+import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.conflict.ConflictColors;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 
-public class RelationMemberConflictResolverColumnModel extends DefaultTableColumnModel{
+public class RelationMemberConflictResolverColumnModel extends DefaultTableColumnModel {
 
+    private static Component setColors(Component comp, JTable table, boolean isSelected, int row) {
+        RelationMemberConflictResolverModel model = (RelationMemberConflictResolverModel) table.getModel();
+        
+        if (!isSelected && comp != null) {
+            switch (model.getDecision(row).getDecision()) {
+            case UNDECIDED:
+                comp.setForeground(ConflictColors.FGCOLOR_UNDECIDED.get());
+                comp.setBackground(ConflictColors.BGCOLOR_UNDECIDED.get());
+                break;
+            case KEEP:
+                comp.setForeground(ConflictColors.FGCOLOR_MEMBER_KEEP.get());
+                comp.setBackground(ConflictColors.BGCOLOR_MEMBER_KEEP.get());
+                break;
+            case REMOVE:
+                comp.setForeground(ConflictColors.FGCOLOR_MEMBER_REMOVE.get());
+                comp.setBackground(ConflictColors.BGCOLOR_MEMBER_REMOVE.get());
+                break;
+            }
+        }
+        return comp;
+    }
+    
     protected void createColumns() {
-        OsmPrimitivRenderer primitiveRenderer = new OsmPrimitivRenderer();
+        final DefaultTableCellRenderer defaultTableCellRenderer = new DefaultTableCellRenderer();
+        
+        OsmPrimitivRenderer primitiveRenderer = new OsmPrimitivRenderer() {
+            @Override
+            public Component getTableCellRendererComponent(JTable table,
+                    Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+                return setColors(super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column),
+                        table, isSelected, row);
+            }
+        };
+        
+        TableCellRenderer tableRenderer = new TableCellRenderer() {
+            @Override
+            public Component getTableCellRendererComponent(JTable table, Object value,
+                    boolean isSelected, boolean hasFocus, int row, int column) {
+                return setColors(defaultTableCellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column),
+                        table, isSelected, row);
+            }
+        };
+        
         AutoCompletingTextField roleEditor = new AutoCompletingTextField();
         RelationMemberConflictDecisionRenderer decisionRenderer = new RelationMemberConflictDecisionRenderer();
@@ -35 +82 @@
         col.setWidth(40);
         col.setPreferredWidth(40);
+        col.setCellRenderer(tableRenderer);
         col.setMaxWidth(50);
         addColumn(col);
@@ -42 +90 @@
         col.setHeaderValue(tr("Role"));
         col.setResizable(true);
+        col.setCellRenderer(tableRenderer);
         col.setCellEditor(roleEditor);
         col.setWidth(50);
@@ -55 +104 @@
         col.setPreferredWidth(100);
         addColumn(col);
+        
         // column 4 - New Way
         col = new TableColumn(4);
@@ -67 +117 @@
     }
 
+    /**
+     * Constructs a new {@code RelationMemberConflictResolverColumnModel}.
+     */
     public RelationMemberConflictResolverColumnModel() {
         createColumns();

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java

@@ -92 +92 @@
     }
 
+    /**
+     * Constructs a new {@code TagConflictResolver}.
+     */
     public TagConflictResolver() {
         this.model = new TagConflictResolverModel();

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java

@@ -40 +40 @@
     }
 
+    /**
+     * Constructs a new {@code TagConflictResolverColumnModel}.
+     */
     public TagConflictResolverColumnModel() {
         createColumns();

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java

@@ -137 +137 @@
         rebuild();
     }
+    
+    /**
+     * Returns the OSM key at the given row.
+     * @param row The table row
+     * @return the OSM key at the given row.
+     * @since 6616
+     */
+    public final String getKey(int row) {
+        return displayedKeys.get(row);
+    }
 
     @Override
@@ -146 +156 @@
     @Override
     public Object getValueAt(int row, int column) {
-        return decisions.get(displayedKeys.get(row));
+        return getDecision(row);
     }
 
@@ -156 +166 @@
     @Override
     public void setValueAt(Object value, int row, int column) {
-        MultiValueResolutionDecision decision = decisions.get(displayedKeys.get(row));
+        MultiValueResolutionDecision decision = getDecision(row);
         if (value instanceof String) {
             decision.keepOne((String)value);
@@ -214 +224 @@
     }
 
+    /**
+     * Returns the conflict resolution decision at the given row.
+     * @param row The table row
+     * @return the conflict resolution decision at the given row.
+     */
     public MultiValueResolutionDecision getDecision(int row) {
-        return decisions.get(displayedKeys.get(row));
+        return decisions.get(getKey(row));
     }
 
@@ -254 +269 @@
         rebuild();
     }
-
+    
+    /**
+     * Returns the set of keys in conflict.
+     * @return the set of keys in conflict.
+     * @since 6616
+     */
+    public final Set<String> getKeysWithConflicts() {
+        return new HashSet<String>(keysWithConflicts);
+    }
 }