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

Timestamp:

2014-04-19T00:36:43+02:00 (10 years ago)

Author:

Don-vip

Message:

sonar - place Strings literals on the left side when checking for equality (can avoid NPEs)

File:

• trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java (modified) (3 diffs)

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

@@ -37 +37 @@
             if (imgNode.getNodeType() == Node.ELEMENT_NODE) {
                 Element imgElem = (Element) imgNode;
-                if (imgElem.getTagName().equals("geoimage")) {
+                if ("geoimage".equals(imgElem.getTagName())) {
                     ImageEntry entry = new ImageEntry();
                     NodeList attrNodes = imgElem.getChildNodes();
@@ -45 +45 @@
                             Element attrElem = (Element) attrNode;
                             try {
-                                if (attrElem.getTagName().equals("file")) {
+                                String attrElemName = attrElem.getTagName();
+                                if ("file".equals(attrElemName)) {
                                     entry.setFile(new File(attrElem.getTextContent()));
-                                } else if (attrElem.getTagName().equals("position")) {
+                                } else if ("position".equals(attrElemName)) {
                                     double lat = Double.parseDouble(attrElem.getAttribute("lat"));
                                     double lon = Double.parseDouble(attrElem.getAttribute("lon"));
                                     entry.setPos(new LatLon(lat, lon));
-                                } else if (attrElem.getTagName().equals("speed")) {
+                                } else if ("speed".equals(attrElemName)) {
                                     entry.setSpeed(Double.parseDouble(attrElem.getTextContent()));
-                                } else if (attrElem.getTagName().equals("elevation")) {
+                                } else if ("elevation".equals(attrElemName)) {
                                     entry.setElevation(Double.parseDouble(attrElem.getTextContent()));
-                                } else if (attrElem.getTagName().equals("gps-time")) {
+                                } else if ("gps-time".equals(attrElemName)) {
                                     entry.setGpsTime(new Date(Long.parseLong(attrElem.getTextContent())));
-                                } else if (attrElem.getTagName().equals("exif-orientation")) {
+                                } else if ("exif-orientation".equals(attrElemName)) {
                                     entry.setExifOrientation(Integer.parseInt(attrElem.getTextContent()));
-                                } else if (attrElem.getTagName().equals("exif-time")) {
+                                } else if ("exif-time".equals(attrElemName)) {
                                     entry.setExifTime(new Date(Long.parseLong(attrElem.getTextContent())));
-                                } else if (attrElem.getTagName().equals("exif-gps-time")) {
+                                } else if ("exif-gps-time".equals(attrElemName)) {
                                     entry.setExifGpsTime(new Date(Long.parseLong(attrElem.getTextContent())));
-                                } else if (attrElem.getTagName().equals("exif-coordinates")) {
+                                } 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 (attrElem.getTagName().equals("exif-image-direction")) {
+                                } else if ("exif-image-direction".equals(attrElemName)) {
                                     entry.setExifImgDir(Double.parseDouble(attrElem.getTextContent()));
-                                } else if (attrElem.getTagName().equals("is-new-gps-data") && Boolean.parseBoolean(attrElem.getTextContent())) {
+                                } else if ("is-new-gps-data".equals(attrElemName) && Boolean.parseBoolean(attrElem.getTextContent())) {
                                     entry.flagNewGpsData();
                                 }
@@ -79 +80 @@
                     }
                     entries.add(entry);
-                } else if (imgElem.getTagName().equals("show-thumbnails")) {
+                } else if ("show-thumbnails".equals(imgElem.getTagName())) {
                     useThumbs = Boolean.parseBoolean(imgElem.getTextContent());
                 }