Changeset 6951 in josm for trunk/src/org

Timestamp:

2014-03-31T15:03:38+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9879 - make sure to not mention Oracle for OpenJDK-based JVMs

File:

• trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (modified) (4 diffs)

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

@@ -45 +45 @@
             String os = getOSDescription();
             if (java != null && java.startsWith("1.6") && os != null && (
-                    os.startsWith("Linux Debian GNU/Linux 7") || 
+                    os.startsWith("Linux Debian GNU/Linux 7") ||
                     os.startsWith("Linux Ubuntu 12") || os.startsWith("Linux Ubuntu 13") || os.startsWith("Linux Ubuntu 14"))) {
                 askUpdateJava(java, "apt://openjdk-7-jre");
@@ -134 +134 @@
 
     /**
+     * Determines if the JVM is OpenJDK-based.
+     * @return {@code true} if {@code java.home} contains "openjdk", {@code false} otherwise
+     * @since 6951
+     */
+    public static boolean isOpenJDK() {
+        String javaHome = System.getProperty("java.home");
+        return javaHome != null && javaHome.contains("openjdk");
+    }
+
+    /**
      * Get the package name including detailed version.
      * @param packageName The package name
@@ -191 +201 @@
      */
     public String getWebStartPackageDetails() {
-        if (isDebianOrUbuntu()) {
-            String javaHome = System.getProperty("java.home");
-            if (javaHome != null && javaHome.contains("openjdk")) {
-                return getPackageDetails("icedtea-netx");
-            }
+        if (isDebianOrUbuntu() && isOpenJDK()) {
+            return getPackageDetails("icedtea-netx");
         }
         return null;
@@ -350 +357 @@
                 ed.setIcon(JOptionPane.WARNING_MESSAGE);
                 String content = tr("You are running version {0} of Java.", "<b>"+version+"</b>")+"<br><br>";
-                if ("Sun Microsystems Inc.".equals(System.getProperty("java.vendor"))) {
-                    content += "<b>"+tr("This version is no longer supported by {0} since {1} and is not recommended for use.", 
+                if ("Sun Microsystems Inc.".equals(System.getProperty("java.vendor")) && !isOpenJDK()) {
+                    content += "<b>"+tr("This version is no longer supported by {0} since {1} and is not recommended for use.",
                             "Oracle", tr("February 2013"))+"</b><br><br>";
                 }