Changeset 6977 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-04-15T00:43:24+02:00 (9 years ago)

Author:

Don-vip

Message:

fix some sonar issues recently introduced

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• PlatformHookOsx.java (modified) (1 diff)
• PlatformHookUnixoid.java (modified) (1 diff)
• Utils.java (modified) (1 diff)

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

@@ -51 +51 @@
         String java = System.getProperty("java.version");
         String os = System.getProperty("os.version");
-        if (java != null && java.startsWith("1.6") && os != null && (
-                os.startsWith("10.7.") || os.startsWith("10.8") || os.startsWith("10.9"))) {
+        if (java != null && java.startsWith("1.6") && os != null && os.matches("^10\\.[789].*")) {
             askUpdateJava(java);
         }

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

@@ -46 +46 @@
             String os = getOSDescription();
             if (java != null && java.startsWith("1.6") && os != null && (
-                    os.startsWith("Linux Debian GNU/Linux 7") || os.startsWith("Linux Mint") ||
-                    os.startsWith("Linux Ubuntu 12") || os.startsWith("Linux Ubuntu 13") || os.startsWith("Linux Ubuntu 14"))) {
+                    os.startsWith("Linux Debian GNU/Linux 7") || os.startsWith("Linux Mint") || os.matches("^Linux Ubuntu 1[234].*"))) {
                 String url;
                 // apturl does not exist on Debian (see #8465)

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

@@ -75 +75 @@
     private static final int MILLIS_OF_DAY = 86400000;
 
-    public static String URL_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~:/?#[]@!$&'()*+,;=";
+    public static final String URL_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~:/?#[]@!$&'()*+,;=";
     
     /**