Changeset 8923 in josm for trunk/src/org


Ignore:
Timestamp:
2015-10-21T10:27:13+02:00 (4 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java

    r8848 r8923  
    6666            // We'll just ignore this for now. The user will still be able to close JOSM by closing all its windows.
    6767            Main.warn("Failed to register with OSX: " + ex);
     68        }
     69        // Invite users to install Java 8 if they are still with Java 7
     70        String java = System.getProperty("java.version");
     71        if (java != null && java.startsWith("1.7")) {
     72            askUpdateJava(java);
    6873        }
    6974    }
  • trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

    r8848 r8923  
    395395    }
    396396
    397     // Method kept because strings have already been translated. To enable for Java 8 migration somewhere in 2016
    398397    protected void askUpdateJava(final String version, final String url) {
    399398        GuiHelper.runInEDTAndWait(new Runnable() {
  • trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

    r8846 r8923  
    6161  */
    6262public class PlatformHookWindows extends PlatformHookUnixoid implements PlatformHook {
     63
     64    @Override
     65    public void startupHook() {
     66        // Invite users to install Java 8 if they are still with Java 7
     67        String version = System.getProperty("java.version");
     68        if (version != null && version.startsWith("1.7")) {
     69            askUpdateJava(version);
     70        }
     71    }
    6372
    6473    private static final byte[] INSECURE_PUBLIC_KEY = new byte[] {
Note: See TracChangeset for help on using the changeset viewer.