Changeset 2565 in josm for trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

Timestamp:

2009-12-03T20:26:00+01:00 (14 years ago)

Author:

Gubaer

Message:

Removed BackReferenceDataSet and CollectBackReferenceVisitor because we now have referrer support in OsmPrimitive.
This could cause some problems in the next few days. I'm sure I didn't test every possibly affected feature.

File:

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

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

@@ -24 +24 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.SplitWayAction;
-import org.openstreetmap.josm.data.osm.BackreferencedDataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationToChildReference;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
-import org.openstreetmap.josm.data.osm.BackreferencedDataSet.RelationToChildReference;
-import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor;
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
@@ -218 +216 @@
             throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "layer"));
         if (selection == null || selection.isEmpty()) return null;
-        CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(layer.data);
-        v.initialize();
-        for (OsmPrimitive osm : selection) {
-            osm.visit(v);
-        }
-        v.getData().addAll(selection);
-        if (v.getData().isEmpty())
+        Set<OsmPrimitive> parents = OsmPrimitive.getReferrer(selection);
+        parents.addAll(selection);
+
+        if (parents.isEmpty())
             return null;
-        if (!checkAndConfirmOutlyingDeletes(layer,v.getData()) && !silent)
+        if (!checkAndConfirmOutlyingDeletes(layer,parents) && !silent)
             return null;
-        return new DeleteCommand(layer,v.getData());
+        return new DeleteCommand(layer,parents);
     }
 
@@ -246 +241 @@
      *    <li>it is not referred to by other non-deleted primitives outside of  <code>primitivesToDelete</code></li>
      * <ul>
-     * @param backreferences backreference data structure
      * @param layer  the layer in whose context primitives are deleted
      * @param primitivesToDelete  the primitives to delete
@@ -252 +246 @@
      * can be deleted too
      */
-    protected static Collection<Node> computeNodesToDelete(BackreferencedDataSet backreferences, OsmDataLayer layer, Collection<OsmPrimitive> primitivesToDelete) {
+    protected static Collection<Node> computeNodesToDelete(OsmDataLayer layer, Collection<OsmPrimitive> primitivesToDelete) {
         Collection<Node> nodesToDelete = new HashSet<Node>();
         for (Way way : OsmPrimitive.getFilteredList(primitivesToDelete, Way.class)) {
@@ -259 +253 @@
                     continue;
                 }
-                Collection<OsmPrimitive> referringPrimitives = backreferences.getParents(n);
+                Collection<OsmPrimitive> referringPrimitives = n.getReferrers();
                 referringPrimitives.removeAll(primitivesToDelete);
                 int count = 0;
@@ -314 +308 @@
             return null;
 
-        BackreferencedDataSet backreferences = new BackreferencedDataSet();
         Set<OsmPrimitive> primitivesToDelete = new HashSet<OsmPrimitive>(selection);
         Collection<Way> waysToBeChanged = new HashSet<Way>();
@@ -321 +314 @@
             // delete untagged nodes only referenced by primitives in primitivesToDelete,
             // too
-            Collection<Node> nodesToDelete = computeNodesToDelete(backreferences, layer, primitivesToDelete);
+            Collection<Node> nodesToDelete = computeNodesToDelete(layer, primitivesToDelete);
             primitivesToDelete.addAll(nodesToDelete);
         }
@@ -328 +321 @@
             return null;
 
-        waysToBeChanged.addAll(OsmPrimitive.getFilteredSet(backreferences.getParents(primitivesToDelete), Way.class));
+        waysToBeChanged.addAll(OsmPrimitive.getFilteredSet(OsmPrimitive.getReferrer(primitivesToDelete), Way.class));
 
         Collection<Command> cmds = new LinkedList<Command>();
@@ -345 +338 @@
         //
         if (!silent) {
-            Set<RelationToChildReference> references = backreferences.getRelationToChildReferences(primitivesToDelete);
+            Set<RelationToChildReference> references = RelationToChildReference.getRelationToChildReferences(primitivesToDelete);
             Iterator<RelationToChildReference> it = references.iterator();
             while(it.hasNext()) {
@@ -364 +357 @@
         // remove the objects from their parent relations
         //
-        Iterator<Relation> iterator = OsmPrimitive.getFilteredSet(backreferences.getParents(primitivesToDelete), Relation.class).iterator();
+        Iterator<Relation> iterator = OsmPrimitive.getFilteredSet(OsmPrimitive.getReferrer(primitivesToDelete), Relation.class).iterator();
         while (iterator.hasNext()) {
             Relation cur = iterator.next();