Changeset 11038 in josm for trunk/src/org/openstreetmap/josm/gui/datatransfer

Timestamp:

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

Author:

simon04

Message:

Use Relation.getMemberPrimitivesList where possible to avoid unnecessary set creation

File:

• trunk/src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java (modified) (3 diffs)

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);
     }