Changeset 5429 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java
- Timestamp:
- 2012-08-11T23:03:55+02:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java
r4072 r5429 6 6 7 7 import javax.swing.DefaultComboBoxModel; 8 import javax.swing.JComboBox;9 8 import javax.swing.JLabel; 10 9 import javax.swing.JList; … … 14 13 import javax.swing.table.TableCellRenderer; 15 14 15 import org.openstreetmap.josm.gui.widgets.JosmComboBox; 16 16 17 public class RelationMemberConflictDecisionRenderer extends JLabel implements TableCellRenderer, ListCellRenderer{ 17 18 18 private J ComboBox cbDecisionTypes;19 private JosmComboBox cbDecisionTypes; 19 20 20 21 protected void resetTableRenderer() { … … 34 35 public RelationMemberConflictDecisionRenderer() { 35 36 DefaultComboBoxModel model = new DefaultComboBoxModel(); 36 cbDecisionTypes = new J ComboBox(model);37 cbDecisionTypes = new JosmComboBox(model); 37 38 model.addElement(RelationMemberConflictDecisionType.KEEP); 38 39 model.addElement(RelationMemberConflictDecisionType.REMOVE);
Note:
See TracChangeset
for help on using the changeset viewer.