Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java	(revision 5450)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java	(revision 5451)
@@ -5,5 +5,4 @@
 import java.awt.Font;
 
-import javax.swing.DefaultComboBoxModel;
 import javax.swing.JLabel;
 import javax.swing.JList;
@@ -34,9 +33,5 @@
 
     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);
     }
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java	(revision 5450)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java	(revision 5451)
@@ -70,5 +70,5 @@
     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,5 +83,5 @@
     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,5 +96,5 @@
     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);
     }