Changeset 2166 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2009-09-20T11:07:46+02:00 (14 years ago)

Author:

stoecker

Message:

see #3475 - patch by Petr Dlouhý - improve speed

File:

• trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -163 +163 @@
     public static Command deleteWithReferences(OsmDataLayer layer, Collection<? extends OsmPrimitive> selection, boolean simulate) {
         CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(layer.data);
+        v.initialize();
         for (OsmPrimitive osm : selection) {
             osm.visit(v);
         }
-        v.data.addAll(selection);
-        if (v.data.isEmpty())
+        v.getData().addAll(selection);
+        if (v.getData().isEmpty())
             return null;
-        if (!checkAndConfirmOutlyingDeletes(layer,v.data) && !simulate)
+        if (!checkAndConfirmOutlyingDeletes(layer,v.getData()) && !simulate)
             return null;
-        return new DeleteCommand(layer,v.data);
+        return new DeleteCommand(layer,v.getData());
     }
 
@@ -239 +240 @@
     protected static Collection<Node> computeNodesToDelete(OsmDataLayer layer, Collection<OsmPrimitive> primitivesToDelete) {
         Collection<Node> nodesToDelete = new HashSet<Node>();
+        CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(layer.data, false);
         for (OsmPrimitive osm : primitivesToDelete) {
             if (! (osm instanceof Way) ) {
@@ -247 +249 @@
                     continue;
                 }
-                CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(layer.data, false);
+                v.initialize();
                 n.visit(v);
-                v.data.removeAll(primitivesToDelete);
-                if (v.data.isEmpty()) {
+                v.getData().removeAll(primitivesToDelete);
+                if (v.getData().isEmpty()) {
                     nodesToDelete.add(n);
                 }
@@ -297 +299 @@
             return null;
 
+        CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(layer.data, false);
         for (OsmPrimitive osm : primitivesToDelete) {
-            CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(layer.data, false);
+            v.initialize();
             osm.visit(v);
-            for (OsmPrimitive ref : v.data) {
+            for (OsmPrimitive ref : v.getData()) {
                 if (primitivesToDelete.contains(ref)) {
                     continue;
@@ -328 +331 @@
                 primitivesToDelete.add(w);
 
-                CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(layer.data, false);
+                v.initialize();
                 w.visit(v);
-                for (OsmPrimitive ref : v.data) {
+                for (OsmPrimitive ref : v.getData()) {
                     if (primitivesToDelete.contains(ref)) {
                         continue;