Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/actions/SplitWayAction.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/actions/SplitWayAction.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -183 +183 @@
             sel.addAll(selectedWays);
             sel.addAll(selectedRelations);
-            SplitWayResult result = splitWay(getEditLayer(),selectedWay, wayChunks, sel);
+            SplitWayResult result = splitWay(getEditLayer(), selectedWay, wayChunks, sel);
             Main.main.undoRedo.add(result.getCommand());
             getCurrentDataSet().setSelected(result.getNewSelection());
@@ -226 +226 @@
             new ArrayList<>(OsmPrimitive.getFilteredList(selectedNodes.get(0).getReferrers(),
                                                          Way.class));
-        for (int i=1; i<selectedNodes.size(); i++) {
+        for (int i = 1; i < selectedNodes.size(); i++) {
             List<OsmPrimitive> ref = selectedNodes.get(i).getReferrers();
             for (Iterator<Way> it = result.iterator(); it.hasNext();) {
@@ -268 +268 @@
      * @return the list of chunks
      */
-    public static List<List<Node>> buildSplitChunks(Way wayToSplit, List<Node> splitPoints){
+    public static List<List<Node>> buildSplitChunks(Way wayToSplit, List<Node> splitPoints) {
         CheckParameterUtil.ensureParameterNotNull(wayToSplit, "wayToSplit");
         CheckParameterUtil.ensureParameterNotNull(splitPoints, "splitPoints");
@@ -392 +392 @@
                         /* this code assumes the restriction is correct. No real error checking done */
                         String role = rm.getRole();
-                        if("from".equals(role) || "to".equals(role)) {
+                        if ("from".equals(role) || "to".equals(role)) {
                             OsmPrimitive via = null;
                             for (RelationMember rmv : r.getMembers()) {
-                                if ("via".equals(rmv.getRole())){
+                                if ("via".equals(rmv.getRole())) {
                                     via = rmv.getMember();
                                 }
@@ -402 +402 @@
                             if (via != null) {
                                 if (via instanceof Node) {
-                                    nodes.add((Node)via);
+                                    nodes.add((Node) via);
                                 } else if (via instanceof Way) {
-                                    nodes.add(((Way)via).lastNode());
-                                    nodes.add(((Way)via).firstNode());
+                                    nodes.add(((Way) via).lastNode());
+                                    nodes.add(((Way) via).firstNode());
                                 }
                             }
                             Way res = null;
                             for (Node n : nodes) {
-                                if(changedWay.isFirstLastNode(n)) {
+                                if (changedWay.isFirstLastNode(n)) {
                                     res = way;
                                 }
@@ -416 +416 @@
                             if (res == null) {
                                 for (Way wayToAdd : newWays) {
-                                    for(Node n : nodes) {
-                                        if(wayToAdd.isFirstLastNode(n)) {
+                                    for (Node n : nodes) {
+                                        if (wayToAdd.isFirstLastNode(n)) {
                                             res = wayToAdd;
                                         }
@@ -433 +433 @@
                                 insert = false;
                             }
-                        } else if(!"via".equals(role)) {
+                        } else if (!"via".equals(role)) {
                             warnme = true;
                         }
@@ -451 +451 @@
                         int k = 1;
                         while (i_r - k >= 0 || i_r + k < relationMembers.size()) {
-                            if ((i_r - k >= 0) && relationMembers.get(i_r - k).isWay()){
+                            if ((i_r - k >= 0) && relationMembers.get(i_r - k).isWay()) {
                                 Way w = relationMembers.get(i_r - k).getWay();
                                 if ((w.lastNode() == way.firstNode()) || w.firstNode() == way.firstNode()) {
@@ -460 +460 @@
                                 break;
                             }
-                            if ((i_r + k < relationMembers.size()) && relationMembers.get(i_r + k).isWay()){
+                            if ((i_r + k < relationMembers.size()) && relationMembers.get(i_r + k).isWay()) {
                                 Way w = relationMembers.get(i_r + k).getWay();
                                 if ((w.lastNode() == way.firstNode()) || w.firstNode() == way.firstNode()) {
@@ -537 +537 @@
         List<List<Node>> chunks = buildSplitChunks(way, atNodes);
         if (chunks == null) return null;
-        return splitWay(layer,way, chunks, selection);
+        return splitWay(layer, way, chunks, selection);
     }