Changeset 8395 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2015-05-19T00:05:33+02:00 (10 years ago)

Author:

Don-vip

Message:

convention - An open curly brace should be located at the end of a line

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CombineWayAction.java (modified) (1 diff)
• JoinAreasAction.java (modified) (1 diff)
• mapmode/ExtrudeAction.java (modified) (1 diff)
• mapmode/SelectAction.java (modified) (1 diff)
• search/SearchAction.java (modified) (1 diff)

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

@@ -222 +222 @@
         final Way selectedWay = combineResult.a;
         Main.main.undoRedo.add(combineResult.b);
-        if(selectedWay != null)
-        {
+        if(selectedWay != null) {
             Runnable guiTask = new Runnable() {
                 @Override

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

@@ -1328 +1328 @@
             }
 
-            for (Way way :innerWays)
-            {
+            for (Way way :innerWays) {
                 if (processedOuterWays.contains(way)) {
                     new Notification(

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -1144 +1144 @@
      * @param seg the reference segment
      */
-    private void drawReferenceSegment(Graphics2D g2, MapView mv, ReferenceSegment seg)
-    {
+    private void drawReferenceSegment(Graphics2D g2, MapView mv, ReferenceSegment seg) {
         Point p1 = mv.getPoint(seg.p1);
         Point p2 = mv.getPoint(seg.p2);

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -509 +509 @@
             return;
 
-        if (mode != Mode.ROTATE && mode != Mode.SCALE) // button is pressed in rotate mode
-        {
-            if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == 0)
-                return;
+        if (mode != Mode.ROTATE && mode != Mode.SCALE && (e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == 0) {
+            // button is pressed in rotate mode
+            return;
         }
 

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -261 +261 @@
         left.add(in_selection, GBC.eop());
         left.add(caseSensitive, GBC.eol());
-        if(Main.pref.getBoolean("expert", false))
-        {
+        if(Main.pref.getBoolean("expert", false)) {
             left.add(allElements, GBC.eol());
             left.add(regexSearch, GBC.eol());