Changeset 5709 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-02-12T21:41:26+01:00 (12 years ago)

Author:

Don-vip

Message:

fix #8424 - "Select" and "Delete" actions operate on wrong relations when filter is used in relation toggle dialog

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) (8 diffs)

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

@@ -410 +410 @@
             List<Relation> toDelete = new LinkedList<Relation>();
             for (int i : displaylist.getSelectedIndices()) {
-                toDelete.add(model.getRelation(i));
+                toDelete.add(model.getVisibleRelation(i));
             }
             for (Relation r : toDelete) {
@@ -519 +519 @@
             ArrayList<OsmPrimitive> selection = new ArrayList<OsmPrimitive>(idx.length);
             for (int i: idx) {
-                selection.add(model.getRelation(i));
+                selection.add(model.getVisibleRelation(i));
             }
             if(add) {
@@ -692 +692 @@
         private ArrayList<Relation> filteredRelations;
         private DefaultListSelectionModel selectionModel;
-        private SearchCompiler.Match filter;
+        //private SearchCompiler.Match filter;
 
         public RelationListModel(DefaultListSelectionModel selectionModel) {
@@ -785 +785 @@
             int size = relations.size();
             relations.removeAll(removedRelations);
+            if (filteredRelations != null) {
+                filteredRelations.removeAll(removedRelations);
+            }
             if (size != relations.size()) {
                 List<Relation> sel = getSelectedRelations();
@@ -811 +814 @@
 
         public void setFilter(final SearchCompiler.Match filter) {
-            this.filter = filter;
+            //this.filter = filter;
             this.filteredRelations = new ArrayList<Relation>(Utils.filter(relations, new Predicate<Relation>() {
                 @Override
@@ -827 +830 @@
             return filteredRelations == null ? relations : filteredRelations;
         }
+        
+        private Relation getVisibleRelation(int index) {
+            if (index < 0 || index >= getVisibleRelations().size()) return null;
+            return getVisibleRelations().get(index);
+        }
 
         @Override
         public Object getElementAt(int index) {
-            if (index < 0 || index >= getVisibleRelations().size()) return null;
-            return getVisibleRelations().get(index);
+            return getVisibleRelation(index);
         }
 
@@ -879 +886 @@
          * Sets the selected relations.
          *
-         * @return sel the list of selected relations
+         * @param sel the list of selected relations
          */
         public void setSelectedRelations(Collection<Relation> sel) {
@@ -896 +903 @@
         /**
          * Returns the index of the relation
+         * @param rel The relation to look for
          *
          * @return index of relation (null if it cannot be found)