Changeset 11587 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2017-02-19T23:52:08+01:00 (7 years ago)

Author:

Don-vip

Message:

checkstyle - enable BooleanExpressionComplexity / 6

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/relation/sort/RelationSortUtils.java (modified) (2 diffs)
• layer/gpx/GpxDrawHelper.java (modified) (2 diffs)

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

@@ -7 +7 @@
 
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
@@ -28 +29 @@
 
     static Direction roundaboutType(Way w) {
-        if (w != null &&
-                "roundabout".equals(w.get("junction")) &&
-                w.getNodesCount() < 200 &&
-                w.getNodesCount() > 2 &&
-                w.getNode(0) != null &&
-                w.getNode(1) != null &&
-                w.getNode(2) != null &&
-                w.isClosed()) {
-            /** do some simple determinant / cross pruduct test on the first 3 nodes
-                to see, if the roundabout goes clock wise or ccw */
-            EastNorth en1 = w.getNode(0).getEastNorth();
-            EastNorth en2 = w.getNode(1).getEastNorth();
-            EastNorth en3 = w.getNode(2).getEastNorth();
-            if (en1 != null && en2 != null && en3 != null) {
-                en1 = en2.subtract(en1);
-                en2 = en3.subtract(en2);
-                return en1.north() * en2.east() - en2.north() * en1.east() > 0 ? ROUNDABOUT_LEFT : ROUNDABOUT_RIGHT;
+        if (w != null && "roundabout".equals(w.get("junction"))) {
+            int nodesCount = w.getNodesCount();
+            if (nodesCount > 2 && nodesCount < 200) {
+                Node n1 = w.getNode(0);
+                Node n2 = w.getNode(1);
+                Node n3 = w.getNode(2);
+                if (n1 != null && n2 != null && n3 != null && w.isClosed()) {
+                    /** do some simple determinant / cross pruduct test on the first 3 nodes
+                        to see, if the roundabout goes clock wise or ccw */
+                    EastNorth en1 = n1.getEastNorth();
+                    EastNorth en2 = n2.getEastNorth();
+                    EastNorth en3 = n3.getEastNorth();
+                    if (en1 != null && en2 != null && en3 != null) {
+                        en1 = en2.subtract(en1);
+                        en2 = en3.subtract(en2);
+                        return en1.north() * en2.east() - en2.north() * en1.east() > 0 ? ROUNDABOUT_LEFT : ROUNDABOUT_RIGHT;
+                    }
+                }
             }
         }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -1352 +1352 @@
      */
     private void checkCache() {
+        // CHECKSTYLE.OFF: BooleanExpressionComplexity
         if ((computeCacheMaxLineLengthUsed != maxLineLength)
                 || (computeCacheColored != colored)
@@ -1361 +1362 @@
                 || (computeCacheHeatMapDrawGain != heatMapDrawGain))
                 || (computeCacheHeatMapDrawLowerLimit != heatMapDrawLowerLimit)
-      ) {
+        ) {
+            // CHECKSTYLE.ON: BooleanExpressionComplexity
             computeCacheMaxLineLengthUsed = maxLineLength;
             computeCacheInSync = false;