Changeset 7015 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - fix generics for JComboBox/JList

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java

@@ -21 +21 @@
     protected int index;        // 0-based index
     protected int defaultIndex;
-    protected Object[] entries;
+    protected String[] entries;
     protected String label;
 
@@ -33 +33 @@
      * @param defaultIndex the default index for the combo-box
      */
-    public ListProjectionChoice(String name, String id, Object[] entries, String label, int defaultIndex) {
+    public ListProjectionChoice(String name, String id, String[] entries, String label, int defaultIndex) {
         super(name, id);
         this.entries = Utils.copyArray(entries);
@@ -47 +47 @@
      * @param label a label shown left to the combo-box
      */
-    public ListProjectionChoice(String name, String id, Object[] entries, String label) {
+    public ListProjectionChoice(String name, String id, String[] entries, String label) {
         this(name, id, entries, label, 0);
     }
@@ -54 +54 @@
      * Convert 0-based index to preference value.
      */
-    protected abstract String indexToZone(int index);
+    protected abstract String indexToZone(int idx);
 
     /**
@@ -67 +67 @@
             zone = args.iterator().next();
         }
-        int index;
+        int idx;
         if (zone == null) {
-            index = defaultIndex;
+            idx = defaultIndex;
         } else {
-            index = zoneToIndex(zone);
-            if (index < 0 || index >= entries.length) {
-                index = defaultIndex;
+            idx = zoneToIndex(zone);
+            if (idx < 0 || idx >= entries.length) {
+                idx = defaultIndex;
             }
         }
-        this.index = index;
+        this.index = idx;
     }
 
     protected class CBPanel extends JPanel {
-        public JosmComboBox prefcb;
+        public JosmComboBox<String> prefcb;
 
-        public CBPanel(Object[] entries, int initialIndex, String label, final ActionListener listener) {
-            prefcb = new JosmComboBox(entries);
+        public CBPanel(String[] entries, int initialIndex, String label, final ActionListener listener) {
+            prefcb = new JosmComboBox<>(entries);
 
             prefcb.setSelectedIndex(initialIndex);
@@ -109 +109 @@
         }
         CBPanel p = (CBPanel) panel;
-        int index = p.prefcb.getSelectedIndex();
-        return Collections.singleton(indexToZone(index));
+        int idx = p.prefcb.getSelectedIndex();
+        return Collections.singleton(indexToZone(idx));
     }
-
 }