Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.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/gui/dialogs/relation/sort/RelationNodeMap.java (modified) (15 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java

@@ -35 +35 @@
         public final Map<Integer, Set<Node>> ways = new TreeMap<>();
         public final boolean oneWay;
-        public NodesWays(boolean oneWay){
+
+        public NodesWays(boolean oneWay) {
             this.oneWay = oneWay;
         }
@@ -62 +63 @@
 
     public static Node firstOnewayNode(RelationMember m) {
-        if(!m.isWay()) return null;
-        if("backward".equals(m.getRole())) {
+        if (!m.isWay()) return null;
+        if ("backward".equals(m.getRole())) {
             return m.getWay().lastNode();
         }
@@ -70 +71 @@
 
     public static Node lastOnewayNode(RelationMember m) {
-        if(!m.isWay()) return null;
-        if("backward".equals(m.getRole())) {
+        if (!m.isWay()) return null;
+        if ("backward".equals(m.getRole())) {
             return m.getWay().firstNode();
         }
@@ -90 +91 @@
                     addPair(nd, i);
                 }
-            } else if(RelationSortUtils.isOneway(m)) {
+            } else if (RelationSortUtils.isOneway(m)) {
                 addNodeWayMap(firstOnewayNode(m), i);
                 addWayNodeMap(lastOnewayNode(m), i);
@@ -180 +181 @@
         if (firstOneway != null) return popForwardOnewayPart(way);
 
-        if (map.ways.containsKey(way)){
+        if (map.ways.containsKey(way)) {
             for (Node n : map.ways.get(way)) {
                 Integer i = deleteAndGetAdjacentNode(map, n);
-                if(i != null) return i;
+                if (i != null) return i;
 
                 Integer j = deleteAndGetAdjacentNode(onewayMap, n);
-                if(j != null) {
+                if (j != null) {
                     firstOneway = j;
                     return j;
@@ -198 +199 @@
 
     private Integer popForwardOnewayPart(Integer way) {
-        if(onewayMap.ways.containsKey(way)) {
+        if (onewayMap.ways.containsKey(way)) {
             for (Node n : onewayMap.ways.get(way)) {
                 Integer i = findAdjacentWay(onewayMap, n);
-                if(i == null) {
+                if (i == null) {
                     continue;
                 }
 
                 lastOnewayNode = processBackwardIfEndOfLoopReached(i);
-                if(lastOnewayNode != null)
+                if (lastOnewayNode != null)
                     return popBackwardOnewayPart(firstOneway);
 
@@ -221 +222 @@
         if (onewayReverseMap.ways.containsKey(way)) {
             for (Node n : onewayReverseMap.ways.get(way)) {
-                if((map.nodes.containsKey(n))
+                if ((map.nodes.containsKey(n))
                         || (onewayMap.nodes.containsKey(n) && onewayMap.nodes.get(n).size() > 1))
                     return n;
-                if(firstCircular != null && firstCircular == n)
+                if (firstCircular != null && firstCircular == n)
                     return firstCircular;
             }
@@ -231 +232 @@
     }
 
-    private Integer popBackwardOnewayPart(int way){
+    private Integer popBackwardOnewayPart(int way) {
         if (lastOnewayNode != null) {
             Set<Node> nodes = new TreeSet<>();
@@ -241 +242 @@
             }
             for (Node n : nodes) {
-                if(n == lastOnewayNode) { //if oneway part ends
+                if (n == lastOnewayNode) { //if oneway part ends
                     firstOneway = null;
                     lastOnewayNode = null;
                     Integer j = deleteAndGetAdjacentNode(map, n);
-                    if(j != null) return j;
+                    if (j != null) return j;
 
                     Integer k = deleteAndGetAdjacentNode(onewayMap, n);
-                    if(k != null) {
+                    if (k != null) {
                         firstOneway = k;
                         return k;
@@ -255 +256 @@
 
                 Integer j = deleteAndGetAdjacentNode(onewayReverseMap, n);
-                if(j != null) return j;
+                if (j != null) return j;
             }
         }
@@ -273 +274 @@
     private Integer deleteAndGetAdjacentNode(NodesWays nw, Node n) {
         Integer j = findAdjacentWay(nw, n);
-        if(j == null) return null;
+        if (j == null) return null;
         deleteWayNode(nw, j, n);
         return j;
@@ -285 +286 @@
 
     private void deleteWayNode(NodesWays nw, Integer way, Node n) {
-        if(nw.oneWay) {
+        if (nw.oneWay) {
             doneOneway(way);
         } else {
@@ -298 +299 @@
      */
     public Integer pop() {
-        if (!remaining.isEmpty()){
+        if (!remaining.isEmpty()) {
             Integer i = remaining.iterator().next();
             done(i);
@@ -305 +306 @@
 
         if (remainingOneway.isEmpty()) return null;
-        for(Integer i :remainingOneway.keySet()){ //find oneway, which is connected to more than one way (is between two oneway loops)
-            for(Node n : onewayReverseMap.ways.get(i)){
-                if(onewayReverseMap.nodes.containsKey(n) && onewayReverseMap.nodes.get(n).size() > 1) {
+        for (Integer i :remainingOneway.keySet()) { //find oneway, which is connected to more than one way (is between two oneway loops)
+            for (Node n : onewayReverseMap.ways.get(i)) {
+                if (onewayReverseMap.nodes.containsKey(n) && onewayReverseMap.nodes.get(n).size() > 1) {
                     doneOneway(i);
                     firstCircular = n;
@@ -327 +328 @@
         Set<Node> nodesForward = remainingOneway.get(i);
         for (Node n : nodesForward) {
-            if(onewayMap.nodes.containsKey(n)) {
+            if (onewayMap.nodes.containsKey(n)) {
                 onewayMap.nodes.get(n).remove(i);
             }
-            if(onewayReverseMap.nodes.containsKey(n)) {
+            if (onewayReverseMap.nodes.containsKey(n)) {
                 onewayReverseMap.nodes.get(n).remove(i);
             }