Changeset 4795 in josm

Timestamp:

Jan 15, 2012 7:46:00 PM (17 months ago)

Author:

simon04

Message:

fix #5796 - remotecontrol: load_and_zoom/zoom: select relations in the relation toggle dialog

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/RelationListDialog.java (modified) (2 diffs)
• io/remotecontrol/handler/LoadAndZoomHandler.java (modified) (2 diffs)

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

@@ -211 +211 @@
      */
     public void selectRelation(Relation relation) {
-        if (relation == null) {
+        selectRelations(Collections.singleton(relation));
+    }
+
+    /**
+     * Selects the relations in the list of relations.
+     * @param relations  the relations to be selected
+     */
+    public void selectRelations(Collection<Relation> relations) {
+        if (relations == null || relations.isEmpty()) {
             model.setSelectedRelations(null);
         } else {
-            model.setSelectedRelations(Collections.singletonList(relation));
-            Integer i = model.getRelationIndex(relation);
+            model.setSelectedRelations(relations);
+            Integer i = model.getRelationIndex(relations.iterator().next());
             if (i != null) { // Not all relations have to be in the list (for example when the relation list is hidden, it's not updated with new relations)
                 displaylist.scrollRectToVisible(displaylist.getCellBounds(i, i));
@@ -740 +748 @@
          * @return sel the list of selected relations
          */
-        public void setSelectedRelations(List<Relation> sel) {
+        public void setSelectedRelations(Collection<Relation> sel) {
             selectionModel.clearSelection();
             if (sel == null || sel.isEmpty())

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -173 +174 @@
                         new AutoScaleAction("selection").actionPerformed(null);
                     }
+                    if (Main.map != null && Main.map.relationListDialog != null) {
+                        Main.map.relationListDialog.dataChanged(null);
+                        Main.map.relationListDialog.selectRelations(Utils.filteredCollection(newSel, Relation.class));
+                    }
                 }
             });