Changeset 8449 in josm

Timestamp:

2015-06-03T00:46:40+02:00 (9 years ago)

Author:

Don-vip

Message:

remove extra whitespaces

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JoinAreasAction.java (modified) (6 diffs)
• actions/ShowStatusReportAction.java (modified) (1 diff)
• actions/UpdateDataAction.java (modified) (1 diff)
• actions/mapmode/ExtrudeAction.java (modified) (2 diffs)
• data/CustomConfigurator.java (modified) (1 diff)
• data/osm/AbstractPrimitive.java (modified) (1 diff)
• data/osm/MultipolygonBuilder.java (modified) (1 diff)
• gui/dialogs/DialogsPanel.java (modified) (1 diff)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (1 diff)
• gui/layer/geoimage/GeoImageLayer.java (modified) (1 diff)
• io/GpxWriter.java (modified) (1 diff)
• io/NmeaReader.java (modified) (1 diff)
• io/OsmServerWriter.java (modified) (1 diff)
• tools/Geometry.java (modified) (9 diffs)

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

@@ -701 +701 @@
                         newNodes.add(node);
                     } else {
-                        nodesRemoved ++;
+                        nodesRemoved++;
                     }
                 } else {
@@ -708 +708 @@
 
                     if (representator != node) {
-                        nodesRemoved ++;
+                        nodesRemoved++;
                     }
 
@@ -769 +769 @@
         Map<Way, Way> 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 +784 @@
 
         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 +909 @@
 
                     if (wayAToTheRight != wayBToTheRight) {
-                        intersectionCount ++;
+                        intersectionCount++;
                     }
                 }
@@ -1256 +1256 @@
 
         Main.main.undoRedo.add(result.b);
-        cmdsCount ++;
+        cmdsCount++;
 
         return result.a;

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

@@ -196 +196 @@
         switch (ed.showDialog().getValue()) {
             case 1: Utils.copyToClipboard(text.toString()); break;
-            case 2: ReportBugAction.reportBug(reportHeader) ; break;
+            case 2: ReportBugAction.reportBug(reportHeader); break;
         }
     }

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

@@ -65 +65 @@
         }
 
-        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));

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

@@ -645 +645 @@
             wnew.addNode(insertionPoint, n1New);
             wayWasModified = true;
-            insertionPoint ++;
+            insertionPoint++;
             cmds.add(new AddCommand(n1New));
             changedNodes.add(n1New);
@@ -675 +675 @@
             wnew.addNode(insertionPoint, n2New);
             wayWasModified = true;
-            insertionPoint ++;
+            insertionPoint++;
             cmds.add(new AddCommand(n2New));
             changedNodes.add(n2New);

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

@@ -262 +262 @@
             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) {

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

@@ -474 +474 @@
         String[] keys = this.keys;
         if (keys != null) {
-            for (int i=0; i<keys.length ; i+=2) {
+            for (int i=0; i<keys.length; i+=2) {
                 result.put(keys[i], keys[i + 1]);
             }

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

@@ -71 +71 @@
             List<Node> 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();

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

@@ -126 +126 @@
         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()) {

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

@@ -160 +160 @@
                 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)) {

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

@@ -425 +425 @@
                 @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;

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

@@ -171 +171 @@
         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);
         }

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

@@ -124 +124 @@
         PDOP(15),   // PDOP (precision)
         HDOP(16),   // HDOP (horizontal precision)
-        VDOP(17), ; // VDOP (vertical precision)
+        VDOP(17);   // VDOP (vertical precision)
 
         public final int position;

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

@@ -69 +69 @@
         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) {

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

@@ -70 +70 @@
 
         //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 +78 @@
         //iterate over all way pairs and introduce the intersections
         Comparator<Node> 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 +90 @@
 
                 //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 +106 @@
                         //test if we have common nodes to add.
                         if (seg1Node1 == seg2Node1 || seg1Node1 == seg2Node2) {
-                            commonCount ++;
+                            commonCount++;
 
                             if (seg1Way == seg2Way &&
@@ -118 +118 @@
 
                         if (seg1Node2 == seg2Node1 || seg1Node2 == seg2Node2) {
-                            commonCount ++;
+                            commonCount++;
 
                             intersectionNodes.add(seg1Node2);
@@ -165 +165 @@
                                     //fix seg2 position, as indexes have changed, seg2Pos is always bigger than seg1Pos on the same segment.
                                     if (seg2Way == seg1Way) {
-                                        seg2Pos ++;
+                                        seg2Pos++;
                                     }
                                 }
@@ -174 +174 @@
 
                                     //Do not need to compare again to already split segment
-                                    seg2Pos ++;
+                                    seg2Pos++;
                                 }
 
@@ -191 +191 @@
 
 
-        for (int pos = 0; pos < ways.size(); pos ++) {
+        for (int pos = 0; pos < ways.size(); pos++) {
             if (!changedWays[pos]) {
                 continue;
@@ -292 +292 @@
         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);