Changeset 8395 in josm

Timestamp:

2015-05-19T00:05:33+02:00 (9 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

Files:

• Main.java (modified) (1 diff)
• actions/CombineWayAction.java (modified) (1 diff)
• actions/JoinAreasAction.java (modified) (1 diff)
• actions/mapmode/ExtrudeAction.java (modified) (1 diff)
• actions/mapmode/SelectAction.java (modified) (1 diff)
• actions/search/SearchAction.java (modified) (1 diff)
• data/CustomConfigurator.java (modified) (1 diff)
• data/Preferences.java (modified) (1 diff)
• data/coor/QuadTiling.java (modified) (1 diff)
• data/osm/OsmPrimitive.java (modified) (1 diff)
• data/osm/User.java (modified) (1 diff)
• data/osm/visitor/BoundingXYVisitor.java (modified) (3 diffs)
• data/osm/visitor/paint/AbstractMapRenderer.java (modified) (1 diff)
• data/osm/visitor/paint/StyledMapRenderer.java (modified) (1 diff)
• data/osm/visitor/paint/WireframeMapRenderer.java (modified) (1 diff)
• data/validation/util/Entities.java (modified) (1 diff)
• gui/DefaultNameFormatter.java (modified) (2 diffs)
• gui/MapView.java (modified) (1 diff)
• gui/NavigatableComponent.java (modified) (1 diff)
• gui/dialogs/DialogsPanel.java (modified) (1 diff)
• gui/dialogs/LayerListDialog.java (modified) (1 diff)
• gui/dialogs/SelectionListDialog.java (modified) (1 diff)
• gui/help/HelpBrowserHistory.java (modified) (1 diff)
• gui/io/CredentialDialog.java (modified) (2 diffs)
• gui/layer/geoimage/GeoImageLayer.java (modified) (1 diff)
• gui/layer/markerlayer/MarkerLayer.java (modified) (1 diff)
• gui/mappaint/ElemStyles.java (modified) (1 diff)
• gui/mappaint/xml/LinePrototype.java (modified) (1 diff)
• gui/mappaint/xml/LinemodPrototype.java (modified) (1 diff)
• gui/mappaint/xml/XmlStyleSource.java (modified) (1 diff)
• gui/preferences/ToolbarPreferences.java (modified) (5 diffs)
• gui/preferences/advanced/PreferencesTable.java (modified) (2 diffs)
• gui/preferences/display/ColorPreference.java (modified) (2 diffs)
• io/NmeaReader.java (modified) (1 diff)
• io/remotecontrol/handler/AddNodeHandler.java (modified) (1 diff)
• io/remotecontrol/handler/RequestHandler.java (modified) (1 diff)
• plugins/PluginInformation.java (modified) (1 diff)
• tools/AudioPlayer.java (modified) (1 diff)
• tools/Diff.java (modified) (23 diffs)
• tools/Geometry.java (modified) (2 diffs)
• tools/ImageProvider.java (modified) (1 diff)
• tools/Shortcut.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -1000 +1000 @@
                 }
             }
-            if(!fileList.isEmpty())
-            {
+            if(!fileList.isEmpty()) {
                 OpenFileAction.openFiles(fileList, true);
             }

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());

trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java

