Changeset 5451 in josm for trunk

Timestamp:

2012-08-18T18:18:04+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7978 - Merging nodes and upload were broken due to improper combobox initialization

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• conflict/tags/RelationMemberConflictDecisionRenderer.java (modified) (2 diffs)
• widgets/JosmComboBox.java (modified) (3 diffs)

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

@@ -5 +5 @@
 import java.awt.Font;
 
-import javax.swing.DefaultComboBoxModel;
 import javax.swing.JLabel;
 import javax.swing.JList;
@@ -34 +33 @@
 
     public RelationMemberConflictDecisionRenderer() {
-        DefaultComboBoxModel model = new DefaultComboBoxModel();
-        cbDecisionTypes = new JosmComboBox(model);
-        model.addElement(RelationMemberConflictDecisionType.KEEP);
-        model.addElement(RelationMemberConflictDecisionType.REMOVE);
-        model.addElement(RelationMemberConflictDecisionType.UNDECIDED);
+        cbDecisionTypes = new JosmComboBox(RelationMemberConflictDecisionType.values());
         cbDecisionTypes.setRenderer(this);
     }

trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java

@@ -70 +70 @@
     public JosmComboBox(ComboBoxModel aModel) {
         super(aModel);
-        init(aModel != null && aModel.getSize() > 0 ? aModel.getElementAt(0) : DEFAULT_PROTOTYPE_DISPLAY_VALUE);
+        init(aModel != null && aModel.getSize() > 0 ? aModel.getElementAt(0) : null);
     }
 
@@ -83 +83 @@
     public JosmComboBox(Object[] items) {
         super(items);
-        init(items != null && items.length > 0 ? items[0] : DEFAULT_PROTOTYPE_DISPLAY_VALUE);
+        init(items != null && items.length > 0 ? items[0] : null);
     }
 
@@ -96 +96 @@
     public JosmComboBox(Vector<?> items) {
         super(items);
-        init(items != null && !items.isEmpty() ? items.get(0) : DEFAULT_PROTOTYPE_DISPLAY_VALUE);
+        init(items != null && !items.isEmpty() ? items.get(0) : null);
     }