Changeset 7743 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java

Timestamp:

2014-11-23T23:54:40+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #10775 - allow to sum all numeric values as conflict resolution of capacity

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java (modified) (4 diffs)

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

@@ -66 +66 @@
                         setBackground(ConflictColors.BGCOLOR_TAG_KEEP_ALL.get());
                         break;
+                    case SUM_ALL_NUMERIC:
+                        setForeground(ConflictColors.FGCOLOR_TAG_SUM_ALL_NUM.get());
+                        setBackground(ConflictColors.BGCOLOR_TAG_SUM_ALL_NUM.get());
+                        break;
                     default:
-                        Main.error("Unknown decision type: "+decision.getDecisionType());
+                        Main.error("Unknown decision type in renderColors(): "+decision.getDecisionType());
                     }
                 } else {
@@ -86 +90 @@
             cbDecisionRenderer.setSelectedIndex(0);
             break;
-        case KEEP_ONE:
-            model.addElement(decision.getChosenValue());
-            cbDecisionRenderer.setFont(getFont());
-            cbDecisionRenderer.setSelectedIndex(0);
-            break;
         case KEEP_NONE:
             model.addElement(tr("deleted"));
@@ -96 +95 @@
             cbDecisionRenderer.setSelectedIndex(0);
             break;
+        case KEEP_ONE:
         case KEEP_ALL:
+        case SUM_ALL_NUMERIC:
             model.addElement(decision.getChosenValue());
             cbDecisionRenderer.setFont(getFont());
             cbDecisionRenderer.setSelectedIndex(0);
             break;
+        default:
+            Main.error("Unknown decision type in renderValue(): "+decision.getDecisionType());
         }
     }
@@ -108 +111 @@
      */
     protected void renderToolTipText(MultiValueResolutionDecision decision) {
-        String toolTipText;
+        String toolTipText = null;
         switch (decision.getDecisionType()) {
         case UNDECIDED:
             toolTipText = tr("Please decide which values to keep");
-            setToolTipText(toolTipText);
-            cbDecisionRenderer.setToolTipText(toolTipText);
             break;
         case KEEP_ONE:
             toolTipText = tr("Value ''{0}'' is going to be applied for key ''{1}''", decision.getChosenValue(), decision.getKey());
-            setToolTipText(toolTipText);
-            cbDecisionRenderer.setToolTipText(toolTipText);
+            break;
+        case SUM_ALL_NUMERIC:
+            toolTipText = tr("All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''", decision.getChosenValue(), decision.getKey());
             break;
         case KEEP_NONE:
             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:
             toolTipText = tr("All values joined as ''{0}'' are going to be applied for key ''{1}''", decision.getChosenValue(), decision.getKey());
-            setToolTipText(toolTipText);
-            cbDecisionRenderer.setToolTipText(toolTipText);
             break;
         }
+        setToolTipText(toolTipText);
+        cbDecisionRenderer.setToolTipText(toolTipText);
     }