Changeset 2308 in josm for trunk/src/org/openstreetmap/josm/data/osm/Relation.java

Timestamp:

2009-10-25T12:05:31+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3762: Deleted relation still referenced when deleting former member
Clean up of Delete command. New: only one confirmation dialog for all parent relations of deleted objects, see help.
Improved infrastructure for context-sensitive help, improved internal help browser.

File:

• trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) (4 diffs)

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

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -170 +171 @@
         for (RelationMemberData member:relationData.getMembers()) {
             switch (member.getMemberType()) {
-            case NODE:
-                nodes.put(member.getMemberId(), nodeMarker);
-                break;
-            case WAY:
-                ways.put(member.getMemberId(), wayMarker);
-                break;
-            case RELATION:
-                relations.put(member.getMemberId(), relationMarker);
-                break;
+                case NODE:
+                    nodes.put(member.getMemberId(), nodeMarker);
+                    break;
+                case WAY:
+                    ways.put(member.getMemberId(), wayMarker);
+                    break;
+                case RELATION:
+                    relations.put(member.getMemberId(), relationMarker);
+                    break;
             }
         }
@@ -202 +203 @@
             OsmPrimitive foundMember = null;
             switch (member.getMemberType()) {
-            case NODE:
-                foundMember = nodes.get(member.getMemberId());
-                if (foundMember == nodeMarker) {
-                    throw new AssertionError("Data consistency problem - relation with missing member detected");
-                }
-                break;
-            case WAY:
-                foundMember = ways.get(member.getMemberId());
-                if (foundMember == wayMarker) {
-                    throw new AssertionError("Data consistency problem - relation with missing member detected");
-                }
-                break;
-            case RELATION:
-                foundMember = relations.get(member.getMemberId());
-                if (foundMember == relationMarker) {
-                    throw new AssertionError("Data consistency problem - relation with missing member detected");
-                }
-                break;
+                case NODE:
+                    foundMember = nodes.get(member.getMemberId());
+                    if (foundMember == nodeMarker)
+                        throw new AssertionError("Data consistency problem - relation with missing member detected");
+                    break;
+                case WAY:
+                    foundMember = ways.get(member.getMemberId());
+                    if (foundMember == wayMarker)
+                        throw new AssertionError("Data consistency problem - relation with missing member detected");
+                    break;
+                case RELATION:
+                    foundMember = relations.get(member.getMemberId());
+                    if (foundMember == relationMarker)
+                        throw new AssertionError("Data consistency problem - relation with missing member detected");
+                    break;
             }
             newMembers.add(new RelationMember(member.getRole(), foundMember));
@@ -290 +288 @@
     }
 
+    /**
+     * removes all members with member.member == primitive
+     *
+     * @param primitives the primitives to check for
+     */
+    public void removeMembersFor(Collection<OsmPrimitive> primitives) {
+        if (primitives == null || primitives.isEmpty())
+            return;
+
+        ArrayList<RelationMember> todelete = new ArrayList<RelationMember>();
+        for (RelationMember member: members) {
+            if (primitives.contains(member.getMember())) {
+                todelete.add(member);
+            }
+        }
+        members.removeAll(todelete);
+    }
+
     @Override
     public String getDisplayName(NameFormatter formatter) {