@@ -655 +655 @@
         private void processIfElement(Element elem) {
             String realValue = evalVars(elem.getAttribute("test"));
-            boolean v=false;
-            if ("true".equals(realValue)) v=true; else
-            if ("fales".equals(realValue)) v=true; else
-            {
+            boolean v = false;
+            if ("true".equals(realValue) || "false".equals(realValue)) {
+                processXmlFragment(elem);
+                v = true;
+            } else {
                 log("Error: Illegal test expression in if: %s=%s\n", elem.getAttribute("test"), realValue);
             }
 
-            if (v) processXmlFragment(elem);
             lastV = v;
         }

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1728 +1728 @@
                     List<Map<String, String>> newlist = new ArrayList<Map<String, String>>();
                     boolean modified = false;
-                    for(Map<String, String> map : data)
-                    {
+                    for(Map<String, String> map : data) {
                          Map<String, String> newmap = new LinkedHashMap<String, String>();
                          for (Entry<String, String> entry : map.entrySet()) {

trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java

@@ -53 +53 @@
         long tile = 0;
         int i;
-        for (i = NR_LEVELS-1; i >= 0; i--)
-        {
+        for (i = NR_LEVELS-1; i >= 0; i--) {
             long xbit = (x >> i) & 1;
             long ybit = (y >> i) & 1;

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

@@ -298 +298 @@
        get/set functions calling this implicitely is preferred, so we can have
        transparent cache handling in the future. */
-    public void clearCachedStyle()
-    {
+    public void clearCachedStyle() {
         mappaintStyle = null;
     }

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

@@ -49 +49 @@
      */
     public static synchronized User createLocalUser(String name) {
-        for(long i = -1; i >= uidCounter; --i)
-        {
+        for(long i = -1; i >= uidCounter; --i) {
             User olduser = getById(i);
             if(olduser != null && olduser.hasName(name))

trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

@@ -49 +49 @@
 
     public void visit(Bounds b) {
-        if(b != null)
-        {
+        if (b != null) {
             visit(b.getMin());
             visit(b.getMax());
@@ -57 +56 @@
 
     public void visit(ProjectionBounds b) {
-        if(b != null)
-        {
+        if (b != null) {
             visit(b.getMin());
             visit(b.getMax());
@@ -65 +63 @@
 
     public void visit(LatLon latlon) {
-        if(latlon != null)
-        {
-            if(latlon instanceof CachedLatLon) {
+        if (latlon != null) {
+            if (latlon instanceof CachedLatLon) {
                 visit(((CachedLatLon)latlon).getEastNorth());
             } else {

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

@@ -212 +212 @@
         if (it.hasNext()) {
             Point lastP = nc.getPoint(it.next());
-            while (it.hasNext())
-            {
+            while (it.hasNext()) {
                 Point p = nc.getPoint(it.next());
-                if (isSegmentVisible(lastP, p) && isLargeSegment(lastP, p, virtualNodeSpace))
-                {
+                if (isSegmentVisible(lastP, p) && isLargeSegment(lastP, p, virtualNodeSpace)) {
                     int x = (p.x+lastP.x)/2;
                     int y = (p.y+lastP.y)/2;

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

@@ -750 +750 @@
         g.rotate(-theta, p.x, p.y);
         g.setPaintMode();
-        if (selected || member)
-        {
+        if (selected || member) {
             Color color;
             if (disabled) {

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

@@ -200 +200 @@
 
         for (final OsmPrimitive osm: data.searchNodes(bbox)) {
-            if (osm.isDrawable() && !ds.isSelected(osm) && !osm.isDisabledAndHidden())
-            {
+            if (osm.isDrawable() && !ds.isSelected(osm) && !osm.isDisabledAndHidden()) {
                 osm.accept(this);
             }

trunk/src/org/openstreetmap/josm/data/validation/util/Entities.java

@@ -382 +382 @@
                         }
                     } else { // escaped value content is an entity name
-                        if(mapNameToValue == null)
-                        {
+                        if(mapNameToValue == null) {
                             mapNameToValue = new HashMap<>();
                             for (String[] pair : ARRAY)

trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

@@ -155 +155 @@
                     n = node.getName();
                 }
-                if(n == null)
-                {
+                if (n == null) {
                     String s;
                     if((s = node.get("addr:housename")) != null) {
@@ -432 +431 @@
             if (OsmUtils.isTrue(building)) {
                 name = tr("building");
-            } else if(building != null)
-            {
+            } else if (building != null) {
                 name = tr(building); // translate tag!
             }

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -652 +652 @@
         path.moveTo(p.x, p.y);
         double max = b.getMax().lat();
-        for(; lat <= max; lat += 1.0)
-        {
+        for(; lat <= max; lat += 1.0) {
             p = getPoint(new LatLon(lat >= max ? max : lat, lon));
             path.lineTo(p.x, p.y);
         }
         lat = max; max = b.getMax().lon();
-        for(; lon <= max; lon += 1.0)
-        {
+        for(; lon <= max; lon += 1.0) {
             p = getPoint(new LatLon(lat, lon >= max ? max : lon));
             path.lineTo(p.x, p.y);
         }
         lon = max; max = b.getMinLat();
-        for(; lat >= max; lat -= 1.0)
-        {
+        for(; lat >= max; lat -= 1.0) {
             p = getPoint(new LatLon(lat <= max ? max : lat, lon));
             path.lineTo(p.x, p.y);
         }
         lat = max; max = b.getMinLon();
-        for(; lon >= max; lon -= 1.0)
-        {
+        for(; lon >= max; lon -= 1.0) {
             p = getPoint(new LatLon(lat, lon <= max ? max : lon));
             path.lineTo(p.x, p.y);

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -693 +693 @@
             for (Node n : ds.searchNodes(getBBox(p, PROP_SNAP_DISTANCE.get()))) {
                 if (predicate.evaluate(n)
-                        && (dist = getPoint2D(n).distanceSq(p)) < snapDistanceSq)
-                {
+                        && (dist = getPoint2D(n).distanceSq(p)) < snapDistanceSq) {
                     List<Node> nlist;
                     if (nearestMap.containsKey(dist)) {

trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java

@@ -277 +277 @@
          * Hide the Panel, if there is nothing to show
          */
-        if (numPanels == 1 && panels.get(N-1).getComponents().length == 0)
-        {
+        if (numPanels == 1 && panels.get(N-1).getComponents().length == 0) {
             parent.setDividerSize(0);
             this.setVisible(false);

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -207 +207 @@
                 KeyStroke.getKeyStroke(KeyEvent.VK_TAB, 0),
                 KeyStroke.getKeyStroke(KeyEvent.VK_F8, 0),
-        })
-        {
+        }) {
             layerList.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(ks, new Object());
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -800 +800 @@
             }
             StringBuilder text = new StringBuilder();
-            if(ways != 0) {
+            if (ways != 0) {
                 text.append(text.length() > 0 ? ", " : "")
                 .append(trn("{0} way", "{0} ways", ways, ways));
             }
-            if(nodes != 0) {
+            if (nodes != 0) {
                 text.append(text.length() > 0 ? ", " : "")
                 .append(trn("{0} node", "{0} nodes", nodes, nodes));
             }
-            if(relations != 0) {
+            if (relations != 0) {
                 text.append(text.length() > 0 ? ", " : "")
                 .append(trn("{0} relation", "{0} relations", relations, relations));
             }
-            if(ways + nodes + relations == 0) {
+            if (ways + nodes + relations == 0) {
                 text.append(tr("Unselectable now"));
                 this.sel=new ArrayList<>(); // empty selection
             }
-            if(ways + nodes + relations == 1)
-            {
+            if (ways + nodes + relations == 1) {
                 text.append(": ");
                 for(OsmPrimitive o : sel) {

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java

@@ -64 +64 @@
             history = new ArrayList<>();
         }
-        if(add)
-        {
+        if (add) {
             history.add(url);
             historyPos = history.size()-1;

trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java

@@ -343 +343 @@
         protected JTextField nextTF;
 
-        public TFKeyListener (CredentialDialog owner, JTextField currentTF, JTextField nextTF)
-        {
+        public TFKeyListener (CredentialDialog owner, JTextField currentTF, JTextField nextTF) {
             this.owner = owner;
             this.currentTF = currentTF;
@@ -368 +367 @@
 
         @Override
-        public void keyReleased ( KeyEvent e ){
+        public void keyReleased(KeyEvent e) {
         }
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -791 +791 @@
                     .getValue();
 
-            if(result == 2)
-            {
+            if (result == 2) {
                 data.remove(currentPhoto);
                 if (currentPhoto >= data.size()) {

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -436 +436 @@
 
     private static void playAdjacentMarker(Marker startMarker, boolean next) {
-        Marker m = null;
         if (!Main.isDisplayingMapView())
             return;
+        Marker m = null;
         Layer l = Main.map.mapView.getActiveLayer();
-        if(l != null) {
+        if (l != null) {
             m = getAdjacentMarker(startMarker, next, l);
         }
-        if(m == null)
-        {
-            for (Layer layer : Main.map.mapView.getAllLayers())
-            {
+        if (m == null) {
+            for (Layer layer : Main.map.mapView.getAllLayers()) {
                 m = getAdjacentMarker(startMarker, next, layer);
-                if(m != null) {
+                if (m != null) {
                     break;
                 }
             }
         }
-        if(m != null) {
+        if (m != null) {
             ((AudioMarker)m).play();
         }

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

@@ -165 +165 @@
         if (osm instanceof Node)
             return generateStyles(osm, scale, false);
-        else if (osm instanceof Way)
-        {
+        else if (osm instanceof Way) {
             Pair<StyleList, Range> p = generateStyles(osm, scale, false);
 

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinePrototype.java

@@ -32 +32 @@
     public LinePrototype() { init(); }
 
-    public void init()
-    {
+    public void init() {
         priority = 0;
         range = Range.ZERO_TO_INFINITY;

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinemodPrototype.java

@@ -29 +29 @@
     public float getWidth(float ref) {
         float res;
-        if(widthMode == WidthMode.ABSOLUTE) {
+        if (widthMode == WidthMode.ABSOLUTE) {
             res = width;
-        } else if(widthMode == WidthMode.OFFSET) {
+        } else if (widthMode == WidthMode.OFFSET) {
             res = ref + width;
-        } else
-        {
-            if(width < 0) {
+        } else {
+            if (width < 0) {
                 res = 0;
             } else {

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -171 +171 @@
         }
         for (IconPrototype s : iconsList) {
-            if (s.check(primitive))
-            {
+            if (s.check(primitive)) {
                 icon = update(icon, s, scale, mc);
             }

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -337 +337 @@
         @Override
         public Object getValueAt(int rowIndex, int columnIndex) {
-            if(currentAction.getAction() instanceof AdaptableAction)
-            {
+            if(currentAction.getAction() instanceof AdaptableAction) {
                 if (rowIndex < 2) {
                     switch (columnIndex) {
@@ -350 +349 @@
                 } else {
                     rowIndex -= 2;
-            }
+                }
             }
             ActionParameter<Object> param = getParam(rowIndex);
@@ -370 +369 @@
         @Override
         public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
-            if(currentAction.getAction() instanceof AdaptableAction)
-            {
+            if(currentAction.getAction() instanceof AdaptableAction) {
                 if (rowIndex == 0) {
                      currentAction.setName((String)aValue);
@@ -380 +378 @@
                 } else {
                     rowIndex -= 2;
-            }
+                }
             }
             ActionParameter<Object> param = getParam(rowIndex);
@@ -944 +942 @@
         rootActionsNode.removeAllChildren();
         loadAction(rootActionsNode, Main.main.menu);
-        for(Map.Entry<String, Action> a : regactions.entrySet())
-        {
-            if(actions.get(a.getKey()) == null) {
+        for (Map.Entry<String, Action> a : regactions.entrySet()) {
+            if (actions.get(a.getKey()) == null) {
                 rootActionsNode.add(new DefaultMutableTreeNode(a.getValue()));
             }

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java

@@ -323 +323 @@
                 label.setForeground(foregroundColor);
             }
-            if(pe.isChanged()) {
+            if (pe.isChanged()) {
                 label.setBackground(changedColor);
-            } else if(!pe.isDefault()) {
+            } else if (!pe.isDefault()) {
                 label.setBackground(nonDefaultColor);
             }
@@ -333 +333 @@
             }
             val = pe.getDefaultValue().getValue();
-            if(val != null)
-            {
-                if(pe.isDefault()) {
+            if (val != null) {
+                if (pe.isDefault()) {
                     label.setToolTipText(tr("Current value is default."));
                 } else {

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -184 +184 @@
             @Override
             public void actionPerformed(ActionEvent e) {
-                for(int i = 0; i < colors.getRowCount(); ++i)
-                {
+                for(int i = 0; i < colors.getRowCount(); ++i) {
                     String name = (String)colors.getValueAt(i, 0);
                     Color c = Main.pref.getDefaultColor(name);
@@ -208 +207 @@
 
         colors = new JTable(tableModel) {
-            @Override public boolean isCellEditable(int row, int column) {
+            @Override
+            public boolean isCellEditable(int row, int column) {
                 return false;
             }

trunk/src/org/openstreetmap/josm/io/NmeaReader.java

@@ -235 +235 @@
             // and result in a malformed packet.
             String[] chkstrings = s.split("\\*");
-            if(chkstrings.length > 1)
-            {
+            if (chkstrings.length > 1) {
                 byte[] chb = chkstrings[0].getBytes(StandardCharsets.UTF_8);
                 int chk=0;

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java

@@ -43 +43 @@
 
     @Override
-    public String[] getMandatoryParams()
-    {
-        return new String[] { "lat", "lon" };
+    public String[] getMandatoryParams() {
+        return new String[] {"lat", "lon"};
     }
 
     @Override
-    public String[] getOptionalParams()
-    {
-        return new String[] { "addtags" };
+    public String[] getOptionalParams() {
+        return new String[] {"addtags"};
     }
 

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java

@@ -249 +249 @@
      * @param command The command.
      */
-    public void setCommand(String command)
-    {
+    public void setCommand(String command) {
         if (command.charAt(0) == '/') {
             command = command.substring(1);

trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

@@ -245 +245 @@
         author = attr.getValue("Author");
         iconPath = attr.getValue("Plugin-Icon");
-        if (iconPath != null)
-        {
+        if (iconPath != null) {
             if (file != null) {
                 // extract icon from the plugin jar file

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

@@ -277 +277 @@
                             if (playingUrl != command.url() ||
                                     stateChange != State.PAUSED ||
-                                    offset != 0)
-                            {
+                                    offset != 0) {
                                 if (audioInputStream != null) {
                                     Utils.close(audioInputStream);

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

@@ -170 +170 @@
         bd[bdiagoff + bmid] = xlim;
 
-        for (int c = 1;; ++c)
-        {
+        for (int c = 1;; ++c) {
             int d;          /* Active diagonal. */
             boolean big_snake = false;
@@ -186 +185 @@
                 --fmax;
             }
-            for (d = fmax; d >= fmin; d -= 2)
-            {
+            for (d = fmax; d >= fmin; d -= 2) {
                 int x, y, oldx, tlo = fd[fdiagoff + d - 1], thi = fd[fdiagoff + d + 1];
 
@@ -204 +202 @@
                 }
                 fd[fdiagoff + d] = x;
-                if (odd && bmin <= d && d <= bmax && bd[bdiagoff + d] <= fd[fdiagoff + d])
-                {
+                if (odd && bmin <= d && d <= bmax && bd[bdiagoff + d] <= fd[fdiagoff + d]) {
                     cost = 2 * c - 1;
                     return d;
@@ -222 +219 @@
                 --bmax;
             }
-            for (d = bmax; d >= bmin; d -= 2)
-            {
+            for (d = bmax; d >= bmin; d -= 2) {
                 int x, y, oldx, tlo = bd[bdiagoff + d - 1], thi = bd[bdiagoff + d + 1];
 
@@ -240 +236 @@
                 }
                 bd[bdiagoff + d] = x;
-                if (!odd && fmin <= d && d <= fmax && bd[bdiagoff + d] <= fd[fdiagoff + d])
-                {
+                if (!odd && fmin <= d && d <= fmax && bd[bdiagoff + d] <= fd[fdiagoff + d]) {
                     cost = 2 * c;
                     return d;
@@ -255 +250 @@
        of changes, the algorithm is linear in the file size.  */
 
-            if (c > 200 && big_snake && heuristic)
-            {
+            if (c > 200 && big_snake && heuristic) {
                 int best = 0;
                 int bestpos = -1;
 
-                for (d = fmax; d >= fmin; d -= 2)
-                {
+                for (d = fmax; d >= fmin; d -= 2) {
                     int dd = d - fmid;
                     int x = fd[fdiagoff + d];
                     int y = x - d;
                     int v = (x - xoff) * 2 - dd;
-                    if (v > 12 * (c + (dd < 0 ? -dd : dd)))
-                    {
+                    if (v > 12 * (c + (dd < 0 ? -dd : dd))) {
                         if (v > best
                                 && xoff + SNAKE_LIMIT <= x && x < xlim
-                                && yoff + SNAKE_LIMIT <= y && y < ylim)
-                        {
+                                && yoff + SNAKE_LIMIT <= y && y < ylim) {
                             /* We have a good enough best diagonal.
                                now insist that it end with a significant snake.  */
@@ -277 +268 @@
 
                             for (k = 1; xvec[x - k] == yvec[y - k]; k++)
-                                if (k == SNAKE_LIMIT)
-                                {
+                                if (k == SNAKE_LIMIT) {
                                     best = v;
                                     bestpos = d;
@@ -286 +276 @@
                     }
                 }
-                if (best > 0)
-                {
+                if (best > 0) {
                     cost = 2 * c - 1;
                     return bestpos;
@@ -293 +282 @@
 
                 best = 0;
-                for (d = bmax; d >= bmin; d -= 2)
-                {
+                for (d = bmax; d >= bmin; d -= 2) {
                     int dd = d - bmid;
                     int x = bd[bdiagoff + d];
                     int y = x - d;
                     int v = (xlim - x) * 2 + dd;
-                    if (v > 12 * (c + (dd < 0 ? -dd : dd)))
-                    {
+                    if (v > 12 * (c + (dd < 0 ? -dd : dd))) {
                         if (v > best
                                 && xoff < x && x <= xlim - SNAKE_LIMIT
-                                && yoff < y && y <= ylim - SNAKE_LIMIT)
-                        {
+                                && yoff < y && y <= ylim - SNAKE_LIMIT) {
                             /* We have a good enough best diagonal.
                                now insist that it end with a significant snake.  */
@@ -310 +296 @@
 
                             for (k = 0; xvec[x + k] == yvec[y + k]; k++)
-                                if (k == SNAKE_LIMIT)
-                                {
+                                if (k == SNAKE_LIMIT) {
                                     best = v;
                                     bestpos = d;
@@ -319 +304 @@
                     }
                 }
-                if (best > 0)
-                {
+                if (best > 0) {
                     cost = 2 * c - 1;
                     return bestpos;
@@ -371 +355 @@
                    Let's verify that this is true.  */
                 throw new IllegalArgumentException("Empty subsequence");
-            else
-            {
+            else {
                 /* Use that point to split this problem into two subproblems.  */
                 compareseq (xoff, b, yoff, b - d);
@@ -425 +408 @@
         public  Change build_script(
                 final boolean[] changed0,int len0,
-                final boolean[] changed1,int len1)
-        {
+                final boolean[] changed1,int len1) {
             Change script = null;
             int i0 = 0, i1 = 0;
@@ -459 +441 @@
         public Change build_script(
                 final boolean[] changed0,int len0,
-                final boolean[] changed1,int len1)
-        {
+                final boolean[] changed1,int len1) {
             Change script = null;
             int i0 = len0, i1 = len1;
 
-            while (i0 >= 0 || i1 >= 0)
-            {
-                if (changed0[i0] || changed1[i1])
-                {
+            while (i0 >= 0 || i1 >= 0) {
+                if (changed0[i0] || changed1[i1]) {
                     int line0 = i0, line1 = i1;
 
@@ -670 +649 @@
             }
 
-            for (int i = 0; i < end; i++)
-            {
+            for (int i = 0; i < end; i++) {
                 int nmatch;
                 if (equivs[i] == 0) {
@@ -694 +672 @@
             final int end = bufferedLines;
 
-            for (int i = 0; i < end; i++)
-            {
+            for (int i = 0; i < end; i++) {
                 /* Cancel provisional discards not in middle of run of discards.  */
                 if (discards[i] == 2) {
                     discards[i] = 0;
-                } else if (discards[i] != 0)
-                {
+                } else if (discards[i] != 0) {
                     /* We have found a nonprovisional discard.  */
                     int j;
@@ -708 +684 @@
                     /* Find end of this run of discardable lines.
                        Count how many are provisionally discardable.  */
-                    for (j = i; j < end; j++)
-                    {
+                    for (j = i; j < end; j++) {
                         if (discards[j] == 0) {
                             break;
@@ -811 +786 @@
             int j = 0;
             for (int i = 0; i < end; ++i)
-                if (noDiscards || discards[i] == 0)
-                {
+                if (noDiscards || discards[i] == 0) {
                     undiscarded[j] = equivs[i];
                     realindexes[j++] = i;
@@ -853 +827 @@
       @param f the file being compared against
          */
-
         void shift_boundaries(FileData f) {
             final boolean[] changed = changedFlag;
@@ -863 +836 @@
             int other_preceding = -1;
 
-            for (;;)
-            {
+            for (;;) {
                 int start, end, other_start;
 
@@ -870 +842 @@
                    Also keep track of the corresponding point in the other file.  */
 
-                while (i < i_end && !changed[1+i])
-                {
+                while (i < i_end && !changed[1+i]) {
                     while (other_changed[1+j++]) {
                         /* Non-corresponding lines in the other file
@@ -887 +858 @@
                 other_start = j;
 
-                for (;;)
-                {
+                for (;;) {
                     /* Now find the end of this run of changes.  */
 
@@ -905 +875 @@
                        Only because the previous run was shifted here.  */
 
-                    if (end != i_end
-                            && equivs[start] == equivs[end]
-                                                       && !other_changed[1+j]
-                                                                         && !((preceding >= 0 && start == preceding)
-                                                                                 || (other_preceding >= 0
-                                                                                         && other_start == other_preceding)))
-                    {
+                    if (end != i_end && equivs[start] == equivs[end] && !other_changed[1+j]
+                         && !((preceding >= 0 && start == preceding) || (other_preceding >= 0 && other_start == other_preceding))) {
                         changed[1+end++] = true;
                         changed[1+start++] = false;

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

@@ -601 +601 @@
             if ((newPoint.getEastNorth().getY() < point.getEastNorth().getY()) == (point.getEastNorth().getY() <= oldPoint.getEastNorth().getY())
                     && (point.getEastNorth().getX() - p1.getEastNorth().getX()) * (p2.getEastNorth().getY() - p1.getEastNorth().getY())
-                    < (p2.getEastNorth().getX() - p1.getEastNorth().getX()) * (point.getEastNorth().getY() - p1.getEastNorth().getY()))
-            {
+                    < (p2.getEastNorth().getX() - p1.getEastNorth().getX()) * (point.getEastNorth().getY() - p1.getEastNorth().getY())) {
                 inside = !inside;
             }
@@ -638 +637 @@
     }
 
-    protected static double calcX(Node p1){
+    protected static double calcX(Node p1) {
         double lat1, lon1, lat2, lon2;
         double dlon, dlat;

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

@@ -935 +935 @@
                         return svg == null ? null : new ImageResource(svg);
                     case OTHER:
-                        while(size > 0)
-                        {
+                        while(size > 0) {
                             int l = is.read(buf, offs, size);
                             offs += l;

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

@@ -253 +253 @@
     public static List<Shortcut> listAll() {
         List<Shortcut> l = new ArrayList<>();
-        for(Shortcut c : shortcuts.values())
-        {
-            if(!"core:none".equals(c.shortText)) {
+        for (Shortcut c : shortcuts.values()) {
+            if (!"core:none".equals(c.shortText)) {
                 l.add(c);
             }