Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java

Timestamp:

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

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (modified) (8 diffs)

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
     }