Changeset 10580 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-07-21T01:57:41+02:00 (9 years ago)

Author:

Don-vip

Message:

see #11390 - switch to Java 8

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ImageProvider.java (modified) (3 diffs)
• PlatformHookOsx.java (modified) (1 diff)
• PlatformHookUnixoid.java (modified) (5 diffs)
• PlatformHookWindows.java (modified) (1 diff)

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

@@ -1026 +1026 @@
                     // This can be removed if someday Oracle fixes https://bugs.openjdk.java.net/browse/JDK-6788458
                     // CHECKSTYLE.OFF: LineLength
-                    // hg.openjdk.java.net/jdk7u/jdk7u/jdk/file/828c4fedd29f/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java#l656
+                    // hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/dc4322602480/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java#l656
                     // CHECKSTYLE.ON: LineLength
                     Image img = read(new ByteArrayInputStream(bytes), false, true);
@@ -1151 +1151 @@
                 // See #10479: for PNG files, always enforce transparency to be sure tNRS chunk is used even not in paletted mode
                 // This can be removed if someday Oracle fixes https://bugs.openjdk.java.net/browse/JDK-6788458
-                // hg.openjdk.java.net/jdk7u/jdk7u/jdk/file/828c4fedd29f/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java#l656
+                // hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/dc4322602480/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java#l656
                 img = read(path, false, true);
                 if (Main.isDebugEnabled() && isTransparencyForced(img)) {
@@ -1809 +1809 @@
      * @return the {@code TransparentColor} defined in image reader metadata, or {@code null}
      * @throws IOException if an error occurs during reading
-     * @see <a href="http://docs.oracle.com/javase/7/docs/api/javax/imageio/metadata/doc-files/standard_metadata.html">javax_imageio_1.0 metadata</a>
+     * @see <a href="http://docs.oracle.com/javase/8/docs/api/javax/imageio/metadata/doc-files/standard_metadata.html">javax_imageio_1.0 metadata</a>
      * @since 7499
      */

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

@@ -73 +73 @@
             // We'll just ignore this for now. The user will still be able to close JOSM by closing all its windows.
             Main.warn("Failed to register with OSX: " + ex);
-        }
-        // Invite users to install Java 8 if they are still with Java 7
-        String java = System.getProperty("java.version");
-        if (java != null && java.startsWith("1.7")) {
-            askUpdateJava(java);
         }
     }

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

@@ -113 +113 @@
     @Override
     public void startupHook() {
-        if (isDebianOrUbuntu()) {
-            // Invite users to install Java 8 if they are still with Java 7 and using a compatible distrib (Debian >= 8 or Ubuntu >= 15.10)
-            String java = System.getProperty("java.version");
-            String os = getOSDescription();
-            if (java != null && java.startsWith("1.7") && os != null && (
-                    os.startsWith("Linux Debian GNU/Linux 8") || os.matches("^Linux Ubuntu 1[567].*"))) {
-                String url;
-                // apturl does not exist on Debian (see #8465)
-                if (os.startsWith("Linux Debian")) {
-                    url = "https://packages.debian.org/jessie-backports/openjdk-8-jre";
-                } else if (getPackageDetails("apturl") != null) {
-                    url = "apt://openjdk-8-jre";
-                } else {
-                    url = "http://packages.ubuntu.com/xenial/openjdk-8-jre";
-                }
-                askUpdateJava(java, url);
-            }
-        }
+        // Do nothing
     }
 
@@ -272 +255 @@
     public String getJavaPackageDetails() {
         String home = System.getProperty("java.home");
-        if (home.contains("java-7-openjdk") || home.contains("java-1.7.0-openjdk")) {
-            return getPackageDetails("openjdk-7-jre", "java-1_7_0-openjdk", "java-1.7.0-openjdk");
+        if (home.contains("java-8-openjdk") || home.contains("java-1.8.0-openjdk")) {
+            return getPackageDetails("openjdk-8-jre", "java-1_8_0-openjdk", "java-1.8.0-openjdk");
+        } else if (home.contains("java-9-openjdk") || home.contains("java-1.9.0-openjdk")) {
+            return getPackageDetails("openjdk-9-jre", "java-1_9_0-openjdk", "java-1.9.0-openjdk");
         } else if (home.contains("icedtea")) {
             return getPackageDetails("icedtea-bin");
@@ -434 +419 @@
     }
 
-    protected void askUpdateJava(String version) {
-        if (!GraphicsEnvironment.isHeadless()) {
-            askUpdateJava(version, "https://www.java.com/download");
-        }
-    }
-
+    // Method unused, but kept for translation already done. To reuse during Java 9 migration
     protected void askUpdateJava(final String version, final String url) {
         GuiHelper.runInEDTAndWait(new Runnable() {
@@ -449 +429 @@
                         new String[]{tr("OK"), tr("Update Java"), tr("Cancel")});
                 // Check if the dialog has not already been permanently hidden by user
-                if (!ed.toggleEnable("askUpdateJava8").toggleCheckState()) {
+                if (!ed.toggleEnable("askUpdateJava9").toggleCheckState()) {
                     ed.setButtonIcons(new String[]{"ok", "java", "cancel"}).setCancelButton(3);
                     ed.setMinimumSize(new Dimension(480, 300));
@@ -457 +437 @@
                     if ("Sun Microsystems Inc.".equals(System.getProperty("java.vendor")) && !isOpenJDK()) {
                         content.append("<b>").append(tr("This version is no longer supported by {0} since {1} and is not recommended for use.",
-                                "Oracle", tr("April 2015"))).append("</b><br><br>");
+                                "Oracle", tr("April 2015"))).append("</b><br><br>"); // TODO: change date once Java 8 EOL is announced
                     }
                     content.append("<b>")

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

@@ -64 +64 @@
     @Override
     public void startupHook() {
-        // Invite users to install Java 8 if they are still with Java 7
-        String version = System.getProperty("java.version");
-        if (version != null && version.startsWith("1.7")) {
-            askUpdateJava(version);
-        }
+        // Do nothing
     }