Changeset 3630 in josm for trunk/src/org

Timestamp:

2010-10-24T00:39:02+02:00 (14 years ago)

Author:

bastiK

Message:

applied #5552 (patch by extropy) - Delete performance improvement

File:

• trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) (2 diffs)

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

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
+import java.util.Set;
 
 import org.openstreetmap.josm.Main;
@@ -294 +294 @@
     }
 
-    public void removeNodes(Collection<? extends OsmPrimitive> selection) {
+    public void removeNodes(Set<? extends OsmPrimitive> selection) {
         if (isIncomplete()) return;
         boolean locked = writeLock();
         try {
-            for(OsmPrimitive p : selection) {
-                if (p instanceof Node) {
-                    removeNode((Node)p);
+            boolean closed = (lastNode() == firstNode() && selection.contains(lastNode()));
+            List<Node> copy = new ArrayList<Node>();
+
+            for (Node n: nodes) {
+                if (!selection.contains(n)) {
+                    copy.add(n);
                 }
             }
+
+            int i = copy.size();
+            if (closed && i > 2) {
+                copy.add(copy.get(0));
+            } else if (i >= 2 && i <= 3 && copy.get(0) == copy.get(i-1)) {
+                copy.remove(i-1);
+            }
+            setNodes(copy);
         } finally {
             writeUnlock(locked);