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

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - use String switch/case where applicable

File:

• trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java

@@ -45 +45 @@
                             Element attrElem = (Element) attrNode;
                             try {
-                                String attrElemName = attrElem.getTagName();
-                                if ("file".equals(attrElemName)) {
+                                switch(attrElem.getTagName()) {
+                                case "file":
                                     entry.setFile(new File(attrElem.getTextContent()));
-                                } else if ("position".equals(attrElemName)) {
+                                    break;
+                                case "position":
                                     double lat = Double.parseDouble(attrElem.getAttribute("lat"));
                                     double lon = Double.parseDouble(attrElem.getAttribute("lon"));
                                     entry.setPos(new LatLon(lat, lon));
-                                } else if ("speed".equals(attrElemName)) {
+                                    break;
+                                case "speed":
                                     entry.setSpeed(Double.parseDouble(attrElem.getTextContent()));
-                                } else if ("elevation".equals(attrElemName)) {
+                                    break;
+                                case "elevation":
                                     entry.setElevation(Double.parseDouble(attrElem.getTextContent()));
-                                } else if ("gps-time".equals(attrElemName)) {
+                                    break;
+                                case "gps-time":
                                     entry.setGpsTime(new Date(Long.parseLong(attrElem.getTextContent())));
-                                } else if ("exif-orientation".equals(attrElemName)) {
+                                    break;
+                                case "exif-orientation":
                                     entry.setExifOrientation(Integer.parseInt(attrElem.getTextContent()));
-                                } else if ("exif-time".equals(attrElemName)) {
+                                    break;
+                                case "exif-time":
                                     entry.setExifTime(new Date(Long.parseLong(attrElem.getTextContent())));
-                                } else if ("exif-gps-time".equals(attrElemName)) {
+                                    break;
+                                case "exif-gps-time":
                                     entry.setExifGpsTime(new Date(Long.parseLong(attrElem.getTextContent())));
-                                } else if ("exif-coordinates".equals(attrElemName)) {
-                                    double lat = Double.parseDouble(attrElem.getAttribute("lat"));
-                                    double lon = Double.parseDouble(attrElem.getAttribute("lon"));
-                                    entry.setExifCoor(new LatLon(lat, lon));
-                                } else if ("exif-image-direction".equals(attrElemName)) {
+                                    break;
+                                case "exif-coordinates":
+                                    entry.setExifCoor(new LatLon(
+                                            Double.parseDouble(attrElem.getAttribute("lat")), 
+                                            Double.parseDouble(attrElem.getAttribute("lon"))));
+                                    break;
+                                case "exif-image-direction":
                                     entry.setExifImgDir(Double.parseDouble(attrElem.getTextContent()));
-                                } else if ("is-new-gps-data".equals(attrElemName) && Boolean.parseBoolean(attrElem.getTextContent())) {
-                                    entry.flagNewGpsData();
+                                    break;
+                                case "is-new-gps-data":
+                                    if (Boolean.parseBoolean(attrElem.getTextContent())) {
+                                        entry.flagNewGpsData();
+                                    }
                                 }
                                 // TODO: handle thumbnail loading