Index: src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
===================================================================
--- src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java	(revision 6087)
+++ src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java	(working copy)
@@ -124,8 +124,7 @@
                         continue;
                     }
 
-                    if ((es1.railway != null && es1.railway.equals("abandoned"))
-                            || (railway2 != null && railway2.equals("abandoned"))) {
+                    if (("abandoned".equals(es1.railway)) || ("abandoned".equals(railway2))) {
                         continue;
                     }
 
Index: src/org/openstreetmap/josm/data/validation/tests/NodesWithSameName.java
===================================================================
--- src/org/openstreetmap/josm/data/validation/tests/NodesWithSameName.java	(revision 6087)
+++ src/org/openstreetmap/josm/data/validation/tests/NodesWithSameName.java	(working copy)
@@ -36,9 +36,7 @@
         String name = n.get("name");
         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;
 
         List<Node> nodes = namesToNodes.get(name);
Index: src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java
===================================================================
--- src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java	(revision 6087)
+++ src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java	(working copy)
@@ -94,7 +94,7 @@
             set(1107, marktr("leisure type {0}"), test);
         }
         test = w.get("waterway");
-        if (test != null && test.equals("riverbank")) {
+        if ("riverbank".equals(test)) {
             set(1108, marktr("waterway type {0}"), test);
         }
         Boolean btest = OsmUtils.getOsmBoolean(w.get("building"));
Index: src/org/openstreetmap/josm/io/OsmServerReader.java
===================================================================
--- src/org/openstreetmap/josm/io/OsmServerReader.java	(revision 6087)
+++ src/org/openstreetmap/josm/io/OsmServerReader.java	(working copy)
@@ -152,10 +152,10 @@
 
     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));
         }
         return stream;