Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/data/validation

Timestamp:

2015-06-20T23:42:21+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• OsmValidator.java (modified) (2 diffs)
• TestError.java (modified) (2 diffs)
• ValidatorVisitor.java (modified) (1 diff)
• routines/DomainValidator.java (modified) (3 diffs)
• routines/EmailValidator.java (modified) (1 diff)
• routines/InetAddressValidator.java (modified) (1 diff)
• routines/RegexValidator.java (modified) (1 diff)
• routines/UrlValidator.java (modified) (1 diff)
• tests/Addresses.java (modified) (2 diffs)
• tests/CrossingWays.java (modified) (2 diffs)
• tests/DuplicateNode.java (modified) (8 diffs)
• tests/DuplicateRelation.java (modified) (4 diffs)
• tests/DuplicateWay.java (modified) (8 diffs)
• tests/InternetTags.java (modified) (1 diff)
• tests/LongSegment.java (modified) (1 diff)
• tests/MapCSSTagChecker.java (modified) (2 diffs)
• tests/MultipolygonTest.java (modified) (2 diffs)
• tests/NameMismatch.java (modified) (1 diff)
• tests/OpeningHourTest.java (modified) (1 diff)
• tests/OverlappingWays.java (modified) (1 diff)
• tests/PowerLines.java (modified) (5 diffs)
• tests/RelationChecker.java (modified) (6 diffs)
• tests/SimilarNamedWays.java (modified) (3 diffs)
• tests/TagChecker.java (modified) (8 diffs)
• tests/UnclosedWays.java (modified) (1 diff)
• tests/UnconnectedWays.java (modified) (1 diff)
• tests/UntaggedWay.java (modified) (1 diff)
• tests/WayConnectedToArea.java (modified) (2 diffs)
• util/Entities.java (modified) (1 diff)
• util/ValUtil.java (modified) (1 diff)

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

@@ -168 +168 @@
                 pathDir.mkdirs();
             }
-        } catch (Exception e){
+        } catch (Exception e) {
             Main.error(e);
         }
