Changeset 7015 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2014-04-27T17:34:22+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - fix generics for JComboBox/JList

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/tags

Files:

• MultiValueCellEditor.java (modified) (4 diffs)
• RelationMemberConflictDecisionEditor.java (modified) (1 diff)

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

@@ -48 +48 @@
 
     /** the combo box used as editor */
-    private JosmComboBox editor;
-    private DefaultComboBoxModel editorModel;
+    private JosmComboBox<Object> editor;
+    private DefaultComboBoxModel<Object> editorModel;
     private CopyOnWriteArrayList<NavigationListener> listeners;
 
@@ -78 +78 @@
      */
     public MultiValueCellEditor() {
-        editorModel = new DefaultComboBoxModel();
-        editor = new JosmComboBox(editorModel) {
+        editorModel = new DefaultComboBoxModel<>();
+        editor = new JosmComboBox<Object>(editorModel) {
             @Override
             public void processKeyEvent(KeyEvent e) {
@@ -172 +172 @@
      *
      */
-    private static class EditorCellRenderer extends JLabel implements ListCellRenderer {
+    private static class EditorCellRenderer extends JLabel implements ListCellRenderer<Object> {
 
         /**
@@ -224 +224 @@
 
         @Override
-        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+        public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
             renderColors(isSelected);
             renderValue(value);

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

@@ -12 +12 @@
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 
-public class RelationMemberConflictDecisionEditor extends JosmComboBox implements TableCellEditor {
+public class RelationMemberConflictDecisionEditor extends JosmComboBox<RelationMemberConflictDecisionType> implements TableCellEditor {
 
     /**