Changeset 2906 in josm for trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

Timestamp:

2010-01-29T22:26:58+01:00 (14 years ago)

Author:

mjulius

Message:

remove OsmPrimitive.entrySet()
using keySet()/get() or getKeys() instead

File:

• trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (1 diff)

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

@@ -250 +250 @@
         ways.add(b);
 
-        // This is mostly copied and pasted from CombineWayAction.java and one day should be moved into tools
+        // FIXME: This is mostly copied and pasted from CombineWayAction.java and one day should be moved into tools
         Map<String, Set<String>> props = new TreeMap<String, Set<String>>();
         for (Way w : ways) {
-            for (Entry<String,String> e : w.entrySet()) {
-                if (!props.containsKey(e.getKey())) {
-                    props.put(e.getKey(), new TreeSet<String>());
-                }
-                props.get(e.getKey()).add(e.getValue());
+            for (String key: w.keySet()) {
+                if (!props.containsKey(key)) {
+                    props.put(key, new TreeSet<String>());
+                }
+                props.get(key).add(w.get(key));
             }
         }