Changeset 3123 in josm for trunk/src/org

Timestamp:

2010-03-12T16:12:19+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #4725: Much slower selection list handling since 3102
Removed sorting of the selection list, was too slow.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -18 +18 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
@@ -47 +47 @@
 import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
 import org.openstreetmap.josm.data.SelectionChangedListener;
-import org.openstreetmap.josm.data.osm.NameFormatter;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -65 +64 @@
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
@@ -81 +79 @@
  */
 public class SelectionListDialog extends ToggleDialog  {
+    static private final Logger logger = Logger.getLogger(SelectionListDialog.class.getName());
 
     private JList lstPrimitives;
@@ -518 +517 @@
             }
             this.selection.addAll(selection);
-            sort();
             fireContentsChanged(this, 0, getSize());
             remember(selection);
-        }
-
-        /**
-         * Sorts the primitives in the list
-         */
-        public void sort() {
-            Collections.sort(
-                    this.selection,
-                    new Comparator<OsmPrimitive>() {
-                        NameFormatter nf = DefaultNameFormatter.getInstance();
-
-                        public int compare(OsmPrimitive o1, OsmPrimitive o2) {
-                            if (o1.getType() != o2.getType())
-                                return o1.getType().compareTo(o2.getType());
-                            return o1.getDisplayName(nf).compareTo(o2.getDisplayName(nf));
-                        }
-                    }
-            );
         }