Changeset 8777 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2015-09-21T23:48:29+02:00 (9 years ago)

Author:

Don-vip

Message:

Basic Java 9 support: make code compile, and Linux scripts detect it

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java

@@ -108 +108 @@
             E oldPrototype = getPrototypeDisplayValue();
             // Get internal JList to directly call the renderer
-            JList<E> list = getList();
+            @SuppressWarnings("rawtypes")
+            JList list = getList();
             try {
                 // Index to give to renderer
@@ -117 +118 @@
                         // but not with TaggingPreset custom renderer that return a dummy height if index is equal to -1
                         // So we explicitely call the renderer by simulating a correct index for the current value
+                        @SuppressWarnings("unchecked")
                         Component c = getRenderer().getListCellRendererComponent(list, value, i, true, true);
                         if (c != null) {
@@ -139 +141 @@
 
     @SuppressWarnings("unchecked")
-    protected final JList<E> getList() {
+    protected final JList<Object> getList() {
         for (int i = 0; i < getUI().getAccessibleChildrenCount(this); i++) {
             Accessible child = getUI().getAccessibleChild(this, i);
@@ -158 +160 @@
             // If possible, adjust the maximum number of items with the real height of items
             // It is not granted this works on every platform (tested OK on Windows)
-            JList<E> list = getList();
+            JList<Object> list = getList();
             if (list != null) {
                 if (!prototype.equals(list.getPrototypeCellValue())) {