Changeset 2565 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.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/gui/layer/OsmDataLayer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -49 +49 @@
 import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
-import org.openstreetmap.josm.data.osm.BackreferencedDataSet;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSetMerger;
@@ -394 +393 @@
      */
     protected PurgePrimitivesCommand buildPurgeCommand() {
-        BackreferencedDataSet ds = new BackreferencedDataSet();
         ArrayList<OsmPrimitive> toPurge = new ArrayList<OsmPrimitive>();
         conflictLoop: for (Conflict<?> c: conflicts) {
@@ -416 +414 @@
                 // gets purged.
                 //
-                for (OsmPrimitive parent: ds.getParents(c.getMy())) {
+                for (OsmPrimitive parent: c.getMy().getReferrers()) {
                     if (parent.isModified() && parent instanceof Way) {
                         continue conflictLoop;
@@ -426 +424 @@
         if (toPurge.isEmpty()) return null;
         PurgePrimitivesCommand cmd = new PurgePrimitivesCommand(this, toPurge);
-        cmd.setBackreferenceDataSet(ds);
         return cmd;
     }