Changeset 6990 in josm for trunk/src/org/openstreetmap/josm/gui/download

Timestamp:

2014-04-19T00:36:43+02:00 (12 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/gui/download/PlaceSelection.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -206 +206 @@
             depth++;
             try {
-                if (qName.equals("searchresults")) {
+                if ("searchresults".equals(qName)) {
                     // do nothing
-                } else if (qName.equals("named") && (depth == 2)) {
+                } else if ("named".equals(qName) && (depth == 2)) {
                     currentResult = new PlaceSelection.SearchResult();
                     currentResult.name = atts.getValue("name");
@@ -219 +219 @@
                     currentResult.zoom = Integer.parseInt(atts.getValue("zoom"));
                     data.add(currentResult);
-                } else if (qName.equals("description") && (depth == 3)) {
+                } else if ("description".equals(qName) && (depth == 3)) {
                     description = new StringBuffer();
-                } else if (qName.equals("named") && (depth == 4)) {
+                } else if ("named".equals(qName) && (depth == 4)) {
                     // this is a "named" place in the nearest places list.
                     String info = atts.getValue("info");
@@ -227 +227 @@
                         currentResult.nearestPlace = atts.getValue("name");
                     }
-                } else if (qName.equals("place") && atts.getValue("lat") != null) {
+                } else if ("place".equals(qName) && atts.getValue("lat") != null) {
                     currentResult = new PlaceSelection.SearchResult();
                     currentResult.name = atts.getValue("display_name");
@@ -258 +258 @@
         @Override
         public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
-            if (qName.equals("description") && description != null) {
+            if ("description".equals(qName) && description != null) {
                 currentResult.description = description.toString();
                 description = null;