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

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

@@ -27 +27 @@
         final List<WayConnectionType> con = new ArrayList<>();
 
-        for (int i=0; i<members.size(); ++i) {
+        for (int i = 0; i < members.size(); ++i) {
             con.add(null);
         }
 
-        firstGroupIdx=0;
+        firstGroupIdx = 0;
 
         lastForwardWay = UNCONNECTED;
@@ -38 +38 @@
         WayConnectionType lastWct = null;
 
-        for (int i=0; i<members.size(); ++i) {
+        for (int i = 0; i < members.size(); ++i) {
             final RelationMember m = members.get(i);
             if (!m.isWay() || m.getWay() == null || m.getWay().isIncomplete()) {
@@ -50 +50 @@
 
             WayConnectionType wct = new WayConnectionType(false);
-            wct.linkPrev = i>0 && con.get(i-1) != null && con.get(i-1).isValid();
+            wct.linkPrev = i > 0 && con.get(i-1) != null && con.get(i-1).isValid();
             wct.direction = NONE;
 
-            if (RelationSortUtils.isOneway(m)){
+            if (RelationSortUtils.isOneway(m)) {
                 if (lastWct != null && lastWct.isOnewayTail) {
                     wct.isOnewayHead = true;
                 }
-                if (lastBackwardWay == UNCONNECTED && lastForwardWay == UNCONNECTED){ //Beginning of new oneway
+                if (lastBackwardWay == UNCONNECTED && lastForwardWay == UNCONNECTED) { //Beginning of new oneway
                     wct.isOnewayHead = true;
                     lastForwardWay = i-1;
@@ -81 +81 @@
             if (!wct.linkPrev) {
                 wct.direction = determineDirectionOfFirst(i, m);
-                if (RelationSortUtils.isOneway(m)){
+                if (RelationSortUtils.isOneway(m)) {
                     wct.isOnewayLoopForwardPart = true;
                     lastForwardWay = i;
@@ -115 +115 @@
         }
         if (loop) {
-            for (int j=firstGroupIdx; j <= i; ++j) {
+            for (int j = firstGroupIdx; j <= i; ++j) {
                 con.get(j).isLoop = true;
             }
@@ -126 +126 @@
             return result;
 
-        if (RelationSortUtils.isOneway(m)){
+        if (RelationSortUtils.isOneway(m)) {
             if (RelationSortUtils.isBackward(m)) return BACKWARD;
             else return FORWARD;
@@ -159 +159 @@
 
         if (RelationSortUtils.isOneway(m)) {
-            if (dirBW != NONE){
+            if (dirBW != NONE) {
                 wct.direction = dirBW;
                 lastBackwardWay = i;
                 wct.isOnewayLoopBackwardPart = true;
             }
-            if (dirFW != NONE){
+            if (dirFW != NONE) {
                 wct.direction = dirFW;
                 lastForwardWay = i;
@@ -184 +184 @@
 
             if (dirFW != NONE && dirBW != NONE) { //End of oneway loop
-                if (i+1<members.size() && determineDirection(i, dirFW, i+1) != NONE) {
+                if (i+1 < members.size() && determineDirection(i, dirFW, i+1) != NONE) {
                     wct.isOnewayLoopBackwardPart = false;
                     wct.direction = dirFW;
@@ -204 +204 @@
     }
 
-    private static Direction reverse(final Direction dir){
+    private static Direction reverse(final Direction dir) {
         if (dir == FORWARD) return BACKWARD;
         if (dir == BACKWARD) return FORWARD;
@@ -247 +247 @@
 
         /** the list of nodes the way k can dock to */
-        List<Node> refNodes= new ArrayList<>();
+        List<Node> refNodes = new ArrayList<>();
 
         switch (ref_direction) {