@@ -242 +242 @@
 
     private static void applyPrefs(Map<String, Test> tests, boolean beforeUpload) {
-        for(String testName : Main.pref.getCollection(beforeUpload
+        for (String testName : Main.pref.getCollection(beforeUpload
         ? ValidatorPreference.PREF_SKIP_TESTS_BEFORE_UPLOAD : ValidatorPreference.PREF_SKIP_TESTS)) {
             Test test = tests.get(testName);

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

@@ -317 +317 @@
                 v.visit((WaySegment) o);
             } else if (o instanceof List<?>) {
-                v.visit((List<Node>)o);
+                v.visit((List<Node>) o);
             }
         }
@@ -366 +366 @@
 
     @Override public void primitivesAdded(PrimitivesAddedEvent event) {}
+
     @Override public void tagsChanged(TagsChangedEvent event) {}
+
     @Override public void nodeMoved(NodeMovedEvent event) {}
+
     @Override public void wayNodesChanged(WayNodesChangedEvent event) {}
+
     @Override public void relationMembersChanged(RelationMembersChangedEvent event) {}
+
     @Override public void otherDatasetChange(AbstractDatasetChangedEvent event) {}
+
     @Override public void dataChanged(DataChangedEvent event) {}
 

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

@@ -10 +10 @@
 public interface ValidatorVisitor {
     void visit(TestError error);
+
     void visit(OsmPrimitive p);
+
     void visit(WaySegment ws);
+
     void visit(List<Node> nodes);
 }

trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java

@@ -115 +115 @@
      */
     public static DomainValidator getInstance(boolean allowLocal) {
-       if(allowLocal) {
+       if (allowLocal) {
           return DOMAIN_VALIDATOR_WITH_LOCAL;
        }
@@ -138 +138 @@
         if (groups != null && groups.length > 0) {
             return isValidTld(groups[0]);
-        } else if(allowLocal) {
+        } else if (allowLocal) {
             if (hostnameRegex.isValid(domain)) {
                return true;
@@ -154 +154 @@
      */
     public boolean isValidTld(String tld) {
-        if(allowLocal && isValidLocalTld(tld)) {
+        if (allowLocal && isValidLocalTld(tld)) {
            return true;
         }

trunk/src/org/openstreetmap/josm/data/validation/routines/EmailValidator.java

@@ -88 +88 @@
      */
     public static EmailValidator getInstance(boolean allowLocal) {
-        if(allowLocal) {
+        if (allowLocal) {
            return EMAIL_VALIDATOR_WITH_LOCAL;
         }

trunk/src/org/openstreetmap/josm/data/validation/routines/InetAddressValidator.java

@@ -82 +82 @@
             try {
                 iIpSegment = Integer.parseInt(ipSegment);
-            } catch(NumberFormatException e) {
+            } catch (NumberFormatException e) {
                 return false;
             }

trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java

@@ -107 +107 @@
         }
         patterns = new Pattern[regexs.length];
-        int flags = caseSensitive ? 0: Pattern.CASE_INSENSITIVE;
+        int flags = caseSensitive ? 0 : Pattern.CASE_INSENSITIVE;
         for (int i = 0; i < regexs.length; i++) {
             if (regexs[i] == null || regexs[i].isEmpty()) {

trunk/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java

@@ -405 +405 @@
 
         String extra = authorityMatcher.group(PARSE_AUTHORITY_EXTRA);
-        if (extra != null && !extra.trim().isEmpty()){
+        if (extra != null && !extra.trim().isEmpty()) {
             return false;
         }

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

@@ -55 +55 @@
             this(code, Collections.singleton(p), message);
         }
+
         public AddressError(int code, Collection<OsmPrimitive> collection, String message) {
             this(code, collection, message, null, null);
         }
+
         public AddressError(int code, Collection<OsmPrimitive> collection, String message, String description, String englishDescription) {
             this(code, Severity.WARNING, collection, message, description, englishDescription);
         }
+
         public AddressError(int code, Severity severity, Collection<OsmPrimitive> collection, String message, String description,
                 String englishDescription) {
@@ -207 +210 @@
             centroid = ((Node) house).getEastNorth();
         } else if (house instanceof Way) {
-            List<Node> nodes = ((Way)house).getNodes();
+            List<Node> nodes = ((Way) house).getNodes();
             if (house.hasKey(ADDR_INTERPOLATION)) {
                 for (Node n : nodes) {

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

@@ -40 +40 @@
 
     /** All way segments, grouped by cells */
-    private Map<Point2D,List<WaySegment>> cellSegments;
+    private Map<Point2D, List<WaySegment>> cellSegments;
     /** The already detected errors */
     private Set<WaySegment> errorSegments;
@@ -181 +181 @@
      */
     public CrossingWays(String title) {
-        super(title, tr("This test checks if two roads, railways, waterways or buildings crosses in the same layer, but are not connected by a node."));
+        super(title, tr("This test checks if two roads, railways, waterways or buildings crosses in the same layer, " +
+                "but are not connected by a node."));
     }
 

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

@@ -121 +121 @@
     }
 
-
     @SuppressWarnings("unchecked")
     @Override
@@ -163 +162 @@
         List<TestError> errors = new ArrayList<>();
 
-        MultiMap<Map<String,String>, OsmPrimitive> mm = new MultiMap<>();
+        MultiMap<Map<String, String>, OsmPrimitive> mm = new MultiMap<>();
         for (Node n: nodes) {
             mm.put(n.getKeys(), n);
         }
 
-        Map<String,Boolean> typeMap=new HashMap<>();
+        Map<String, Boolean> typeMap = new HashMap<>();
         String[] types = {"none", "highway", "railway", "waterway", "boundary", "power", "natural", "landuse", "building"};
 
-
-        // check whether we have multiple nodes at the same position with
-        // the same tag set
-        //
-        for (Iterator<Map<String,String>> it = mm.keySet().iterator(); it.hasNext();) {
-            Map<String,String> tagSet = it.next();
+        // check whether we have multiple nodes at the same position with the same tag set
+        for (Iterator<Map<String, String>> it = mm.keySet().iterator(); it.hasNext();) {
+            Map<String, String> tagSet = it.next();
             if (mm.get(tagSet).size() > 1) {
 
@@ -184 +180 @@
 
                 for (OsmPrimitive p : mm.get(tagSet)) {
-                    if (p.getType()==OsmPrimitiveType.NODE) {
+                    if (p.getType() == OsmPrimitiveType.NODE) {
                         Node n = (Node) p;
-                        List<OsmPrimitive> lp=n.getReferrers();
+                        List<OsmPrimitive> lp = n.getReferrers();
                         for (OsmPrimitive sp: lp) {
-                            if (sp.getType()==OsmPrimitiveType.WAY) {
+                            if (sp.getType() == OsmPrimitiveType.WAY) {
                                 boolean typed = false;
-                                Way w=(Way) sp;
+                                Way w = (Way) sp;
                                 Map<String, String> keys = w.getKeys();
                                 for (String type: typeMap.keySet()) {
                                     if (keys.containsKey(type)) {
                                         typeMap.put(type, true);
-                                        typed=true;
+                                        typed = true;
                                     }
                                 }
@@ -207 +203 @@
                 }
 
-                int nbType=0;
+                int nbType = 0;
                 for (Entry<String, Boolean> entry: typeMap.entrySet()) {
                     if (entry.getValue()) {
@@ -214 +210 @@
                 }
 
-                if (nbType>1) {
+                if (nbType > 1) {
                     String msg = marktr("Mixed type duplicated nodes");
                     errors.add(new TestError(
@@ -364 +360 @@
                 // object to keep track of the nodes at this position.
                 //
-                Node n1 = (Node)potentialDuplicates.get(n);
+                Node n1 = (Node) potentialDuplicates.get(n);
                 List<Node> nodes = new ArrayList<>(2);
                 nodes.add(n1);
@@ -372 +368 @@
                 // we have multiple nodes at the same position.
                 //
-                List<Node> nodes = (List<Node>)potentialDuplicates.get(n);
+                List<Node> nodes = (List<Node>) potentialDuplicates.get(n);
                 nodes.add(n);
             }
@@ -413 +409 @@
         }
 
-        return null;// undoRedo handling done in mergeNodes
+        return null; // undoRedo handling done in mergeNodes
     }
 

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

@@ -55 +55 @@
         @Override
         public int hashCode() {
-            return role.hashCode()+(int)relId+tags.hashCode()+type.hashCode()+coor.hashCode();
+            return role.hashCode()+(int) relId+tags.hashCode()+type.hashCode()+coor.hashCode();
         }
 
@@ -62 +62 @@
             if (!(obj instanceof RelMember)) return false;
             RelMember rm = (RelMember) obj;
-            return rm.role.equals(role) && rm.type.equals(type) && rm.relId==relId && rm.tags.equals(tags) && rm.coor.equals(coor);
+            return rm.role.equals(role) && rm.type.equals(type) && rm.relId == relId && rm.tags.equals(tags) && rm.coor.equals(coor);
         }
 
@@ -233 +233 @@
         for (OsmPrimitive osm : sel)
             if (osm instanceof Relation && !osm.isDeleted()) {
-                relFix.add((Relation)osm);
+                relFix.add((Relation) osm);
             }
 
@@ -296 +296 @@
         for (OsmPrimitive osm : sel)
             if (osm instanceof Relation) {
-                relations.add((Relation)osm);
+                relations.add((Relation) osm);
             }
 

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

@@ -67 +67 @@
     private static class WayPairNoTags {
         private final List<LatLon> coor;
+
         public WayPairNoTags(List<LatLon> coor) {
             this.coor = coor;
         }
+
         @Override
         public int hashCode() {
             return coor.hashCode();
         }
+
         @Override
         public boolean equals(Object obj) {
@@ -125 +128 @@
             if (sameway.size() > 1) {
                 //Report error only if at least some tags are different, as otherwise the error was already reported as duplicated ways
-                Map<String, String> tags0=null;
-                boolean skip=true;
+                Map<String, String> tags0 = null;
+                boolean skip = true;
 
                 for (OsmPrimitive o : sameway) {
-                    if (tags0==null) {
-                        tags0=o.getKeys();
+                    if (tags0 == null) {
+                        tags0 = o.getKeys();
                         removeUninterestingKeys(tags0);
                     } else {
-                        Map<String, String> tagsCmp=o.getKeys();
+                        Map<String, String> tagsCmp = o.getKeys();
                         removeUninterestingKeys(tagsCmp);
                         if (!tagsCmp.equals(tags0)) {
-                            skip=false;
+                            skip = false;
                             break;
                         }
@@ -158 +161 @@
      */
     public void removeUninterestingKeys(Map<String, String> wkeys) {
-        for(String key : OsmPrimitive.getDiscardableKeys()) {
+        for (String key : OsmPrimitive.getDiscardableKeys()) {
             wkeys.remove(key);
         }
@@ -207 +210 @@
             int lowestIndex = 0;
             long lowestNodeId = wNodes.get(0).getUniqueId();
-            for (int i=1; i<wNodes.size(); i++) {
+            for (int i = 1; i < wNodes.size(); i++) {
                 if (wNodes.get(i).getUniqueId() < lowestNodeId) {
                     lowestNodeId = wNodes.get(i).getUniqueId();
@@ -213 +216 @@
                 }
             }
-            for (int i=lowestIndex; i<wNodes.size()-1; i++) {
+            for (int i = lowestIndex; i < wNodes.size()-1; i++) {
                 wNodesToUse.add(wNodes.get(i));
             }
-            for (int i=0; i<lowestIndex; i++) {
+            for (int i = 0; i < lowestIndex; i++) {
                 wNodesToUse.add(wNodes.get(i));
             }
@@ -241 +244 @@
         for (OsmPrimitive osm : sel) {
             if (osm instanceof Way && !osm.isDeleted()) {
-                ways.add((Way)osm);
+                ways.add((Way) osm);
             }
         }
@@ -301 +304 @@
 
         //Do not automatically fix same ways with different tags
-        if (testError.getCode()!=DUPLICATE_WAY) return false;
+        if (testError.getCode() != DUPLICATE_WAY) return false;
 
         // We fix it only if there is no more than one way that is relation member.
@@ -309 +312 @@
         for (OsmPrimitive osm : sel) {
             if (osm instanceof Way) {
-                ways.add((Way)osm);
+                ways.add((Way) osm);
             }
         }

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

@@ -132 +132 @@
             String errMsg = validator.getErrorMessage();
             // Special treatment to allow URLs without protocol. See UrlValidator#isValid
-            if (tr("URL contains an invalid protocol: {0}", (String)null).equals(errMsg)) {
+            if (tr("URL contains an invalid protocol: {0}", (String) null).equals(errMsg)) {
                 String proto = validator instanceof EmailValidator ? "mailto://" : "http://";
                 return doValidateTag(p, k, proto+value, validator, code);

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

@@ -35 +35 @@
     public void visit(Way w) {
         Double length = w.getLongestSegmentLength();
-        if(length > maxlength) {
+        if (length > maxlength) {
             length /= 1000.0;
             errors.add(new TestError(this, Severity.WARNING, tr("Long segments"),

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

@@ -424 +424 @@
         static String insertArguments(Selector matchingSelector, String s, OsmPrimitive p) {
             if (s != null && matchingSelector instanceof Selector.ChildOrParentSelector) {
-                return insertArguments(((Selector.ChildOrParentSelector)matchingSelector).right, s, p);
+                return insertArguments(((Selector.ChildOrParentSelector) matchingSelector).right, s, p);
             } else if (s == null || !(matchingSelector instanceof GeneralSelector)) {
                 return s;
@@ -583 +583 @@
             for (Selector s : rule.selectors) {
                 if (s instanceof AbstractSelector) {
-                    for (Condition c : ((AbstractSelector)s).getConditions()) {
+                    for (Condition c : ((AbstractSelector) s).getConditions()) {
                         if (c instanceof ClassCondition) {
                             result.add(((ClassCondition) c).id);

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

@@ -79 +79 @@
         for (Test t : OsmValidator.getEnabledTests(false)) {
             if (t instanceof UnclosedWays) {
-                keysCheckedByAnotherTest.addAll(((UnclosedWays)t).getCheckedKeys());
+                keysCheckedByAnotherTest.addAll(((UnclosedWays) t).getCheckedKeys());
                 break;
             }
@@ -94 +94 @@
         GeneralPath result = new GeneralPath();
         result.moveTo((float) nodes.get(0).getCoor().lat(), (float) nodes.get(0).getCoor().lon());
-        for (int i=1; i<nodes.size(); i++) {
+        for (int i = 1; i < nodes.size(); i++) {
             Node n = nodes.get(i);
             result.lineTo((float) n.getCoor().lat(), (float) n.getCoor().lon());

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

@@ -40 +40 @@
     public NameMismatch() {
         super(tr("Missing name:* translation"),
-            tr("This test finds multilingual objects whose ''name'' attribute is not equal to some ''name:*'' attribute and not a composition of ''name:*'' attributes, e.g., Italia - Italien - Italy."));
+            tr("This test finds multilingual objects whose ''name'' attribute is not equal to some ''name:*'' attribute " +
+                    "and not a composition of ''name:*'' attributes, e.g., Italia - Italien - Italy."));
     }
 

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

@@ -63 +63 @@
                         "    r.getErrors = function() {return [];};" +
                         "    return r;" +
-                        "  } catch(err) {" +
+                        "  } catch (err) {" +
                         "    return {" +
                         "      getWarnings: function() {return [];}," +

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

@@ -40 +40 @@
 
     /** Bag of all way segments */
-    private MultiMap<Pair<Node,Node>, WaySegment> nodePairs;
+    private MultiMap<Pair<Node, Node>, WaySegment> nodePairs;
 
     protected static final int OVERLAPPING_HIGHWAY = 101;

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

@@ -122 +122 @@
             List<List<Node>> nodesLists = new ArrayList<>();
             if (station instanceof Way) {
-                nodesLists.add(((Way)station).getNodes());
+                nodesLists.add(((Way) station).getNodes());
             } else if (station instanceof Relation) {
                 Multipolygon polygon = MultipolygonCache.getInstance().get(Main.map.mapView, (Relation) station);
@@ -147 +147 @@
             if (it.hasNext()) {
                 return new ChangePropertyCommand(it.next(),
-                        "power", towerPoleTagMap.get(((PowerLineError)testError).line));
+                        "power", towerPoleTagMap.get(((PowerLineError) testError).line));
             }
         }
@@ -155 +155 @@
     @Override
     public boolean isFixable(TestError testError) {
-        return testError instanceof PowerLineError && towerPoleTagMap.containsKey(((PowerLineError)testError).line);
+        return testError instanceof PowerLineError && towerPoleTagMap.containsKey(((PowerLineError) testError).line);
     }
 
@@ -207 +207 @@
     protected class PowerLineError extends TestError {
         private final Way line;
+
         public PowerLineError(Node n, Way line) {
             super(PowerLines.this, Severity.WARNING,
@@ -212 +213 @@
             this.line = line;
         }
+
         public final Node getNode() {
             // primitives list can be empty if all primitives have been purged

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

@@ -85 +85 @@
 
     private static class RolePreset {
+        private final List<Role> roles;
+        private final String name;
+
         public RolePreset(List<Role> roles, String name) {
             this.roles = roles;
             this.name = name;
         }
-        private final List<Role> roles;
-        private final String name;
     }
 
@@ -118 +119 @@
 
     private Map<String, RoleInfo> buildRoleInfoMap(Relation n) {
-        Map<String,RoleInfo> map = new HashMap<>();
+        Map<String, RoleInfo> map = new HashMap<>();
         for (RelationMember m : n.getMembers()) {
             String role = m.getRole();
@@ -150 +151 @@
             }
             if (matches && r != null) {
-                for(Role role: r.roles) {
+                for (Role role: r.roles) {
                     String key = role.key;
                     List<Role> roleGroup = null;
@@ -213 +214 @@
                     // verify if preset accepts such member
                     OsmPrimitive primitive = member.getMember();
-                    if(!primitive.isUsable()) {
+                    if (!primitive.isUsable()) {
                         // if member is not usable (i.e. not present in working set)
                         // we can't verify expression - so we just skip it
@@ -219 +220 @@
                     } else {
                         // verify expression
-                        if(r.memberExpression.match(primitive)) {
+                        if (r.memberExpression.match(primitive)) {
                             return true;
                         } else {
@@ -283 +284 @@
 
         // verify role counts based on whole role sets
-        for(RolePreset rp: allroles.values()) {
+        for (RolePreset rp: allroles.values()) {
             for (Role r: rp.roles) {
                 String keyname = r.key;

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

@@ -37 +37 @@
 
     /** All ways, grouped by cells */
-    private Map<Point2D,List<Way>> cellWays;
+    private Map<Point2D, List<Way>> cellWays;
     /** The already detected errors */
     private MultiMap<Way, Way> errorWays;
@@ -130 +130 @@
         if (m == 0)
             return n;
-        d = new int[n + 1][m + 1];
+        d = new int[n+1][m+1];
 
         // Step 2
@@ -198 +198 @@
         // check plain strings
         int distance = getLevenshteinDistance(name, name2);
-        boolean similar = distance>0 && distance<=2;
+        boolean similar = distance > 0 && distance <= 2;
 
         // try all rules

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

@@ -265 +265 @@
             }
             // TODO directionKeys are no longer in OsmPrimitive (search pattern is used instead)
-            /*  for(String a : OsmPrimitive.getDirectionKeys())
+            /*  for (String a : OsmPrimitive.getDirectionKeys())
                 presetsValueData.add(a);
              */
@@ -345 +345 @@
                 withErrors.put(p, "ICK");
             }
-            if (checkValues && (value!=null && value.length() > 255) && !withErrors.contains(p, "LV")) {
+            if (checkValues && (value != null && value.length() > 255) && !withErrors.contains(p, "LV")) {
                 errors.add(new TestError(this, Severity.ERROR, tr("Tag value longer than allowed"),
                         tr(s, key), MessageFormat.format(s, key), LONG_VALUE, p));
                 withErrors.put(p, "LV");
             }
-            if (checkKeys && (key!=null && key.length() > 255) && !withErrors.contains(p, "LK")) {
+            if (checkKeys && (key != null && key.length() > 255) && !withErrors.contains(p, "LK")) {
                 errors.add(new TestError(this, Severity.ERROR, tr("Tag key longer than allowed"),
                         tr(s, key), MessageFormat.format(s, key), LONG_KEY, p));
                 withErrors.put(p, "LK");
             }
-            if (checkValues && (value==null || value.trim().isEmpty()) && !withErrors.contains(p, "EV")) {
+            if (checkValues && (value == null || value.trim().isEmpty()) && !withErrors.contains(p, "EV")) {
                 errors.add(new TestError(this, Severity.WARNING, tr("Tags with empty values"),
                         tr(s, key), MessageFormat.format(s, key), EMPTY_VALUES, p));
@@ -392 +392 @@
                 }
                 for (String a : ignoreDataEquals) {
-                    if(key.equals(a)) {
+                    if (key.equals(a)) {
                         ignore = true;
                     }
                 }
                 for (String a : ignoreDataEndsWith) {
-                    if(key.endsWith(a)) {
+                    if (key.endsWith(a)) {
                         ignore = true;
                     }
@@ -508 +508 @@
         a.anchor = GridBagConstraints.EAST;
 
-        testPanel.add(new JLabel(name+" :"), GBC.eol().insets(3,0,0,0));
+        testPanel.add(new JLabel(name+" :"), GBC.eol().insets(3, 0, 0, 0));
 
         prefCheckKeys = new JCheckBox(tr("Check property keys."), Main.pref.getBoolean(PREF_CHECK_KEYS, true));
         prefCheckKeys.setToolTipText(tr("Validate that property keys are valid checking against list of words."));
-        testPanel.add(prefCheckKeys, GBC.std().insets(20,0,0,0));
+        testPanel.add(prefCheckKeys, GBC.std().insets(20, 0, 0, 0));
 
         prefCheckKeysBeforeUpload = new JCheckBox();
@@ -520 +520 @@
         prefCheckComplex = new JCheckBox(tr("Use complex property checker."), Main.pref.getBoolean(PREF_CHECK_COMPLEX, true));
         prefCheckComplex.setToolTipText(tr("Validate property values and tags using complex rules."));
-        testPanel.add(prefCheckComplex, GBC.std().insets(20,0,0,0));
+        testPanel.add(prefCheckComplex, GBC.std().insets(20, 0, 0, 0));
 
         prefCheckComplexBeforeUpload = new JCheckBox();
@@ -547 +547 @@
         prefCheckValues = new JCheckBox(tr("Check property values."), Main.pref.getBoolean(PREF_CHECK_VALUES, true));
         prefCheckValues.setToolTipText(tr("Validate that property values are valid checking against presets."));
-        testPanel.add(prefCheckValues, GBC.std().insets(20,0,0,0));
+        testPanel.add(prefCheckValues, GBC.std().insets(20, 0, 0, 0));
 
         prefCheckValuesBeforeUpload = new JCheckBox();
@@ -555 +555 @@
         prefCheckFixmes = new JCheckBox(tr("Check for FIXMES."), Main.pref.getBoolean(PREF_CHECK_FIXMES, true));
         prefCheckFixmes.setToolTipText(tr("Looks for nodes or ways with FIXME in any property value."));
-        testPanel.add(prefCheckFixmes, GBC.std().insets(20,0,0,0));
+        testPanel.add(prefCheckFixmes, GBC.std().insets(20, 0, 0, 0));
 
         prefCheckFixmesBeforeUpload = new JCheckBox();
@@ -667 +667 @@
             private Pattern getPattern(String str) throws PatternSyntaxException {
                 if (str.endsWith("/i"))
-                    return Pattern.compile(str.substring(1,str.length()-2), Pattern.CASE_INSENSITIVE);
+                    return Pattern.compile(str.substring(1, str.length()-2), Pattern.CASE_INSENSITIVE);
                 if (str.endsWith("/"))
-                    return Pattern.compile(str.substring(1,str.length()-1));
+                    return Pattern.compile(str.substring(1, str.length()-1));
 
                 throw new IllegalStateException();
             }
+
             public CheckerElement(String exp) throws PatternSyntaxException {
                 Matcher m = Pattern.compile("(.+)([!=]=)(.+)").matcher(exp);

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

@@ -174 +174 @@
 
         for (OsmPrimitive parent: w.getReferrers()) {
-            if (parent instanceof Relation && ((Relation)parent).isMultipolygon())
+            if (parent instanceof Relation && ((Relation) parent).isMultipolygon())
                 return;
         }

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

@@ -423 +423 @@
             return ret;
         for (int i = 1; i < size; ++i) {
-            if(i < size-1) {
+            if (i < size-1) {
                 addNode(w.getNode(i), middlenodes);
             }

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

@@ -127 +127 @@
                         OsmPrimitive member = m.getMember();
                         if (member instanceof Way && member.isUsable() && !member.isTagged()) {
-                            waysUsedInRelations.add((Way)member);
+                            waysUsedInRelations.add((Way) member);
                         }
                     }

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

@@ -40 +40 @@
         List<OsmPrimitive> r = w.firstNode().getReferrers();
         for (OsmPrimitive p : r) {
-            if(p != w && p.hasKey("highway")) {
+            if (p != w && p.hasKey("highway")) {
                 hasway = true;
                 break;
@@ -53 +53 @@
         r = w.lastNode().getReferrers();
         for (OsmPrimitive p : r) {
-            if(p != w && p.hasKey("highway")) {
+            if (p != w && p.hasKey("highway")) {
                 hasway = true;
                 break;

trunk/src/org/openstreetmap/josm/data/validation/util/Entities.java

@@ -382 +382 @@
                         }
                     } else { // escaped value content is an entity name
-                        if(mapNameToValue == null) {
+                        if (mapNameToValue == null) {
                             mapNameToValue = new HashMap<>();
                             for (String[] pair : ARRAY)

trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java

@@ -33 +33 @@
      * @return A list with all the cells the way starts or ends
      */
-    public static List<List<Way>> getWaysInCell(Way w, Map<Point2D,List<Way>> cellWays) {
+    public static List<List<Way>> getWaysInCell(Way w, Map<Point2D, List<Way>> cellWays) {
         if (w.getNodesCount() == 0)
             return Collections.emptyList();