Changeset 10058 in josm

Timestamp:

2016-03-27T14:28:02+02:00 (9 years ago)

Author:

Don-vip

Message:

see #11924 - Package.getPackage is deprecated in Java 9

File:

• trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -59 +59 @@
         if (source != null && target.length() < source.length() && param[1].startsWith(source)) {
             it.set(param[0] + '=' + param[1].replace(source, target));
+        }
+    }
+
+    private static boolean isRunningJavaWebStart() {
+        try {
+            // See http://stackoverflow.com/a/16200769/2257172
+            return Class.forName("javax.jnlp.ServiceManager") != null;
+        } catch (ClassNotFoundException e) {
+            return false;
         }
     }
@@ -90 +99 @@
             }
             // Add WebStart package details if run from JNLP
-            if (Package.getPackage("javax.jnlp") != null) {
+            if (isRunningJavaWebStart()) {
                 String webStartDetails = ((PlatformHookUnixoid) Main.platform).getWebStartPackageDetails();
                 if (webStartDetails != null) {