Changeset 8449 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2015-06-03T00:46:40+02:00 (10 years ago)

Author:

Don-vip

Message:

remove extra whitespaces

File:

• trunk/src/org/openstreetmap/josm/tools/Geometry.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -70 +70 @@
 
         //copy node arrays for local usage.
-        for (int pos = 0; pos < n; pos ++) {
+        for (int pos = 0; pos < n; pos++) {
             newNodes[pos] = new ArrayList<>(ways.get(pos).getNodes());
             wayBounds[pos] = getNodesBounds(newNodes[pos]);
@@ -78 +78 @@
         //iterate over all way pairs and introduce the intersections
         Comparator<Node> coordsComparator = new NodePositionComparator();
-        for (int seg1Way = 0; seg1Way < n; seg1Way ++) {
-            for (int seg2Way = seg1Way; seg2Way < n; seg2Way ++) {
+        for (int seg1Way = 0; seg1Way < n; seg1Way++) {
+            for (int seg2Way = seg1Way; seg2Way < n; seg2Way++) {
 
                 //do not waste time on bounds that do not intersect
@@ -90 +90 @@
 
                 //iterate over primary segmemt
-                for (int seg1Pos = 0; seg1Pos + 1 < way1Nodes.size(); seg1Pos ++) {
+                for (int seg1Pos = 0; seg1Pos + 1 < way1Nodes.size(); seg1Pos++) {
 
                     //iterate over secondary segment
                     int seg2Start = seg1Way != seg2Way ? 0: seg1Pos + 2;//skip the adjacent segment
 
-                    for (int seg2Pos = seg2Start; seg2Pos + 1< way2Nodes.size(); seg2Pos ++) {
+                    for (int seg2Pos = seg2Start; seg2Pos + 1< way2Nodes.size(); seg2Pos++) {
 
                         //need to get them again every time, because other segments may be changed
@@ -106 +106 @@
                         //test if we have common nodes to add.
                         if (seg1Node1 == seg2Node1 || seg1Node1 == seg2Node2) {
-                            commonCount ++;
+                            commonCount++;
 
                             if (seg1Way == seg2Way &&
@@ -118 +118 @@
 
                         if (seg1Node2 == seg2Node1 || seg1Node2 == seg2Node2) {
-                            commonCount ++;
+                            commonCount++;
 
                             intersectionNodes.add(seg1Node2);
@@ -165 +165 @@
                                     //fix seg2 position, as indexes have changed, seg2Pos is always bigger than seg1Pos on the same segment.
                                     if (seg2Way == seg1Way) {
-                                        seg2Pos ++;
+                                        seg2Pos++;
                                     }
                                 }
@@ -174 +174 @@
 
                                     //Do not need to compare again to already split segment
-                                    seg2Pos ++;
+                                    seg2Pos++;
                                 }
 
@@ -191 +191 @@
 
 
-        for (int pos = 0; pos < ways.size(); pos ++) {
+        for (int pos = 0; pos < ways.size(); pos++) {
             if (!changedWays[pos]) {
                 continue;
@@ -292 +292 @@
         double det = a1*b2 - a2*b1;
 
-        double uu = b2*c1 - b1*c2 ;
+        double uu = b2*c1 - b1*c2;
         double vv = a1*c2 - a2*c1;
         double mag = Math.abs(uu)+Math.abs(vv);