Changeset 6850 in josm

Timestamp:

2014-02-14T01:09:29+01:00 (11 years ago)

Author:

Don-vip

Message:

see #8888 - Add icedtea-web package version in status report for Debian/Ubuntu

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ShowStatusReportAction.java (modified) (3 diffs)
• tools/PlatformHookUnixoid.java (modified) (2 diffs)

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

@@ -69 +69 @@
      * @return The report header (software and system info)
      */
-    public static String getReportHeader()
-    {
+    public static String getReportHeader() {
         StringBuilder text = new StringBuilder();
         text.append(Version.getInstance().getReleaseAttributes());
@@ -87 +86 @@
         text.append("\n");
         if (Main.platform.getClass() == PlatformHookUnixoid.class) {
+            // Add Java package details for Debian/Ubuntu 
             String packageDetails = ((PlatformHookUnixoid) Main.platform).getJavaPackageDetails();
             if (packageDetails != null) {
@@ -92 +92 @@
                 text.append(packageDetails);
                 text.append("\n");
+            }
+            // Add WebStart package details for Debian/Ubuntu, if run from JNLP 
+            if (Package.getPackage("javax.jnlp") != null) {
+                String webStartDetails = ((PlatformHookUnixoid) Main.platform).getWebStartPackageDetails();
+                if (webStartDetails != null) {
+                    text.append("WebStart package: ");
+                    text.append(webStartDetails);
+                    text.append("\n");
+                }
             }
         }

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

@@ -110 +110 @@
 
     /**
+     * Determines if the distribution is Debian or Ubuntu.
+     * @return {@code true} if the distribution is Debian or Ubuntu, {@code false} otherwise
+     */
+    public static boolean isDebianOrUbuntu() {
+        try {
+            String dist = Utils.execOutput(Arrays.asList("lsb_release", "-i", "-s"));
+            return "Debian".equalsIgnoreCase(dist) || "Ubuntu".equalsIgnoreCase(dist);
+        } catch (IOException e) {
+            Main.warn(e);
+            return false;
+        }
+    }
+    
+    /**
+     * Get the package name including detailed version.
+     * @param packageName The package name
+     * @return The package name and package version if it can be identified, null otherwise
+     */
+    public String getPackageDetails(String packageName) {
+        try {
+            String version = Utils.execOutput(Arrays.asList("dpkg-query", "--show", "--showformat", "${Architecture}-${Version}", packageName));
+            return packageName + ":" + version;
+        } catch (IOException e) {
+            Main.warn(e);
+            return null;
+        }
+    }
+    
+    /**
      * Get the Java package name including detailed version.
      *
@@ -123 +152 @@
      */
     public String getJavaPackageDetails() {
-        try {
-            String dist = Utils.execOutput(Arrays.asList("lsb_release", "-i", "-s"));
-            if ("Debian".equalsIgnoreCase(dist) || "Ubuntu".equalsIgnoreCase(dist)) {
-                String javaHome = System.getProperty("java.home");
-                if ("/usr/lib/jvm/java-6-openjdk-amd64/jre".equals(javaHome) ||
-                        "/usr/lib/jvm/java-6-openjdk-i386/jre".equals(javaHome) ||
-                        "/usr/lib/jvm/java-6-openjdk/jre".equals(javaHome)) {
-                    String version = Utils.execOutput(Arrays.asList("dpkg-query", "--show", "--showformat", "${Architecture}-${Version}", "openjdk-6-jre"));
-                    return "openjdk-6-jre:" + version;
-                }
-                if ("/usr/lib/jvm/java-7-openjdk-amd64/jre".equals(javaHome) ||
-                        "/usr/lib/jvm/java-7-openjdk-i386/jre".equals(javaHome)) {
-                    String version = Utils.execOutput(Arrays.asList("dpkg-query", "--show", "--showformat", "${Architecture}-${Version}", "openjdk-7-jre"));
-                    return "openjdk-7-jre:" + version;
-                }
-            }
-        } catch (IOException e) {
-            Main.warn(e);
+        if (isDebianOrUbuntu()) {
+            String javaHome = System.getProperty("java.home");
+            if ("/usr/lib/jvm/java-6-openjdk-amd64/jre".equals(javaHome) ||
+                    "/usr/lib/jvm/java-6-openjdk-i386/jre".equals(javaHome) ||
+                    "/usr/lib/jvm/java-6-openjdk/jre".equals(javaHome)) {
+                return getPackageDetails("openjdk-6-jre");
+            }
+            if ("/usr/lib/jvm/java-7-openjdk-amd64/jre".equals(javaHome) ||
+                    "/usr/lib/jvm/java-7-openjdk-i386/jre".equals(javaHome)) {
+                return getPackageDetails("openjdk-7-jre");
+            }
+        }
+        return null;
+    }
+    
+    /**
+     * Get the Web Start package name including detailed version.
+     *
+     * Debian and Ubuntu OpenJDK packages are shipped with icedtea-web package, 
+     * but its version does not match main java package version.
+     * 
+     * Only Debian based distributions are covered at the moment.
+     * This can be extended to other distributions if needed.
+     * 
+     * Simply return {@code null} if there's no separate package for Java WebStart.
+     *
+     * @return The package name and package version if it can be identified, null otherwise
+     */
+    public String getWebStartPackageDetails() {
+        if (isDebianOrUbuntu()) {
+            String javaHome = System.getProperty("java.home");
+            if (javaHome != null && javaHome.contains("openjdk")) {
+                return getPackageDetails("icedtea-netx");
+            }
         }
         return null;