Changeset 8777 in josm

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

Location:

trunk

Files:

• linux/latest/usr/bin/josm-latest (modified) (2 diffs)
• linux/tested/usr/bin/josm (modified) (2 diffs)
• src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java (modified) (1 diff)
• src/org/openstreetmap/josm/command/DeleteCommand.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java (modified) (4 diffs)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (1 diff)

trunk/linux/latest/usr/bin/josm-latest

@@ -12 +12 @@
 # If OpenJDK is only available headless, do not try it
 if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then
+        JAVA9_CMDS="/usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java"
         JAVA8_CMDS="/usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java"
         JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-openjdk/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-7-oracle/bin/java"
 else
+        JAVA9_CMDS="/usr/lib/jvm/java-9-oracle/bin/java"
         JAVA8_CMDS="/usr/lib/jvm/java-8-oracle/bin/java"
         JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/bin/java"
@@ -45 +47 @@
 done
 
+for jcmd in $JAVA9_CMDS; do
+        if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
+        JAVACMD="$jcmd"
+    fi
+done
+
+for jcmd in $JAVA9_CMDS; do
+    if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
+        JAVACMD="$jcmd"
+    fi
+done
+
 if [ "$JAVACMD" ]; then
     echo "Using $JAVACMD to execute josm-latest." || true

trunk/linux/tested/usr/bin/josm

@@ -12 +12 @@
 # If OpenJDK is only available headless, do not try it
 if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then
+        JAVA9_CMDS="/usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java"
         JAVA8_CMDS="/usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java"
         JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-openjdk/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-7-oracle/bin/java"
 else
+        JAVA9_CMDS="/usr/lib/jvm/java-9-oracle/bin/java"
         JAVA8_CMDS="/usr/lib/jvm/java-8-oracle/bin/java"
         JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/bin/java"
@@ -45 +47 @@
 done
 
+for jcmd in $JAVA9_CMDS; do
+        if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
+        JAVACMD="$jcmd"
+    fi
+done
+
+for jcmd in $JAVA9_CMDS; do
+    if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
+        JAVACMD="$jcmd"
+    fi
+done
+
 if [ "$JAVACMD" ]; then
     echo "Using $JAVACMD to execute josm." || true

trunk/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java

@@ -24 +24 @@
             return Collections.<Relation>emptySet();
         } else {
-            return new SubclassFilteredCollection<>(
+            return new SubclassFilteredCollection<OsmPrimitive, Relation>(
                     primitives, OsmPrimitive.relationPredicate);
         }

trunk/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java

@@ -25 +25 @@
      * All primitives, that are affected with this command.
      */
-    private final List<OsmPrimitive> objects;
+    private final List<? extends OsmPrimitive> objects;
     /**
      * The key that is subject to change.

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -369 +369 @@
             return null;
 
-        Set<OsmPrimitive> primitivesToDelete = new HashSet<>(selection);
+        Set<OsmPrimitive> primitivesToDelete = new HashSet<OsmPrimitive>(selection);
 
         Collection<Relation> relationsToDelete = Utils.filteredCollection(primitivesToDelete, Relation.class);

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java

@@ -381 +381 @@
     public Command fixError(TestError testError) {
         if (!isFixable(testError)) return null;
-        Collection<OsmPrimitive> sel = new LinkedList<>(testError.getPrimitives());
+        Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>(testError.getPrimitives());
         Set<Node> nodes = new LinkedHashSet<>(OsmPrimitive.getFilteredList(sel, Node.class));
 

trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

@@ -302 +302 @@
                 }
             }
-            List<OsmPrimitive> newPrimitives = new ArrayList<>(primitives);
+            List<OsmPrimitive> newPrimitives = new ArrayList<OsmPrimitive>(primitives);
             newPrimitives.add(0, r);
             error.setPrimitives(newPrimitives);

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())) {

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -131 +131 @@
 
     public static <T> Collection<T> filter(Collection<? extends T> collection, Predicate<? super T> predicate) {
-        return new FilteredCollection<>(collection, predicate);
+        return new FilteredCollection<T>(collection, predicate);
     }