Index: trunk/src/org/openstreetmap/josm/Main.java =================================================================== --- trunk/src/org/openstreetmap/josm/Main.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/Main.java (revision 8395) @@ -1000,6 +1000,5 @@ } } - if(!fileList.isEmpty()) - { + if(!fileList.isEmpty()) { OpenFileAction.openFiles(fileList, true); } Index: trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 8395) @@ -222,6 +222,5 @@ final Way selectedWay = combineResult.a; Main.main.undoRedo.add(combineResult.b); - if(selectedWay != null) - { + if(selectedWay != null) { Runnable guiTask = new Runnable() { @Override Index: trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 8395) @@ -1328,6 +1328,5 @@ } - for (Way way :innerWays) - { + for (Way way :innerWays) { if (processedOuterWays.contains(way)) { new Notification( Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 8395) @@ -1144,6 +1144,5 @@ * @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); Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 8395) @@ -509,8 +509,7 @@ 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; } Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 8395) @@ -261,6 +261,5 @@ 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()); Index: trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 8395) @@ -655,12 +655,12 @@ 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; } Index: trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 8395) @@ -1728,6 +1728,5 @@ List> newlist = new ArrayList>(); boolean modified = false; - for(Map map : data) - { + for(Map map : data) { Map newmap = new LinkedHashMap(); for (Entry entry : map.entrySet()) { Index: trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java (revision 8395) @@ -53,6 +53,5 @@ 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; Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 8395) @@ -298,6 +298,5 @@ 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; } Index: trunk/src/org/openstreetmap/josm/data/osm/User.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 8395) @@ -49,6 +49,5 @@ */ 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)) Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (revision 8395) @@ -49,6 +49,5 @@ public void visit(Bounds b) { - if(b != null) - { + if (b != null) { visit(b.getMin()); visit(b.getMax()); @@ -57,6 +56,5 @@ public void visit(ProjectionBounds b) { - if(b != null) - { + if (b != null) { visit(b.getMin()); visit(b.getMax()); @@ -65,7 +63,6 @@ public void visit(LatLon latlon) { - if(latlon != null) - { - if(latlon instanceof CachedLatLon) { + if (latlon != null) { + if (latlon instanceof CachedLatLon) { visit(((CachedLatLon)latlon).getEastNorth()); } else { Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java (revision 8395) @@ -212,9 +212,7 @@ 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; Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 8395) @@ -750,6 +750,5 @@ g.rotate(-theta, p.x, p.y); g.setPaintMode(); - if (selected || member) - { + if (selected || member) { Color color; if (disabled) { Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (revision 8395) @@ -200,6 +200,5 @@ 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); } Index: trunk/src/org/openstreetmap/josm/data/validation/util/Entities.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/util/Entities.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/data/validation/util/Entities.java (revision 8395) @@ -382,6 +382,5 @@ } } else { // escaped value content is an entity name - if(mapNameToValue == null) - { + if(mapNameToValue == null) { mapNameToValue = new HashMap<>(); for (String[] pair : ARRAY) Index: trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 8395) @@ -155,6 +155,5 @@ n = node.getName(); } - if(n == null) - { + if (n == null) { String s; if((s = node.get("addr:housename")) != null) { @@ -432,6 +431,5 @@ if (OsmUtils.isTrue(building)) { name = tr("building"); - } else if(building != null) - { + } else if (building != null) { name = tr(building); // translate tag! } Index: trunk/src/org/openstreetmap/josm/gui/MapView.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 8395) @@ -652,24 +652,20 @@ 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); Index: trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 8395) @@ -693,6 +693,5 @@ 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 nlist; if (nearestMap.containsKey(dist)) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (revision 8395) @@ -277,6 +277,5 @@ * 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); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 8395) @@ -207,6 +207,5 @@ KeyStroke.getKeyStroke(KeyEvent.VK_TAB, 0), KeyStroke.getKeyStroke(KeyEvent.VK_F8, 0), - }) - { + }) { layerList.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(ks, new Object()); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 8395) @@ -800,22 +800,21 @@ } 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) { Index: trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java (revision 8395) @@ -64,6 +64,5 @@ history = new ArrayList<>(); } - if(add) - { + if (add) { history.add(url); historyPos = history.size()-1; Index: trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 8395) @@ -343,6 +343,5 @@ 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,5 +367,5 @@ @Override - public void keyReleased ( KeyEvent e ){ + public void keyReleased(KeyEvent e) { } Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 8395) @@ -791,6 +791,5 @@ .getValue(); - if(result == 2) - { + if (result == 2) { data.remove(currentPhoto); if (currentPhoto >= data.size()) { Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 8395) @@ -436,22 +436,20 @@ 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(); } Index: trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (revision 8395) @@ -165,6 +165,5 @@ if (osm instanceof Node) return generateStyles(osm, scale, false); - else if (osm instanceof Way) - { + else if (osm instanceof Way) { Pair p = generateStyles(osm, scale, false); Index: trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinePrototype.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinePrototype.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinePrototype.java (revision 8395) @@ -32,6 +32,5 @@ public LinePrototype() { init(); } - public void init() - { + public void init() { priority = 0; range = Range.ZERO_TO_INFINITY; Index: trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinemodPrototype.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinemodPrototype.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinemodPrototype.java (revision 8395) @@ -29,11 +29,10 @@ 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 { Index: trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (revision 8395) @@ -171,6 +171,5 @@ } for (IconPrototype s : iconsList) { - if (s.check(primitive)) - { + if (s.check(primitive)) { icon = update(icon, s, scale, mc); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 8395) @@ -337,6 +337,5 @@ @Override public Object getValueAt(int rowIndex, int columnIndex) { - if(currentAction.getAction() instanceof AdaptableAction) - { + if(currentAction.getAction() instanceof AdaptableAction) { if (rowIndex < 2) { switch (columnIndex) { @@ -350,5 +349,5 @@ } else { rowIndex -= 2; - } + } } ActionParameter param = getParam(rowIndex); @@ -370,6 +369,5 @@ @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,5 +378,5 @@ } else { rowIndex -= 2; - } + } } ActionParameter param = getParam(rowIndex); @@ -944,7 +942,6 @@ rootActionsNode.removeAllChildren(); loadAction(rootActionsNode, Main.main.menu); - for(Map.Entry a : regactions.entrySet()) - { - if(actions.get(a.getKey()) == null) { + for (Map.Entry a : regactions.entrySet()) { + if (actions.get(a.getKey()) == null) { rootActionsNode.add(new DefaultMutableTreeNode(a.getValue())); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java (revision 8395) @@ -323,7 +323,7 @@ label.setForeground(foregroundColor); } - if(pe.isChanged()) { + if (pe.isChanged()) { label.setBackground(changedColor); - } else if(!pe.isDefault()) { + } else if (!pe.isDefault()) { label.setBackground(nonDefaultColor); } @@ -333,7 +333,6 @@ } val = pe.getDefaultValue().getValue(); - if(val != null) - { - if(pe.isDefault()) { + if (val != null) { + if (pe.isDefault()) { label.setToolTipText(tr("Current value is default.")); } else { Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (revision 8395) @@ -184,6 +184,5 @@ @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,5 +207,6 @@ colors = new JTable(tableModel) { - @Override public boolean isCellEditable(int row, int column) { + @Override + public boolean isCellEditable(int row, int column) { return false; } Index: trunk/src/org/openstreetmap/josm/io/NmeaReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/NmeaReader.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/io/NmeaReader.java (revision 8395) @@ -235,6 +235,5 @@ // 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; Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java (revision 8395) @@ -43,13 +43,11 @@ @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"}; } Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 8395) @@ -249,6 +249,5 @@ * @param command The command. */ - public void setCommand(String command) - { + public void setCommand(String command) { if (command.charAt(0) == '/') { command = command.substring(1); Index: trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java =================================================================== --- trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 8395) @@ -245,6 +245,5 @@ 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 Index: trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 8395) @@ -277,6 +277,5 @@ if (playingUrl != command.url() || stateChange != State.PAUSED || - offset != 0) - { + offset != 0) { if (audioInputStream != null) { Utils.close(audioInputStream); Index: trunk/src/org/openstreetmap/josm/tools/Diff.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Diff.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/tools/Diff.java (revision 8395) @@ -170,6 +170,5 @@ bd[bdiagoff + bmid] = xlim; - for (int c = 1;; ++c) - { + for (int c = 1;; ++c) { int d; /* Active diagonal. */ boolean big_snake = false; @@ -186,6 +185,5 @@ --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,6 +202,5 @@ } 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,6 +219,5 @@ --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,6 +236,5 @@ } 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,21 +250,17 @@ 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,6 +268,5 @@ for (k = 1; xvec[x - k] == yvec[y - k]; k++) - if (k == SNAKE_LIMIT) - { + if (k == SNAKE_LIMIT) { best = v; bestpos = d; @@ -286,6 +276,5 @@ } } - if (best > 0) - { + if (best > 0) { cost = 2 * c - 1; return bestpos; @@ -293,16 +282,13 @@ 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,6 +296,5 @@ for (k = 0; xvec[x + k] == yvec[y + k]; k++) - if (k == SNAKE_LIMIT) - { + if (k == SNAKE_LIMIT) { best = v; bestpos = d; @@ -319,6 +304,5 @@ } } - if (best > 0) - { + if (best > 0) { cost = 2 * c - 1; return bestpos; @@ -371,6 +355,5 @@ 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,6 +408,5 @@ 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,13 +441,10 @@ 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,6 +649,5 @@ } - for (int i = 0; i < end; i++) - { + for (int i = 0; i < end; i++) { int nmatch; if (equivs[i] == 0) { @@ -694,11 +672,9 @@ 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,6 +684,5 @@ /* 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,6 +786,5 @@ 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,5 +827,4 @@ @param f the file being compared against */ - void shift_boundaries(FileData f) { final boolean[] changed = changedFlag; @@ -863,6 +836,5 @@ int other_preceding = -1; - for (;;) - { + for (;;) { int start, end, other_start; @@ -870,6 +842,5 @@ 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,6 +858,5 @@ other_start = j; - for (;;) - { + for (;;) { /* Now find the end of this run of changes. */ @@ -905,11 +875,6 @@ 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; Index: trunk/src/org/openstreetmap/josm/tools/Geometry.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 8395) @@ -601,6 +601,5 @@ 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,5 +637,5 @@ } - protected static double calcX(Node p1){ + protected static double calcX(Node p1) { double lat1, lon1, lat2, lon2; double dlon, dlat; Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 8395) @@ -935,6 +935,5 @@ return svg == null ? null : new ImageResource(svg); case OTHER: - while(size > 0) - { + while(size > 0) { int l = is.read(buf, offs, size); offs += l; Index: trunk/src/org/openstreetmap/josm/tools/Shortcut.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Shortcut.java (revision 8394) +++ trunk/src/org/openstreetmap/josm/tools/Shortcut.java (revision 8395) @@ -253,7 +253,6 @@ public static List listAll() { List 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); }