Changeset 7017 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java
- Timestamp:
- 2014-04-28T00:27:06+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java
r6623 r7017 27 27 private ImageIcon iconDecided; 28 28 private ImageIcon iconUndecided; 29 private DefaultComboBoxModel model;30 private JosmComboBox cbDecisionRenderer;29 private DefaultComboBoxModel<Object> model; 30 private JosmComboBox<Object> cbDecisionRenderer; 31 31 32 32 /** … … 37 37 iconDecided = ImageProvider.get("dialogs/conflict", "tagconflictresolved"); 38 38 iconUndecided = ImageProvider.get("dialogs/conflict", "tagconflictunresolved"); 39 cbDecisionRenderer = new JosmComboBox(model = new DefaultComboBoxModel()); 39 model = new DefaultComboBoxModel<>(); 40 cbDecisionRenderer = new JosmComboBox<>(model); 40 41 } 41 42
Note:
See TracChangeset
for help on using the changeset viewer.