Changeset 2656 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-12-19T11:39:23+01:00 (14 years ago)

Author:

jttt

Message:

Optimalization of two hotspots found by profiler. Makes drawing in large dataset much faster.

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DataSet.java (modified) (3 diffs)
• OsmPrimitive.java (modified) (1 diff)

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

@@ -305 +305 @@
      */
     public Collection<Node> getSelectedNodes() {
-        return getSelected(nodes);
+        List<Node> result = new ArrayList<Node>(selectedPrimitives.size());
+        for (OsmPrimitive primitive:selectedPrimitives) {
+            if (primitive instanceof Node) {
+                result.add((Node)primitive);
+            }
+        }
+        return result;
     }
 
@@ -312 +318 @@
      */
     public Collection<Way> getSelectedWays() {
-        return getSelected(ways);
+        List<Way> result = new ArrayList<Way>(selectedPrimitives.size());
+        for (OsmPrimitive primitive:selectedPrimitives) {
+            if (primitive instanceof Way) {
+                result.add((Way)primitive);
+            }
+        }
+        return result;
     }
 
@@ -319 +331 @@
      */
     public Collection<Relation> getSelectedRelations() {
-        return getSelected(relations);
-    }
-
-    /**
-     * Return all selected items in the collection.
-     * @param list The collection from which the selected items are returned.
-     */
-    private <T extends OsmPrimitive> Collection<T> getSelected(Collection<T> list) {
-        if (list == null)
-            return new LinkedList<T>();
-        // getSelected() is called with large lists, so
-        // creating the return list from the selection
-        // should be faster most of the time.
-        Collection<T> sel = new LinkedHashSet<T>(list);
-        sel.retainAll(selectedPrimitives);
-        return sel;
+        List<Relation> result = new ArrayList<Relation>(selectedPrimitives.size() / 10);
+        for (OsmPrimitive primitive:selectedPrimitives) {
+            if (primitive instanceof Relation) {
+                result.add((Relation)primitive);
+            }
+        }
+        return result;
     }
 

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

@@ -679 +679 @@
      */
     @Override public final int hashCode() {
-        final int[] ret = new int[1];
-        Visitor v = new Visitor(){
-            public void visit(Node n) { ret[0] = 0; }
-            public void visit(Way w) { ret[0] = 1; }
-            public void visit(Relation e) { ret[0] = 2; }
-            public void visit(Changeset cs) { ret[0] = 3; }
-        };
-        visit(v);
-        return (int)(id<<2)+ret[0];
+        return (int)id;
     }