Changeset 7012 in josm for trunk/src/org/openstreetmap/josm/io/imagery

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - use String switch/case where applicable

Location:

trunk/src/org/openstreetmap/josm/io/imagery

Files:

• ImageryReader.java (modified) (11 diffs)
• WMSGrabber.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -98 +98 @@
             switch (states.peek()) {
             case INIT:
-                if (qName.equals("imagery")) {
+                if ("imagery".equals(qName)) {
                     newState = State.IMAGERY;
                 }
                 break;
             case IMAGERY:
-                if (qName.equals("entry")) {
+                if ("entry".equals(qName)) {
                     entry = new ImageryInfo();
                     skipEntry = false;
@@ -128 +128 @@
                 }).contains(qName)) {
                     newState = State.ENTRY_ATTRIBUTE;
-                } else if (qName.equals("bounds")) {
+                } else if ("bounds".equals(qName)) {
                     try {
                         bounds = new ImageryBounds(
@@ -139 +139 @@
                     }
                     newState = State.BOUNDS;
-                } else if (qName.equals("projections")) {
+                } else if ("projections".equals(qName)) {
                     projections = new ArrayList<>();
                     newState = State.PROJECTIONS;
@@ -145 +145 @@
                 break;
             case BOUNDS:
-                if (qName.equals("shape")) {
+                if ("shape".equals(qName)) {
                     shape = new Shape();
                     newState = State.SHAPE;
@@ -151 +151 @@
                 break;
             case SHAPE:
-                if (qName.equals("point")) {
+                if ("point".equals(qName)) {
                     try {
                         shape.addPoint(atts.getValue("lat"), atts.getValue("lon"));
@@ -160 +160 @@
                 break;
             case PROJECTIONS:
-                if (qName.equals("code")) {
+                if ("code".equals(qName)) {
                     newState = State.CODE;
                 }
@@ -192 +192 @@
                 throw new RuntimeException("parsing error: more closing than opening elements");
             case ENTRY:
-                if (qName.equals("entry")) {
+                if ("entry".equals(qName)) {
                     if (!skipEntry) {
                         entries.add(entry);
@@ -200 +200 @@
                 break;
             case ENTRY_ATTRIBUTE:
-                if (qName.equals("name")) {
+                switch(qName) {
+                case "name":
                     entry.setTranslatedName(accumulator.toString());
-                } else if (qName.equals("type")) {
+                    break;
+                case "type":
                     boolean found = false;
                     for (ImageryType type : ImageryType.values()) {
@@ -214 +216 @@
                         skipEntry = true;
                     }
-                } else if (qName.equals("default")) {
-                    if (accumulator.toString().equals("true")) {
+                    break;
+                case "default":
+                    switch (accumulator.toString()) {
+                    case "true":
                         entry.setDefaultEntry(true);
-                    } else if (accumulator.toString().equals("false")) {
+                        break;
+                    case "false":
                         entry.setDefaultEntry(false);
-                    } else {
+                        break;
+                    default:
                         skipEntry = true;
                     }
-                } else if (qName.equals("url")) {
+                    break;
+                case "url":
                     entry.setUrl(accumulator.toString());
-                } else if (qName.equals("eula")) {
+                    break;
+                case "eula":
                     entry.setEulaAcceptanceRequired(accumulator.toString());
-                } else if (qName.equals("min-zoom") || qName.equals("max-zoom")) {
+                    break;
+                case "min-zoom":
+                case "max-zoom":
                     Integer val = null;
                     try {
@@ -236 +246 @@
                         skipEntry = true;
                     } else {
-                        if (qName.equals("min-zoom")) {
+                        if ("min-zoom".equals(qName)) {
                             entry.setDefaultMinZoom(val);
                         } else {
@@ -242 +252 @@
                         }
                     }
-                } else if (qName.equals("attribution-text")) {
+                    break;
+                case "attribution-text":
                     entry.setAttributionText(accumulator.toString());
-                } else if (qName.equals("attribution-url")) {
+                    break;
+                case "attribution-url":
                     entry.setAttributionLinkURL(accumulator.toString());
-                } else if (qName.equals("logo-image")) {
+                    break;
+                case "logo-image":
                     entry.setAttributionImage(accumulator.toString());
-                } else if (qName.equals("logo-url")) {
+                    break;
+                case "logo-url":
                     entry.setAttributionImageURL(accumulator.toString());
-                } else if (qName.equals("terms-of-use-text")) {
+                    break;
+                case "terms-of-use-text":
                     entry.setTermsOfUseText(accumulator.toString());
-                } else if (qName.equals("terms-of-use-url")) {
+                    break;
+                case "terms-of-use-url":
                     entry.setTermsOfUseURL(accumulator.toString());
-                } else if (qName.equals("country-code")) {
+                    break;
+                case "country-code":
                     entry.setCountryCode(accumulator.toString());
-                } else if (qName.equals("icon")) {
+                    break;
+                case "icon":
                     entry.setIcon(accumulator.toString());
+                    break;
                 }
                 break;

trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java

@@ -92 +92 @@
             e = ne.lon();
         }
-        if (myProj.equals("EPSG:4326") && !info.getServerProjections().contains(myProj) && info.getServerProjections().contains("CRS:84")) {
+        if ("EPSG:4326".equals(myProj) && !info.getServerProjections().contains(myProj) && info.getServerProjections().contains("CRS:84")) {
             myProj = "CRS:84";
         }
@@ -114 +114 @@
         if (baseURL.toLowerCase().contains("crs=epsg:4326")) {
             switchLatLon = true;
-        } else if (baseURL.toLowerCase().contains("crs=") && myProj.equals("EPSG:4326")) {
+        } else if (baseURL.toLowerCase().contains("crs=") && "EPSG:4326".equals(myProj)) {
             switchLatLon = true;
         }