Changeset 1927 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

Timestamp:

2009-08-08T10:53:46+02:00 (17 years ago)

Author:

Gubaer

Message:

fixed #3213: Adding objects to a relation breaks selecting multiple objects

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -376 +376 @@
      * @return the set of selected referers
      */
-    public Set<OsmPrimitive> getSelectedReferers() {
+    public Set<OsmPrimitive> getSelectedChildPrimitives() {
         HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
         for (RelationMember m: getSelectedMembers()) {
@@ -385 +385 @@
 
     /**
+     * Replies the set of selected referers. Never null, but may be empty.
+     * 
+     * @return the set of selected referers
+     */
+    public Set<OsmPrimitive> getChildPrimitives(Collection<? extends OsmPrimitive> referenceSet) {
+        HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
+        if (referenceSet == null) return null;
+        for (RelationMember m: members) {
+            if (referenceSet.contains(m.member)) {
+                ret.add(m.member);
+            }
+        }
+        return ret;
+    }
+
+
+    /**
      * Replies true, if the selected {@see OsmPrimitive}s in the layer belonging
      * to this model are in sync with the selected referers in this model.
@@ -391 +408 @@
      */
     public boolean selectionsAreInSync() {
-        HashSet<OsmPrimitive> s1 = new HashSet<OsmPrimitive>(getSelectedReferers());
+        HashSet<OsmPrimitive> s1 = new HashSet<OsmPrimitive>(getSelectedChildPrimitives());
         if (s1.size() != layer.data.getSelected().size()) return false;
         s1.removeAll(layer.data.getSelected());