Changeset 6089 in josm

Timestamp:

2013-07-26T21:43:10+02:00 (11 years ago)

Author:

akks

Message:

see #8902 - patch by shinigami
str != null && str.equals("CONST") => "CONST".equals(str)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/CrossingWays.java (modified) (1 diff)
• data/validation/tests/NodesWithSameName.java (modified) (1 diff)
• data/validation/tests/UnclosedWays.java (modified) (1 diff)
• io/OsmServerReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java

@@ -125 +125 @@
                     }
 
-                    if ((es1.railway != null && es1.railway.equals("abandoned"))
-                            || (railway2 != null && railway2.equals("abandoned"))) {
+                    if (("abandoned".equals(es1.railway)) || ("abandoned".equals(railway2))) {
                         continue;
                     }

trunk/src/org/openstreetmap/josm/data/validation/tests/NodesWithSameName.java

@@ -37 +37 @@
         String sign = n.get("traffic_sign");
         String highway = n.get("highway");
-        if (name == null
-                || (sign != null && sign.equals("city_limit"))
-                || (highway != null && highway.equals("bus_stop")))
+        if (name == null || ("city_limit".equals(sign)) || ("bus_stop".equals(highway)))
             return;
 

trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java

@@ -95 +95 @@
         }
         test = w.get("waterway");
-        if (test != null && test.equals("riverbank")) {
+        if ("riverbank".equals(test)) {
             set(1108, marktr("waterway type {0}"), test);
         }

trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

@@ -153 +153 @@
     private InputStream FixEncoding(InputStream stream, String encoding) throws IOException
     {
-        if (encoding != null && encoding.equalsIgnoreCase("gzip")) {
+        if ("gzip".equalsIgnoreCase(encoding)) {
             stream = new GZIPInputStream(stream);
         }
-        else if (encoding != null && encoding.equalsIgnoreCase("deflate")) {
+        else if ("deflate".equalsIgnoreCase(encoding)) {
             stream = new InflaterInputStream(stream, new Inflater(true));
         }