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

Timestamp:

2009-10-26T22:36:54+01:00 (15 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/RelationMemberConflictDecisionRenderer.java (modified) (4 diffs)

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

@@ -5 +5 @@
 import java.awt.Font;
 
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
@@ -14 +16 @@
 public class RelationMemberConflictDecisionRenderer extends JLabel implements TableCellRenderer, ListCellRenderer{
 
+    private JComboBox cbDecisionTypes; 
+    
     protected void resetTableRenderer() {
         setOpaque(true);
@@ -28 +32 @@
     }
 
+    public RelationMemberConflictDecisionRenderer() {
+        DefaultComboBoxModel model = new DefaultComboBoxModel();
+        cbDecisionTypes = new JComboBox(model);
+        model.addElement(RelationMemberConflictDecisionType.KEEP);
+        model.addElement(RelationMemberConflictDecisionType.REMOVE);
+        model.addElement(RelationMemberConflictDecisionType.UNDECIDED);
+        cbDecisionTypes.setRenderer(this);
+    }
 
     /* --------------------------------------------------------------------------------- */
@@ -40 +52 @@
         }
         RelationMemberConflictDecisionType decision = (RelationMemberConflictDecisionType)value;
-        RelationMemberConflictDecisionType.prepareLabel(decision, this);
-        return this;
+        cbDecisionTypes.setSelectedItem(decision);
+        return cbDecisionTypes;
     }