Changeset 7402 in josm for trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java

Timestamp:

2014-08-15T18:53:18+02:00 (10 years ago)

Author:

Don-vip

Message:

fix some Sonar issues

File:

• trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java

@@ -59 +59 @@
             List<Node> nodes = new ArrayList<>();
 
-            for(int waypos = 0; waypos < this.ways.size(); waypos ++) {
+            for (int waypos = 0; waypos < this.ways.size(); waypos ++) {
                 Way way = this.ways.get(waypos);
                 boolean reversed = this.reversed.get(waypos).booleanValue();
@@ -67 +67 @@
                         nodes.add(way.getNode(pos));
                     }
-                }
-                else {
+                } else {
                     for (int pos = way.getNodesCount() - 1; pos > 0; pos--) {
                         nodes.add(way.getNode(pos));
@@ -88 +87 @@
         public List<JoinedPolygon> innerWays;
 
-        public PolygonLevel(JoinedPolygon _pol, int _level) {
-            this.outerWay = _pol;
-            this.level = _level;
+        public PolygonLevel(JoinedPolygon pol, int level) {
+            this.outerWay = pol;
+            this.level = level;
             this.innerWays = new ArrayList<>();
         }
@@ -161 +160 @@
         Set<Way> usedWays = new HashSet<>();
 
-        for(Way w: ways) {
+        for (Way w: ways) {
             if (w.getNodesCount() < 2) {
                 throw new JoinedPolygonCreationException(tr("Cannot add a way with only {0} nodes.", w.getNodesCount()));
@@ -171 +170 @@
                 joinedWays.add(jw);
                 usedWays.add(w);
-            }
-            else {
+            } else {
                 nodesWithConnectedWays.put(w.lastNode(), w);
                 nodesWithConnectedWays.put(w.firstNode(), w);
@@ -249 +247 @@
             if (pol.level % 2 == 0) {
                 this.outerWays.add(pol.outerWay);
-            }
-            else {
+            } else {
                 this.innerWays.add(pol.outerWay);
             }