Changeset 6990 in josm for trunk/src/org/openstreetmap/josm/data

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)

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (8 diffs)
• Version.java (modified) (1 diff)
• coor/LatLon.java (modified) (1 diff)
• imagery/ImageryInfo.java (modified) (3 diffs)
• osm/ChangesetCache.java (modified) (2 diffs)
• osm/TigerUtils.java (modified) (1 diff)
• projection/CustomProjection.java (modified) (3 diffs)
• projection/datum/NTV2GridShiftFile.java (modified) (2 diffs)
• validation/Test.java (modified) (1 diff)

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 */

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

@@ -131 +131 @@
         isLocalBuild = false;
         value = properties.get("Is-Local-Build");
-        if (value != null && value.trim().equalsIgnoreCase("true"))  {
+        if (value != null && "true".equalsIgnoreCase(value.trim()))  {
             isLocalBuild = true;
         }

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -136 +136 @@
         String sSeconds = cDmsSecondFormatter.format(tSeconds);
 
-        if (sSeconds.equals(cDms60)) {
+        if (cDms60.equals(sSeconds)) {
             sSeconds = cDms00;
             sMinutes = cDmsMinuteFormatter.format(tMinutes+1);
         }
-        if (sMinutes.equals("60")) {
+        if ("60".equals(sMinutes)) {
             sMinutes = "00";
             sDegrees = Integer.toString(tDegree+1);

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -765 +765 @@
     public void setAttribution(AbstractTileSource s) {
         if (attributionText != null) {
-            if (attributionText.equals("osm")) {
+            if ("osm".equals(attributionText)) {
                 s.setAttributionText(new Mapnik().getAttributionText(0, null, null));
             } else {
@@ -772 +772 @@
         }
         if (attributionLinkURL != null) {
-            if (attributionLinkURL.equals("osm")) {
+            if ("osm".equals(attributionLinkURL)) {
                 s.setAttributionLinkURL(new Mapnik().getAttributionLinkURL());
             } else {
@@ -791 +791 @@
         }
         if (termsOfUseURL != null) {
-            if (termsOfUseURL.equals("osm")) {
+            if ("osm".equals(termsOfUseURL)) {
                 s.setTermsOfUseURL(new Mapnik().getTermsOfUseURL());
             } else {

trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java

@@ -175 +175 @@
     }
 
+    /**
+     * Replies the list of open changesets.
+     * @return The list of open changesets
+     */
     public List<Changeset> getOpenChangesets() {
         List<Changeset> ret = new ArrayList<Changeset>();
@@ -190 +194 @@
     @Override
     public void preferenceChanged(PreferenceChangeEvent e) {
-        if (e.getKey() == null || ! e.getKey().equals("osm-server.url"))
+        if (e.getKey() == null || !"osm-server.url".equals(e.getKey()))
             return;
 

trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java

@@ -28 +28 @@
     }
 
+    /**
+     * Determines if the given key denotes an integer value.
+     * @param name The key to determine
+     * @return {@code true} if the given key denotes an integer value
+     */
     public static boolean tagIsInt(String name) {
-        if (name.equals("tiger:tlid"))
+        if ("tiger:tlid".equals(name))
             return true;
         return false;

trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

@@ -173 +173 @@
                 String key = m.group(1);
                 // alias
-                if (key.equals("k")) {
+                if ("k".equals(key)) {
                     key = Param.k_0.key;
                 }
@@ -181 +181 @@
                     // some aliases
                     if (key.equals(Param.proj.key)) {
-                        if (value.equals("longlat") || value.equals("latlon") || value.equals("latlong")) {
+                        if ("longlat".equals(value) || "latlon".equals(value) || "latlong".equals(value)) {
                             value = "lonlat";
                         }
@@ -264 +264 @@
                 nadgridsId = nadgridsId.substring(1);
             }
-            if (nadgridsId.equals("null"))
+            if ("null".equals(nadgridsId))
                 return new NullDatum(null, ellps);
             NTV2GridShiftFileWrapper nadgrids = Projections.getNTV2Grid(nadgridsId);

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java

@@ -169 +169 @@
         HashMap<String, List<NTV2SubGrid>> subGridMap = new HashMap<String, List<NTV2SubGrid>>();
         for (int i = 0; i < subGrid.length; i++) {
-            if (subGrid[i].getParentSubGridName().equalsIgnoreCase("NONE")) {
+            if ("NONE".equalsIgnoreCase(subGrid[i].getParentSubGridName())) {
                 topLevelCount++;
             }
@@ -177 +177 @@
         topLevelCount = 0;
         for (int i = 0; i < subGrid.length; i++) {
-            if (subGrid[i].getParentSubGridName().equalsIgnoreCase("NONE")) {
+            if ("NONE".equalsIgnoreCase(subGrid[i].getParentSubGridName())) {
                 topLevelSubGrid[topLevelCount++] = subGrid[i];
             } else {

trunk/src/org/openstreetmap/josm/data/validation/Test.java

@@ -327 +327 @@
     protected static final boolean isBuilding(OsmPrimitive p) {
         String v = p.get("building");
-        return v != null && !v.equals("no") && !v.equals("entrance");
+        return v != null && !"no".equals(v) && !"entrance".equals(v);
     }
 }