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

Timestamp:

2015-05-09T12:49:35+02:00 (10 years ago)

Author:

Don-vip

Message:

code style - Close curly brace and the next "else", "catch" and "finally" keywords should be located on the same line

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• Diff.java (modified) (4 diffs)
• Geometry.java (modified) (1 diff)

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

@@ -764 +764 @@
                            or until the first nonprovisional at least 8 lines in.
                            Until that point, cancel any provisionals.  */
-                        for (j = 0, consec = 0; j < length; j++)
-                        {
+                        for (j = 0, consec = 0; j < length; j++) {
                             if (j >= 8 && discards[i + j] == 1) {
                                 break;
@@ -771 +770 @@
                             if (discards[i + j] == 2) {
                                 consec = 0; discards[i + j] = 0;
-                            }
-                            else if (discards[i + j] == 0) {
+                            } else if (discards[i + j] == 0) {
                                 consec = 0;
                             } else {
@@ -786 +784 @@
 
                         /* Same thing, from end.  */
-                        for (j = 0, consec = 0; j < length; j++)
-                        {
+                        for (j = 0, consec = 0; j < length; j++) {
                             if (j >= 8 && discards[i - j] == 1) {
                                 break;
@@ -793 +790 @@
                             if (discards[i - j] == 2) {
                                 consec = 0; discards[i - j] = 0;
-                            }
-                            else if (discards[i - j] == 0) {
+                            } else if (discards[i - j] == 0) {
                                 consec = 0;
                             } else {

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

@@ -183 +183 @@
                                 }
                             }
-                        }
-                        else if (test && !intersectionNodes.isEmpty())
+                        } else if (test && !intersectionNodes.isEmpty())
                             return intersectionNodes;
                     }