Changeset 8342 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2015-05-09T12:49:35+02:00 (9 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/data/osm

Files:

• User.java (modified) (1 diff)
• visitor/paint/LineClip.java (modified) (3 diffs)
• visitor/paint/StyledMapRenderer.java (modified) (2 diffs)

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

@@ -228 +228 @@
         if (names.size() == 1) {
             s.append(" name:").append(getName());
-        }
-        else if (names.size() > 1) {
+        } else if (names.size() > 1) {
             s.append(String.format(" %d names:%s", names.size(), getName()));
         }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java

@@ -72 +72 @@
                 accept = true;
                 done = true;
-            }
-            else if ( (outcode0 & outcode1) > 0 ) {
+            } else if ( (outcode0 & outcode1) > 0 ) {
                 done = true;
-            }
-            else {
+            } else {
                 long x = 0, y = 0;
                 outcodeOut = outcode0 != 0 ? outcode0: outcode1;
@@ -82 +80 @@
                     x = x1 + (x2 - x1) * (ymax - y1)/(y2 - y1);
                     y = ymax;
-                }
-                else if ((outcodeOut & OUT_BOTTOM) > 0 ) {
+                } else if ((outcodeOut & OUT_BOTTOM) > 0 ) {
                     x = x1 + (x2 - x1) * (ymin - y1)/(y2 - y1);
                     y = ymin;
-                }
-                else if ((outcodeOut & OUT_RIGHT)> 0) {
+                } else if ((outcodeOut & OUT_RIGHT)> 0) {
                     y = y1 + (y2 - y1) * (xmax - x1)/(x2 - x1);
                     x = xmax;
-                }
-                else if ((outcodeOut & OUT_LEFT) > 0) {
+                } else if ((outcodeOut & OUT_LEFT) > 0) {
                     y = y1 + (y2 - y1) * (xmin - x1)/(x2 - x1);
                     x = xmin;
@@ -124 +119 @@
         if (y > ymax) {
             code |= OUT_TOP;
-        }
-        else if (y < ymin) {
+        } else if (y < ymin) {
             code |= OUT_BOTTOM;
         }
         if (x > xmax) {
             code |= OUT_RIGHT;
-        }
-        else if (x < xmin) {
+        } else if (x < xmin) {
             code |= OUT_LEFT;
         }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -946 +946 @@
 
         Node viaNode;
-        if(via instanceof Node)
-        {
+        if(via instanceof Node) {
             viaNode = (Node) via;
             if(!fromWay.isFirstLastNode(viaNode))
                 return;
-        }
-        else
-        {
+        } else {
             Way viaWay = (Way) via;
             Node firstNode = viaWay.firstNode();
@@ -960 +957 @@
 
             String onewayviastr = viaWay.get("oneway");
-            if(onewayviastr != null)
-            {
+            if(onewayviastr != null) {
                 if("-1".equals(onewayviastr)) {
                     onewayvia = true;