Changeset 6990 in josm for trunk/src/org/openstreetmap/josm/data/Preferences.java

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/data/Preferences.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1365 +1365 @@
             int event = parser.next();
             if (event == XMLStreamConstants.START_ELEMENT) {
-                if (parser.getLocalName().equals("tag")) {
+                String localName = parser.getLocalName();
+                if ("tag".equals(localName)) {
                     settingsMap.put(parser.getAttributeValue(null, "key"), new StringSetting(parser.getAttributeValue(null, "value")));
                     jumpToEnd();
-                } else if (parser.getLocalName().equals("list") ||
-                        parser.getLocalName().equals("collection") ||
-                        parser.getLocalName().equals("lists") ||
-                        parser.getLocalName().equals("maps")
+                } else if ("list".equals(localName) ||
+                        "collection".equals(localName) ||
+                        "lists".equals(localName) ||
+                        "maps".equals(localName)
                 ) {
                     parseToplevelList();
                 } else {
-                    throwException("Unexpected element: "+parser.getLocalName());
+                    throwException("Unexpected element: "+localName);
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
@@ -1404 +1405 @@
             int event = parser.next();
             if (event == XMLStreamConstants.START_ELEMENT) {
-                if (parser.getLocalName().equals("entry")) {
+                String localName = parser.getLocalName();
+                if ("entry".equals(localName)) {
                     if (entries == null) {
                         entries = new ArrayList<String>();
@@ -1410 +1412 @@
                     entries.add(parser.getAttributeValue(null, "value"));
                     jumpToEnd();
-                } else if (parser.getLocalName().equals("list")) {
+                } else if ("list".equals(localName)) {
                     if (lists == null) {
                         lists = new ArrayList<List<String>>();
                     }
                     lists.add(parseInnerList());
-                } else if (parser.getLocalName().equals("map")) {
+                } else if ("map".equals(localName)) {
                     if (maps == null) {
                         maps = new ArrayList<Map<String, String>>();
@@ -1421 +1423 @@
                     maps.add(parseMap());
                 } else {
-                    throwException("Unexpected element: "+parser.getLocalName());
+                    throwException("Unexpected element: "+localName);
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
@@ -1434 +1436 @@
             settingsMap.put(key, new MapListSetting(Collections.unmodifiableList(maps)));
         } else {
-            if (name.equals("lists")) {
+            if ("lists".equals(name)) {
                 settingsMap.put(key, new ListListSetting(Collections.<List<String>>emptyList()));
-            } else if (name.equals("maps")) {
+            } else if ("maps".equals(name)) {
                 settingsMap.put(key, new MapListSetting(Collections.<Map<String, String>>emptyList()));
             } else {
@@ -1449 +1451 @@
             int event = parser.next();
             if (event == XMLStreamConstants.START_ELEMENT) {
-                if (parser.getLocalName().equals("entry")) {
+                if ("entry".equals(parser.getLocalName())) {
                     entries.add(parser.getAttributeValue(null, "value"));
                     jumpToEnd();
@@ -1467 +1469 @@
             int event = parser.next();
             if (event == XMLStreamConstants.START_ELEMENT) {
-                if (parser.getLocalName().equals("tag")) {
+                if ("tag".equals(parser.getLocalName())) {
                     map.put(parser.getAttributeValue(null, "key"), parser.getAttributeValue(null, "value"));
                     jumpToEnd();
@@ -1500 +1502 @@
         @Override
         public void visit(StringSetting setting) {
-            if (noPassword && key.equals("osm-server.password"))
+            if (noPassword && "osm-server.password".equals(key))
                 return; // do not store plain password.
             /* don't save default values */