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

Timestamp:

2010-03-10T10:00:20+01:00 (16 years ago)

Author:

Gubaer

Message:

fixed #4651: Ability to download incomplete relation from selection
fixed #4098: Popup Menu entry "download relation members" in relation dialog should be "download incomplete relation members"
fixed two NPEs in RelationListDialog and SelectionListDialog
refactored SelectionListDialog to support better user feedback (enabled/disabled buttons and menu items)
Finally removed the sort() method on DataSet, marked as FIXME since a long time.

CAVEAT: DataSet.getSelected() now returns an unmodifiable list instead of a copy of the selection list. This may lead to UnsupportedOperationExceptions in the next few days. I tried to make sure the JOSM core uses getSelected() only for reading, but I didn't check the plugins.

File:

• trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) (1 diff)

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

@@ -398 +398 @@
         }
     }
+
+    /**
+     * Replies true if at least one child primitive is incomplete
+     * 
+     * @return true if at least one child primitive is incomplete
+     */
+    public boolean hasIncompleteMembers() {
+        for (RelationMember rm: members) {
+            if (rm.getMember().isIncomplete()) return true;
+        }
+        return false;
+    }
+
+    /**
+     * Replies a collection with the incomplete children this relation
+     * refers to
+     * 
+     * @return the incomplete children. Empty collection if no children are incomplete.
+     */
+    public Collection<OsmPrimitive> getIncompleteMembers() {
+        Set<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
+        for (RelationMember rm: members) {
+            if (!rm.getMember().isIncomplete()) {
+                continue;
+            }
+            ret.add(rm.getMember());
+        }
+        return ret;
+    }
 }