Changeset 11038 in josm

Timestamp:

2016-09-21T21:37:13+02:00 (8 years ago)

Author:

simon04

Message:

Use Relation.getMemberPrimitivesList where possible to avoid unnecessary set creation

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CreateMultipolygonAction.java (modified) (1 diff)
• actions/relation/SelectMembersAction.java (modified) (1 diff)
• data/osm/Relation.java (modified) (5 diffs)
• data/osm/visitor/paint/relations/MultipolygonCache.java (modified) (1 diff)
• gui/datatransfer/data/PrimitiveTransferData.java (modified) (3 diffs)
• gui/mappaint/mapcss/Selector.java (modified) (2 diffs)
• gui/util/HighlightHelper.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

@@ -335 +335 @@
             }
         }
-        ways.removeAll(rel.getMemberPrimitives());
+        ways.removeAll(rel.getMemberPrimitivesList());
         for (final Way way : ways) {
             rel.addMember(new RelationMember(role, way));

trunk/src/org/openstreetmap/josm/actions/relation/SelectMembersAction.java

@@ -40 +40 @@
         Set<OsmPrimitive> members = new HashSet<>();
         for (Relation r: relations) {
-            members.addAll(r.getMemberPrimitives());
+            members.addAll(r.getMemberPrimitivesList());
         }
         if (add) {

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

@@ -10 +10 @@
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.Main;
@@ -72 +73 @@
     }
 
+    /**
+     * Returns the relation member at the specified index.
+     * @param index the index of the relation member
+     * @return relation member at the specified index
+     */
     public RelationMember getMember(int index) {
         return members[index];
     }
 
+    /**
+     * Adds the specified relation member at the last position.
+     * @param member the member to add
+     */
     public void addMember(RelationMember member) {
         boolean locked = writeLock();
@@ -88 +98 @@
     }
 
+    /**
+     * Adds the specified relation member at the specified index.
+     * @param member the member to add
+     * @param index the index at which the specified element is to be inserted
+     */
     public void addMember(int index, RelationMember member) {
         boolean locked = writeLock();
@@ -383 +398 @@
      * @return the set of  {@link OsmPrimitive}s referred to by at least one
      * member of this relation
+     * @see #getMemberPrimitivesList()
      */
     public Set<OsmPrimitive> getMemberPrimitives() {
-        Set<OsmPrimitive> ret = new HashSet<>();
-        RelationMember[] members = this.members;
-        for (RelationMember m: members) {
-            if (m.getMember() != null) {
-                ret.add(m.getMember());
-            }
-        }
-        return ret;
-    }
-
+        return getMembers().stream().map(RelationMember::getMember).collect(Collectors.toSet());
+    }
+
+    /**
+     * Returns the {@link OsmPrimitive}s of the specified type referred to by at least one member of this relation.
+     * @param tClass the type of the primitive
+     * @param <T> the type of the primitive
+     * @return the primitives
+     */
     public <T extends OsmPrimitive> Collection<T> getMemberPrimitives(Class<T> tClass) {
-        return Utils.filteredCollection(getMemberPrimitives(), tClass);
-    }
-
+        return Utils.filteredCollection(getMemberPrimitivesList(), tClass);
+    }
+
+    /**
+     * Returns an unmodifiable list of the {@link OsmPrimitive}s referred to by at least one member of this relation.
+     * @return an unmodifiable list of the primitives
+     */
     public List<OsmPrimitive> getMemberPrimitivesList() {
         return Utils.transform(getMembers(), RelationMember::getMember);
@@ -549 +568 @@
     protected void keysChangedImpl(Map<String, String> originalKeys) {
         super.keysChangedImpl(originalKeys);
-        for (OsmPrimitive member : getMemberPrimitives()) {
+        for (OsmPrimitive member : getMemberPrimitivesList()) {
             member.clearCachedStyle();
         }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java

@@ -224 +224 @@
         }
         // Erase style cache for polygon members
-        for (OsmPrimitive member : r.getMemberPrimitives()) {
+        for (OsmPrimitive member : r.getMemberPrimitivesList()) {
             member.clearCachedStyle();
         }

trunk/src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.tools.CompositeList;
 
 /**
@@ -40 +41 @@
                 return ((Way) primitive).getNodes();
             } else if (primitive instanceof Relation) {
-                return ((Relation) primitive).getMemberPrimitives();
+                return ((Relation) primitive).getMemberPrimitivesList();
             } else {
                 return Collections.emptyList();
@@ -102 +103 @@
      */
     public Collection<PrimitiveData> getAll() {
-        ArrayList<PrimitiveData> list = new ArrayList<>();
-        list.addAll(direct);
-        list.addAll(referenced);
-        return list;
+        return new CompositeList<>(direct, referenced);
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -10 +10 @@
 import java.util.function.IntFunction;
 import java.util.function.IntSupplier;
+import java.util.Set;
 import java.util.regex.PatternSyntaxException;
 
@@ -315 +316 @@
                     final Relation multipolygon = multipolygons.iterator().next();
                     if (multipolygon == null) throw new NoSuchElementException();
+                    final Set<OsmPrimitive> members = multipolygon.getMemberPrimitives();
                     containsFinder = new ContainsFinder(new Environment(multipolygon)) {
                         @Override
                         public boolean isPrimitiveUsable(OsmPrimitive p) {
-                            return super.isPrimitiveUsable(p) && !multipolygon.getMemberPrimitives().contains(p);
+                            return super.isPrimitiveUsable(p) && !members.contains(p);
                         }
                     };

trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java

@@ -88 +88 @@
             seenRelations.add(r);
             boolean needRepaint = false;
-            for (OsmPrimitive m : r.getMemberPrimitives()) {
+            for (OsmPrimitive m : r.getMemberPrimitivesList()) {
                 if (!(m instanceof Relation) || !seenRelations.contains(m)) {
                     needRepaint |= setHighlight(m, flag, seenRelations);