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

Timestamp:

2009-07-27T21:09:44+02:00 (16 years ago)

Author:

jttt

Message:

Way refactoring - added method that will in future replace public field nodes

File:

• trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (modified) (6 diffs)

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

@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -28 +27 @@
  * layer and disconnects any references from {@see Way}s or {@see Relation}s
  * to this primitive.
- * 
+ *
  * This command is necessary if a local {@see OsmPrimitive} has been deleted on
  * the server by another user and if the local user decides to delete his version
  * too. If he only deleted it "logically" JOSM would try to delete it on the server
  * which would result in an non resolvable conflict.
- * 
+ *
  */
 public class PurgePrimitivesCommand extends ConflictResolveCommand{
@@ -44 +43 @@
      * because a {@see Relation} refers to any other {@see OsmPrimitive}
      * via a relation member.
-     * 
+     *
      */
     static class OsmParentChildPair {
@@ -100 +99 @@
      * as child and given set of parents. We don't use {@see CollectBackReferencesVisitor}
      * because it seems quite inefficient.
-     * 
+     *
      * @param parents  the set of potential parents
      * @param child the child
@@ -110 +109 @@
             if (parent instanceof Way) {
                 Way w = (Way)parent;
-                for (OsmPrimitive node : w.nodes) {
+                for (OsmPrimitive node : w.getNodes()) {
                     if (node == child) {
                         OsmParentChildPair pair = new OsmParentChildPair(parent, node);
@@ -170 +169 @@
     /**
      * Purges an {@see OsmPrimitive} <code>toPurge</code> from a {@see DataSet}.
-     * 
+     *
      * @param toPurge the primitive to purge
      * @param ds  the dataset to purge from
      * @param hive the hive of {@see OsmPrimitive}s we remember other {@see OsmPrimitive}
      * we have to purge because we purge <code>toPurge</code>.
-     * 
+     *
      */
     protected void purge(OsmPrimitive toPurge, DataSet ds, ArrayList<OsmPrimitive> hive) {