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

Timestamp:

15.06.2009 20:22:46 (3 years ago)

Author:

Gubaer

Message:

fixed: bug in OsmApi.getOsmApi()
cleanup: exception handling in interfacing with OSM API
new: new action for updating individual elements with the their current state on the server (including new menu item in the file menu)
new: improved user feedback in case of conflicts
new: handles 410 Gone conflicts when uploading a changeset
new: undoable command for "purging" a primitive from the current dataset (necessary if the primitive is already deleted on the server and the user wants to remove it from its local dataset)
new: undoable command for "undeleting" an already deleted primitive on the server (kind of "cloning")
new: after a full upload, checks whether there are primitives in the local dataset which might be deleted on the server.
new: data structures for history data
new: history download support in io package

File:

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

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

@@ -78 +78 @@
     }
 
+    @Override
     public String getName() {
         String name;
@@ -84 +85 @@
         } else {
             name = get("type");
-            if (name == null)
+            if (name == null) {
                 name = tr("relation");
+            }
 
             name += " (";
-            if(names == null)
-              names = Main.pref.getCollection("relation.nameOrder", Arrays.asList(defnames));
+            if(names == null) {
+                names = Main.pref.getCollection("relation.nameOrder", Arrays.asList(defnames));
+            }
             String nameTag = null;
             for (String n : names) {
                 nameTag = get(n);
-                if (nameTag != null) break;
+                if (nameTag != null) {
+                    break;
+                }
             }
-            if (nameTag != null)
+            if (nameTag != null) {
                 name += "\"" + nameTag + "\", ";
+            }
 
             int mbno = members.size();
             name += trn("{0} member", "{0} members", mbno, mbno) + ")";
-            if(errors != null)
+            if(errors != null) {
                 name = "*"+name;
+            }
         }
         return name;
@@ -113 +120 @@
         return false;
     }
-    
+
     public RelationMember firstMember() {
         if (incomplete) return null;
@@ -122 +129 @@
         return (members.size() == 0) ? null : members.get(members.size() -1);
     }
+
+    /**
+     * removes all members with member.member == primitive
+     * 
+     * @param primitive the primitive to check for
+     */
+    public void removeMembersFor(OsmPrimitive primitive) {
+        if (primitive == null)
+            return;
+
+        ArrayList<RelationMember> todelete = new ArrayList<RelationMember>();
+        for (RelationMember member: members) {
+            if (member.member == primitive) {
+                todelete.add(member);
+            }
+        }
+        members.removeAll(todelete);
+    }
 }