Changeset 33121 in osm for applications/editors/josm

Timestamp:

2017-01-23T22:56:48+01:00 (9 years ago)

Author:

donvip

Message:

fix error-prone errors

Location:

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker

Files:

• datastructure/OSMGraph.java (modified) (3 diffs)
• datastructure/OSMRelation.java (modified) (1 diff)
• junctionchecking/JunctionChecker.java (modified) (1 diff)

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMGraph.java

@@ -34 +34 @@
 
     public void removeWay(OSMWay way) {
-        ways.remove(way);
+        while (ways.values().remove(way));
     }
 
@@ -51 +51 @@
 
     public OSMRelation getRelation(int id) {
-        return relations.get(id);
+        return relations.get(Long.valueOf(id));
     }
 
@@ -85 +85 @@
 
     public ArrayList<Long> getIDsfromWay(int id) {
-        OSMWay w = ways.get(id);
+        OSMWay w = ways.get(Long.valueOf(id));
         ArrayList<Long> ids = new ArrayList<>();
         ids.add(w.getToNode().getId());

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMRelation.java

@@ -53 +53 @@
      * @author  joerg
      */
-    class Member {
+    static class Member {
 
         private OSMEntity member;

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JunctionChecker.java

@@ -125 +125 @@
             for (int j = 0; j < junctioncandidates.size(); j++) {
                 if (junctioncandidates.get(i).containsAll(junctioncandidates.get(j))) {
-                    junctions.removeAll(junctioncandidates.get(i));
+                    junctions.remove(junctioncandidates.get(i));
                 }
             }