Changeset 5850 in josm

Timestamp:

2013-04-14T00:42:40+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8602 - More detailed OS version info for Linux and Windows systems

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Version.java (modified) (3 diffs)
• tools/PlatformHook.java (modified) (2 diffs)
• tools/PlatformHookOsx.java (modified) (1 diff)
• tools/PlatformHookUnixoid.java (modified) (2 diffs)
• tools/PlatformHookWindows.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/Version.java

@@ -153 +153 @@
     }
 
+    /**
+     * Initializes version info
+     */
     public void init() {
         URL u = Main.class.getResource("/REVISION");
@@ -209 +212 @@
     }
 
+    /**
+     * Returns the User-Agent string
+     * @return The User-Agent
+     */
     public String getAgentString() {
         int v = getVersion();
@@ -218 +225 @@
             s += " SVN";
         }
-        return "JOSM/1.5 ("+ s+" "+LanguageInfo.getJOSMLocaleCode()+") " + System.getProperty("os.name");
+        return "JOSM/1.5 ("+ s+" "+LanguageInfo.getJOSMLocaleCode()+") " + Main.platform.getOSDescription();
     }
 }

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

@@ -4 +4 @@
 import java.io.File;
 import java.io.IOException;
-import java.util.HashMap;
 
 /**
@@ -93 +92 @@
 
     public boolean rename(File from, File to);
+    
+    /**
+     * Returns a detailed OS description (at least family + version).
+     * @return A detailed OS description.
+     * @since 5850
+     */
+    public String getOSDescription();
 }

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

@@ -250 +250 @@
         return false;
     }
+    
+    /* (non-Javadoc)
+     * @see org.openstreetmap.josm.tools.PlatformHookUnixoid#getOSDescription()
+     */
+    @Override
+    public String getOSDescription() {
+        return System.getProperty("os.name");
+    }
 }

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

@@ -6 +6 @@
 import java.awt.GraphicsEnvironment;
 import java.awt.event.KeyEvent;
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
-import java.util.HashMap;
-
-import org.openstreetmap.josm.Main;
+import java.io.InputStreamReader;
 
 /**
@@ -86 +85 @@
         return from.renameTo(to);
     }
+
+    @Override
+    public String getOSDescription() {
+        String osName = System.getProperty("os.name");
+        if ("Linux".equalsIgnoreCase(osName)) {
+            try {
+                Process p = Runtime.getRuntime().exec("lsb_release -ds");
+                BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream()));
+                String line = Utils.strip(input.readLine());
+                input.close();
+                if (line != null && !line.isEmpty()) {
+                    return line; 
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return osName;
+    }
 }

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

@@ -12 +12 @@
 import static java.awt.event.KeyEvent.VK_ENTER;
 import static java.awt.event.KeyEvent.VK_ESCAPE;
-import static java.awt.event.KeyEvent.VK_F1;
 import static java.awt.event.KeyEvent.VK_F10;
 import static java.awt.event.KeyEvent.VK_F4;
@@ -124 +123 @@
         return from.renameTo(to);
     }
+
+    /* (non-Javadoc)
+     * @see org.openstreetmap.josm.tools.PlatformHookUnixoid#getOSDescription()
+     */
+    @Override
+    public String getOSDescription() {
+        return Utils.strip(System.getProperty("os.name")) + " " + 
+                ((System.getenv("ProgramFiles(x86)") == null) ? "32" : "64") + "-Bit";
+    }
 }