Changeset 2412 in josm for trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

Timestamp:

2009-11-08T17:51:35+01:00 (17 years ago)

Author:

jttt

Message:

Use refererrers in Draw, SplitWay and UnGlue actions

File:

• trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (4 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
@@ -15 +15 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
@@ -101 +102 @@
         // is exactly one way that all nodes are part of.
         if (selectedWay == null && selectedNodes != null) {
-            HashMap<Way, Integer> wayOccurenceCounter = new HashMap<Way, Integer>();
+            Map<Way, Integer> wayOccurenceCounter = new HashMap<Way, Integer>();
             for (Node n : selectedNodes) {
-                for (Way w : getCurrentDataSet().getWays()) {
+                for (Way w : OsmPrimitive.getFilteredList(n.getReferrers(), Way.class)) {
                     if (!w.isUsable()) {
                         continue;
@@ -294 +295 @@
         // now copy all relations to new way also
 
-        for (Relation r : getCurrentDataSet().getRelations()) {
+        for (Relation r : OsmPrimitive.getFilteredList(selectedWay.getReferrers(), Relation.class)) {
             if (!r.isUsable()) {
                 continue;