Index: trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 8448) +++ trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 8449) @@ -701,5 +701,5 @@ newNodes.add(node); } else { - nodesRemoved ++; + nodesRemoved++; } } else { @@ -708,5 +708,5 @@ if (representator != node) { - nodesRemoved ++; + nodesRemoved++; } @@ -769,5 +769,5 @@ Map nextWayMap = new HashMap<>(); - for (int pos = 0; pos < parts.size(); pos ++) { + for (int pos = 0; pos < parts.size(); pos++) { if (!parts.get(pos).lastNode().equals(parts.get((pos + 1) % parts.size()).firstNode())) @@ -784,5 +784,5 @@ for (Way way : parts) { - for (int pos = 0; pos < way.getNodesCount(); pos ++) { + for (int pos = 0; pos < way.getNodesCount(); pos++) { Node node = way.getNode(pos); @@ -909,5 +909,5 @@ if (wayAToTheRight != wayBToTheRight) { - intersectionCount ++; + intersectionCount++; } } @@ -1256,5 +1256,5 @@ Main.main.undoRedo.add(result.b); - cmdsCount ++; + cmdsCount++; return result.a; Index: trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (revision 8448) +++ trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (revision 8449) @@ -196,5 +196,5 @@ switch (ed.showDialog().getValue()) { case 1: Utils.copyToClipboard(text.toString()); break; - case 2: ReportBugAction.reportBug(reportHeader) ; break; + case 2: ReportBugAction.reportBug(reportHeader); break; } } Index: trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (revision 8448) +++ trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (revision 8449) @@ -65,5 +65,5 @@ } - for(int i = areas.size()-1; i > 0 ; i--) { + for(int i = areas.size()-1; i > 0; i--) { for(int j = i-1; j > 0; j--) { areas.get(i).subtract(areas.get(j)); Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 8448) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 8449) @@ -645,5 +645,5 @@ wnew.addNode(insertionPoint, n1New); wayWasModified = true; - insertionPoint ++; + insertionPoint++; cmds.add(new AddCommand(n1New)); changedNodes.add(n1New); @@ -675,5 +675,5 @@ wnew.addNode(insertionPoint, n2New); wayWasModified = true; - insertionPoint ++; + insertionPoint++; cmds.add(new AddCommand(n2New)); changedNodes.add(n2New); Index: trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 8448) +++ trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 8449) @@ -262,5 +262,5 @@ NodeList childNodes = root.getChildNodes(); int n = childNodes.getLength(); - for (int i = 0; i < n ; i++) { + for (int i = 0; i < n; i++) { Node item = childNodes.item(i); if (item.getNodeType() == Node.ELEMENT_NODE) { Index: trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 8448) +++ trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 8449) @@ -474,5 +474,5 @@ String[] keys = this.keys; if (keys != null) { - for (int i=0; i nodes = new ArrayList<>(); - for (int waypos = 0; waypos < this.ways.size(); waypos ++) { + for (int waypos = 0; waypos < this.ways.size(); waypos++) { Way way = this.ways.get(waypos); boolean reversed = this.reversed.get(waypos).booleanValue(); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (revision 8448) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (revision 8449) @@ -126,5 +126,5 @@ JPanel p = panels.get(N-1); // current Panel (start with last one) int k = -1; // indicates that the current Panel index is N-1, but no default-view-Dialog has been added to this Panel yet. - for (int i=N-1; i >= 0 ; --i) { + for (int i=N-1; i >= 0; --i) { final ToggleDialog dlg = allDialogs.get(i); if (dlg.isDialogInDefaultView()) { Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 8448) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 8449) @@ -160,5 +160,5 @@ outerPanel.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); - for (int i = gpxLst.size() - 1 ; i >= 0 ; i--) { + for (int i = gpxLst.size() - 1; i >= 0; i--) { GpxDataWrapper wrapper = gpxLst.get(i); if (wrapper.file != null && sel.equals(wrapper.file)) { Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 8448) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 8449) @@ -425,5 +425,5 @@ @Override public void run() { - for (int i = 0; i < data.size() ; i++) { + for (int i = 0; i < data.size(); i++) { if (selected.equals(data.get(i))) { currentPhoto = i; Index: trunk/src/org/openstreetmap/josm/io/GpxWriter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/GpxWriter.java (revision 8448) +++ trunk/src/org/openstreetmap/josm/io/GpxWriter.java (revision 8449) @@ -171,5 +171,5 @@ if (bounds != null) { String b = "minlat=\"" + bounds.getMinLat() + "\" minlon=\"" + bounds.getMinLon() + - "\" maxlat=\"" + bounds.getMaxLat() + "\" maxlon=\"" + bounds.getMaxLon() + "\"" ; + "\" maxlat=\"" + bounds.getMaxLat() + "\" maxlon=\"" + bounds.getMaxLon() + "\""; inline("bounds", b); } Index: trunk/src/org/openstreetmap/josm/io/NmeaReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/NmeaReader.java (revision 8448) +++ trunk/src/org/openstreetmap/josm/io/NmeaReader.java (revision 8449) @@ -124,5 +124,5 @@ PDOP(15), // PDOP (precision) HDOP(16), // HDOP (horizontal precision) - VDOP(17), ; // VDOP (vertical precision) + VDOP(17); // VDOP (vertical precision) public final int position; Index: trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 8448) +++ trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 8449) @@ -69,5 +69,5 @@ long ms_left = (long)(uploads_left / uploads_per_ms); long minutes_left = ms_left / MSECS_PER_MINUTE; - long seconds_left = (ms_left / MSECS_PER_SECOND) % SECONDS_PER_MINUTE ; + long seconds_left = (ms_left / MSECS_PER_SECOND) % SECONDS_PER_MINUTE; String time_left_str = Long.toString(minutes_left) + ":"; if (seconds_left < 10) { Index: trunk/src/org/openstreetmap/josm/tools/Geometry.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 8448) +++ trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 8449) @@ -70,5 +70,5 @@ //copy node arrays for local usage. - for (int pos = 0; pos < n; pos ++) { + for (int pos = 0; pos < n; pos++) { newNodes[pos] = new ArrayList<>(ways.get(pos).getNodes()); wayBounds[pos] = getNodesBounds(newNodes[pos]); @@ -78,6 +78,6 @@ //iterate over all way pairs and introduce the intersections Comparator coordsComparator = new NodePositionComparator(); - for (int seg1Way = 0; seg1Way < n; seg1Way ++) { - for (int seg2Way = seg1Way; seg2Way < n; seg2Way ++) { + for (int seg1Way = 0; seg1Way < n; seg1Way++) { + for (int seg2Way = seg1Way; seg2Way < n; seg2Way++) { //do not waste time on bounds that do not intersect @@ -90,10 +90,10 @@ //iterate over primary segmemt - for (int seg1Pos = 0; seg1Pos + 1 < way1Nodes.size(); seg1Pos ++) { + for (int seg1Pos = 0; seg1Pos + 1 < way1Nodes.size(); seg1Pos++) { //iterate over secondary segment int seg2Start = seg1Way != seg2Way ? 0: seg1Pos + 2;//skip the adjacent segment - for (int seg2Pos = seg2Start; seg2Pos + 1< way2Nodes.size(); seg2Pos ++) { + for (int seg2Pos = seg2Start; seg2Pos + 1< way2Nodes.size(); seg2Pos++) { //need to get them again every time, because other segments may be changed @@ -106,5 +106,5 @@ //test if we have common nodes to add. if (seg1Node1 == seg2Node1 || seg1Node1 == seg2Node2) { - commonCount ++; + commonCount++; if (seg1Way == seg2Way && @@ -118,5 +118,5 @@ if (seg1Node2 == seg2Node1 || seg1Node2 == seg2Node2) { - commonCount ++; + commonCount++; intersectionNodes.add(seg1Node2); @@ -165,5 +165,5 @@ //fix seg2 position, as indexes have changed, seg2Pos is always bigger than seg1Pos on the same segment. if (seg2Way == seg1Way) { - seg2Pos ++; + seg2Pos++; } } @@ -174,5 +174,5 @@ //Do not need to compare again to already split segment - seg2Pos ++; + seg2Pos++; } @@ -191,5 +191,5 @@ - for (int pos = 0; pos < ways.size(); pos ++) { + for (int pos = 0; pos < ways.size(); pos++) { if (!changedWays[pos]) { continue; @@ -292,5 +292,5 @@ double det = a1*b2 - a2*b1; - double uu = b2*c1 - b1*c2 ; + double uu = b2*c1 - b1*c2; double vv = a1*c2 - a2*c1; double mag = Math.abs(uu)+Math.abs(vv);