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

Timestamp:

2014-04-27T15:35:47+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - use String switch/case where applicable

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• Geometry.java (modified) (1 diff)
• I18n.java (modified) (5 diffs)
• ImageProvider.java (modified) (2 diffs)
• LanguageInfo.java (modified) (2 diffs)
• PlatformHookOsx.java (modified) (1 diff)
• PlatformHookUnixoid.java (modified) (1 diff)
• Shortcut.java (modified) (2 diffs)
• WindowGeometry.java (modified) (1 diff)
• XmlObjectParser.java (modified) (2 diffs)

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

@@ -834 +834 @@
             for (RelationMember m : multiPolygon.getMembers()) {
                 if (m.getType().equals(OsmPrimitiveType.WAY)) {
-                    if (m.getRole().equals("outer")) {
+                    if ("outer".equals(m.getRole())) {
                         outers.add(m.getWay());
-                    } else if (m.getRole().equals("inner")) {
+                    } else if ("inner".equals(m.getRole())) {
                         inners.add(m.getWay());
                     }

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

@@ -394 +394 @@
     }
 
-    public static void addTexts(File source)
-    {
-        if(loadedCode.equals("en"))
+    public static void addTexts(File source) {
+        if ("en".equals(loadedCode))
             return;
         FileInputStream fis = null;
@@ -440 +439 @@
     }
 
-    private static boolean load(String l)
-    {
-        if(l.equals("en") || l.equals("en_US"))
-        {
+    private static boolean load(String l) {
+        if ("en".equals(l) || "en_US".equals(l)) {
             strings = null;
             pstrings = null;
@@ -451 +448 @@
         }
         URL en = getTranslationFile("en");
-        if(en == null)
+        if (en == null)
             return false;
         URL tr = getTranslationFile(l);
-        if(tr == null || !languages.containsKey(l))
-        {
+        if (tr == null || !languages.containsKey(l)) {
             int i = l.indexOf('_');
             if (i > 0) {
@@ -461 +457 @@
             }
             tr = getTranslationFile(l);
-            if(tr == null || !languages.containsKey(l))
+            if (tr == null || !languages.containsKey(l))
                 return false;
         }
@@ -643 +639 @@
                 Locale.setDefault(l);
             } else {
-                if (!l.getLanguage().equals("en")) {
+                if (!"en".equals(l.getLanguage())) {
                     Main.info(tr("Unable to find translation for the locale {0}. Reverting to {1}.",
                             l.getDisplayName(), Locale.getDefault().getDisplayName()));

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

@@ -606 +606 @@
         try {
             zipFile = new ZipFile(archive);
-            if (inArchiveDir == null || inArchiveDir.equals(".")) {
+            if (inArchiveDir == null || ".".equals(inArchiveDir)) {
                 inArchiveDir = "";
             } else if (!inArchiveDir.isEmpty()) {
@@ -805 +805 @@
         }
         Cursor c = Toolkit.getDefaultToolkit().createCustomCursor(img.getImage(),
-                name.equals("crosshair") ? new Point(10, 10) : new Point(3, 2), "Cursor");
+                "crosshair".equals(name) ? new Point(10, 10) : new Point(3, 2), "Cursor");
         return c;
     }

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

@@ -87 +87 @@
         if (locale == null) return "en";
         String full = locale.toString();
-        if (full.equals("iw_IL"))
+        if ("iw_IL".equals(full))
             return "he";
-        else if (full.equals("in"))
+        else if ("in".equals(full))
             return "id";
         else if (I18n.hasCode(full)) // catch all non-single codes
@@ -107 +107 @@
      */
     public static Locale getLocale(String localeName) {
-        if (localeName.equals("he")) {
+        if ("he".equals(localeName)) {
             localeName = "iw_IL";
         }
-        else if (localeName.equals("id")) {
+        else if ("id".equals(localeName)) {
             localeName = "in";
         }

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

@@ -53 +53 @@
     public Object invoke (Object proxy, Method method, Object[] args) throws Throwable {
         Boolean handled = Boolean.TRUE;
-        if (method.getName().equals("handleQuit")) {
+        switch (method.getName()) {
+        case "handleQuit":
             handled = Main.exitJosm(false, 0);
-        } else if (method.getName().equals("handleAbout")) {
+            break;
+        case "handleAbout":
             Main.main.menu.about.actionPerformed(null);
-        } else if (method.getName().equals("handlePreferences")) {
+            break;
+        case "handlePreferences":
             Main.main.menu.preferences.actionPerformed(null);
-        } else
+            break;
+        default:
             return null;
+        }
         if (args[0] != null) {
             try {

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

@@ -165 +165 @@
     public String getJavaPackageDetails() {
         if (isDebianOrUbuntu()) {
-            String javaHome = System.getProperty("java.home");
-            if ("/usr/lib/jvm/java-7-openjdk-amd64/jre".equals(javaHome) ||
-                    "/usr/lib/jvm/java-7-openjdk-i386/jre".equals(javaHome)) {
+            switch(System.getProperty("java.home")) {
+            case "/usr/lib/jvm/java-7-openjdk-amd64/jre":
+            case "/usr/lib/jvm/java-7-openjdk-i386/jre":
                 return getPackageDetails("openjdk-7-jre");
             }

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

@@ -95 +95 @@
 
     public boolean isChangeable() {
-        return !automatic && !shortText.equals("core:none");
+        return !automatic && !"core:none".equals(shortText);
     }
 
@@ -255 +255 @@
         for(Shortcut c : shortcuts.values())
         {
-            if(!c.shortText.equals("core:none")) {
+            if(!"core:none".equals(c.shortText)) {
                 l.add(c);
             }

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

@@ -189 +189 @@
                     x = Integer.valueOf(m.group(5));
                     y = Integer.valueOf(m.group(7));
-                    if (m.group(4).equals("-")) {
+                    if ("-".equals(m.group(4))) {
                         x = screenDimension.x + screenDimension.width - x - w;
                     }
-                    if (m.group(6).equals("-")) {
+                    if ("-".equals(m.group(6))) {
                         y = screenDimension.y + screenDimension.height - y - h;
                     }

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

@@ -133 +133 @@
         private void setValue(Entry entry, String fieldName, String value) throws SAXException {
             CheckParameterUtil.ensureParameterNotNull(entry, "entry");
-            if (fieldName.equals("class") || fieldName.equals("default") || fieldName.equals("throw") || fieldName.equals("new") || fieldName.equals("null")) {
+            if ("class".equals(fieldName) || "default".equals(fieldName) || "throw".equals(fieldName) || "new".equals(fieldName) || "null".equals(fieldName)) {
                 fieldName += "_";
             }
@@ -165 +165 @@
         private boolean parseBoolean(String s) {
             return s != null
-                    && !s.equals("0")
+                    && !"0".equals(s)
                     && !s.startsWith("off")
                     && !s.startsWith("false")