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

Timestamp:

2012-03-14T21:39:27+01:00 (12 years ago)

Author:

simon04

Message:

fix #5395 - add "Add selection to relation" to popup menu of relation toggle dialog

File:

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

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

@@ -560 +560 @@
 
     /**
-     * Replies true if there is at least one relation member in this model
-     * which refers to at least on the primitives in <code>primitives</code>.
-     *
+     * Replies true if there is at least one relation member given as {@code members}
+     * which refers to at least on the primitives in {@code primitives}.
+     *
+     * @param members the members
      * @param primitives the collection of primitives
      * @return true if there is at least one relation member in this model
@@ -568 +569 @@
      * otherwise
      */
+    public static boolean hasMembersReferringTo(Collection<RelationMember> members, Collection<OsmPrimitive> primitives) {
+        if (primitives == null || primitives.isEmpty()) {
+            return false;
+        }
+        HashSet<OsmPrimitive> referrers = new HashSet<OsmPrimitive>();
+        for (RelationMember member : members) {
+            referrers.add(member.getMember());
+        }
+        for (OsmPrimitive referred : primitives) {
+            if (referrers.contains(referred)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Replies true if there is at least one relation member in this model
+     * which refers to at least on the primitives in <code>primitives</code>.
+     *
+     * @param primitives the collection of primitives
+     * @return true if there is at least one relation member in this model
+     * which refers to at least on the primitives in <code>primitives</code>; false
+     * otherwise
+     */
     public boolean hasMembersReferringTo(Collection<OsmPrimitive> primitives) {
-        if (primitives == null || primitives.isEmpty())
-            return false;
-        HashSet<OsmPrimitive> referrers = new HashSet<OsmPrimitive>();
-        for(RelationMember member : members) {
-            referrers.add(member.getMember());
-        }
-        Iterator<OsmPrimitive> it = primitives.iterator();
-        while(it.hasNext()) {
-            OsmPrimitive referred = it.next();
-            if (referrers.contains(referred))
-                return true;
-        }
-        return false;
+        return hasMembersReferringTo(members, primitives);
     }