Changeset 35382 in osm for applications/editors/josm/plugins/reverter/src

Timestamp:

2020-03-19T17:13:34+01:00 (5 years ago)

Author:

gerdp

Message:

fix errorprone issues

Location:

applications/editors/josm/plugins/reverter/src/reverter

Files:

• ChangesetReverter.java (modified) (2 diffs)
• OsmServerMultiObjectReader.java (modified) (2 diffs)

applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java

@@ -14 +14 @@
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map.Entry;
+import java.util.Map;
 
 import org.openstreetmap.josm.command.Command;
@@ -258 +258 @@
             if (progressMonitor.isCanceled()) return;
             // If multi-read failed, retry with regular read
-            for (Entry<Long,Integer> entry : nodeList.entrySet()) {
+            for (Map.Entry<Long,Integer> entry : nodeList.entrySet()) {
                 if (progressMonitor.isCanceled()) return;
                 readObjectVersion(rdr, new SimplePrimitiveId(entry.getKey(),OsmPrimitiveType.NODE), entry.getValue(), progressMonitor);
             }
-            for (Entry<Long,Integer> entry : wayList.entrySet()) {
+            for (Map.Entry<Long,Integer> entry : wayList.entrySet()) {
                 if (progressMonitor.isCanceled()) return;
                 readObjectVersion(rdr, new SimplePrimitiveId(entry.getKey(),OsmPrimitiveType.WAY), entry.getValue(), progressMonitor);
             }
-            for (Entry<Long,Integer> entry : relationList.entrySet()) {
+            for (Map.Entry<Long,Integer> entry : relationList.entrySet()) {
                 if (progressMonitor.isCanceled()) return;
                 readObjectVersion(rdr, new SimplePrimitiveId(entry.getKey(),OsmPrimitiveType.RELATION), entry.getValue(), progressMonitor);

applications/editors/josm/plugins/reverter/src/reverter/OsmServerMultiObjectReader.java

@@ -9 +9 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -48 +47 @@
         StringBuilder sb = new StringBuilder();
         int cnt=0;
-        for (Entry<Long,Integer> entry : list.entrySet()) {
+        for (Map.Entry<Long,Integer> entry : list.entrySet()) {
             if (cnt == 0) {
                 sb.append(type.getAPIName());