Changeset 2326 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java

Timestamp:

2009-10-26T22:36:54+01:00 (14 years ago)

Author:

Gubaer

Message:

Slightly improved dialogs for way combining and node merging.
Added context sensitive help.

File:

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

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.awt.Font;
 
 import javax.swing.DefaultComboBoxModel;
@@ -12 +10 @@
 public enum RelationMemberConflictDecisionType {
     /**
-     * replace the respective relation member with a member referring
-     * to the new primitive
+     * keep the respective relation member for the target primitive (the target node
+     * in a node merge operation or the target way in a combine way operation)
      */
-    REPLACE,
+    KEEP,
 
     /**
@@ -34 +32 @@
             label.setToolTipText(tr("Remove this relation member from the relation"));
             break;
-        case REPLACE:
-            label.setText(tr("Replace"));
-            label.setToolTipText(tr("Replace the way this member refers to with the combined way"));
+        case KEEP:
+            label.setText(tr("Keep"));
+            label.setToolTipText(tr("Keep this relation member for the target object"));
             break;
         case UNDECIDED:
@@ -44 +42 @@
         }
     }
-
-    static public void prepareComboBox(RelationMemberConflictDecisionType decision, JComboBox comboBox) {
-        DefaultComboBoxModel model = (DefaultComboBoxModel)comboBox.getModel();
-        model.removeAllElements();
-        switch(decision) {
-        case REMOVE:
-            model.addElement(tr("Remove"));
-            comboBox.setToolTipText(tr("Remove this relation member from the relation"));
-            comboBox.setSelectedIndex(0);
-            break;
-        case REPLACE:
-            model.addElement(tr("Replace"));
-            comboBox.setToolTipText(tr("Replace the way this member refers to with the combined way"));
-            comboBox.setSelectedIndex(0);
-            break;
-        case UNDECIDED:
-            model.addElement(tr("Undecided"));
-            comboBox.setToolTipText(tr("Not decided yet"));
-            comboBox.setSelectedIndex(0);
-            break;
-        }
-    }
 }