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

Timestamp:

2015-10-21T10:27:13+02:00 (9 years ago)

Author:

Don-vip

Message:

see #11390 - invite Windows and OSX users to update to Java 8

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• PlatformHookOsx.java (modified) (1 diff)
• PlatformHookUnixoid.java (modified) (1 diff)
• PlatformHookWindows.java (modified) (1 diff)

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

@@ -66 +66 @@
             // 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

@@ -395 +395 @@
     }
 
-    // Method kept because strings have already been translated. To enable for Java 8 migration somewhere in 2016
     protected void askUpdateJava(final String version, final String url) {
         GuiHelper.runInEDTAndWait(new Runnable() {

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

@@ -61 +61 @@
   */
 public class PlatformHookWindows extends PlatformHookUnixoid implements PlatformHook {
+
+    @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);
+        }
+    }
 
     private static final byte[] INSECURE_PUBLIC_KEY = new byte[] {