Changeset 755 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2008-08-07T10:03:52+02:00 (17 years ago)

Author:

stoecker

Message:

better sorting of selected elements and relation list, reenabled relation search, translation cleanups

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• RelationListDialog.java (modified) (2 diffs)
• SelectionListDialog.java (modified) (1 diff)

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

@@ -21 +21 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.DeleteCommand;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
@@ -112 +113 @@
                 list.setSize(Main.ds.relations.size());
                 int i = 0;
-                for (Relation e : Main.ds.relations) {
+                for (OsmPrimitive e : Main.ds.sort(Main.ds.relations)) {
                         if (!e.deleted && !e.incomplete)
                                 list.setElementAt(e, i++);

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

@@ -96 +96 @@
          */
         public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-                if (list == null)
+                if (list == null || !isVisible())
                         return; // selection changed may be received in base class constructor before init
-                if (!isVisible())
-                        return;
-                OsmPrimitive[] selArr = new OsmPrimitive[newSelection.size()];
-                selArr = newSelection.toArray(selArr);
-                Arrays.sort(selArr);
+                OsmPrimitive selArr[] = Main.ds.sort(newSelection);
                 list.setSize(selArr.length);
                 int i = 0;