Changeset 3102 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

Timestamp:

10.03.2010 10:00:20 (2 years ago)

Author:

Gubaer

Message:

fixed #4651: Ability to download incomplete relation from selection
fixed #4098: Popup Menu entry "download relation members" in relation dialog should be "download incomplete relation members"
fixed two NPEs in RelationListDialog and SelectionListDialog
refactored SelectionListDialog to support better user feedback (enabled/disabled buttons and menu items)
Finally removed the sort() method on DataSet, marked as FIXME since a long time.

CAVEAT: DataSet.getSelected() now returns an unmodifiable list instead of a copy of the selection list. This may lead to UnsupportedOperationExceptions in the next few days. I tried to make sure the JOSM core uses getSelected() only for reading, but I didn't check the plugins.

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (3 diffs)

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

@@ -9 +9 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -313 +312 @@
 
     /**
-     * Return a list of all selected objects. Even keys are returned.
-     * @return List of all selected objects.
+     * Replies an unmodifiable collection of primitives currently selected
+     * in this dataset
+     * 
+     * @return unmodifiable collection of primitives
      */
     public Collection<OsmPrimitive> getSelected() {
-        // It would be nice to have this be a copy-on-write list
-        // or an Collections.unmodifiableList().  It would be
-        // much faster for large selections.  May users just
-        // call this, and only check the .size().
-        return new ArrayList<OsmPrimitive>(selectedPrimitives);
+        return Collections.unmodifiableSet(selectedPrimitives);
     }
 
@@ -610 +607 @@
         }
         return a;
-    }
-
-    // Provide well-defined sorting for collections of OsmPrimitives.
-    // FIXME: probably not a good place to put this code.
-    public static OsmPrimitive[] sort(Collection<? extends OsmPrimitive> list) {
-        OsmPrimitive[] selArr = new OsmPrimitive[list.size()];
-        final HashMap<Object, String> h = new HashMap<Object, String>();
-        selArr = list.toArray(selArr);
-        Arrays.sort(selArr, new Comparator<OsmPrimitive>() {
-            public int compare(OsmPrimitive a, OsmPrimitive b) {
-                if (a.getClass() == b.getClass()) {
-                    String as = h.get(a);
-                    if (as == null) {
-                        as = a.getName() != null ? a.getName() : Long.toString(a.getId());
-                        h.put(a, as);
-                    }
-                    String bs = h.get(b);
-                    if (bs == null) {
-                        bs = b.getName() != null ? b.getName() : Long.toString(b.getId());
-                        h.put(b, bs);
-                    }
-                    int res = as.compareTo(bs);
-                    if (res != 0)
-                        return res;
-                }
-                return a.compareTo(b);
-            }
-        });
-        return selArr;
     }