Ticket #8902: strcmp.diff
File strcmp.diff, 2.9 KB (added by , 11 years ago) |
---|
-
src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
124 124 continue; 125 125 } 126 126 127 if ((es1.railway != null && es1.railway.equals("abandoned")) 128 || (railway2 != null && railway2.equals("abandoned"))) { 127 if (("abandoned".equals(es1.railway)) || ("abandoned".equals(railway2))) { 129 128 continue; 130 129 } 131 130 -
src/org/openstreetmap/josm/data/validation/tests/NodesWithSameName.java
36 36 String name = n.get("name"); 37 37 String sign = n.get("traffic_sign"); 38 38 String highway = n.get("highway"); 39 if (name == null 40 || (sign != null && sign.equals("city_limit")) 41 || (highway != null && highway.equals("bus_stop"))) 39 if (name == null || ("city_limit".equals(sign)) || ("bus_stop".equals(highway))) 42 40 return; 43 41 44 42 List<Node> nodes = namesToNodes.get(name); -
src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java
94 94 set(1107, marktr("leisure type {0}"), test); 95 95 } 96 96 test = w.get("waterway"); 97 if ( test != null && test.equals("riverbank")) {97 if ("riverbank".equals(test)) { 98 98 set(1108, marktr("waterway type {0}"), test); 99 99 } 100 100 Boolean btest = OsmUtils.getOsmBoolean(w.get("building")); -
src/org/openstreetmap/josm/io/OsmServerReader.java
152 152 153 153 private InputStream FixEncoding(InputStream stream, String encoding) throws IOException 154 154 { 155 if ( encoding != null && encoding.equalsIgnoreCase("gzip")) {155 if ("gzip".equalsIgnoreCase(encoding)) { 156 156 stream = new GZIPInputStream(stream); 157 157 } 158 else if ( encoding != null && encoding.equalsIgnoreCase("deflate")) {158 else if ("deflate".equalsIgnoreCase(encoding)) { 159 159 stream = new InflaterInputStream(stream, new Inflater(true)); 160 160 } 161 161 return stream;