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

Timestamp:

2013-02-15T22:56:49+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #8424 - Relation dialog: Operate on correct relation when selecting a context menu action with a filter

File:

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

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

@@ -698 +698 @@
         private ArrayList<Relation> filteredRelations;
         private DefaultListSelectionModel selectionModel;
-        //private SearchCompiler.Match filter;
+        private SearchCompiler.Match filter;
 
         public RelationListModel(DefaultListSelectionModel selectionModel) {
@@ -727 +727 @@
                 fireContentsChanged(this,0,getSize());
                 return;
-
             }
             for (Relation r: relations) {
@@ -737 +736 @@
             fireIntervalAdded(this, 0, getSize());
             setSelectedRelations(sel);
+            updateFilteredRelations();
         }
 
@@ -767 +767 @@
                 fireIntervalAdded(this, 0, getSize());
                 setSelectedRelations(sel);
+                updateFilteredRelations();
             }
         }
@@ -818 +819 @@
             return ret;
         }
+        
+        private void updateFilteredRelations() {
+            if (filter != null) {
+                filteredRelations = new ArrayList<Relation>(Utils.filter(relations, new Predicate<Relation>() {
+                    @Override
+                    public boolean evaluate(Relation r) {
+                        return filter.match(r);
+                    }
+                }));
+            } else if (filteredRelations != null) {
+                filteredRelations = null;
+            }
+        }
 
         public void setFilter(final SearchCompiler.Match filter) {
-            //this.filter = filter;
-            this.filteredRelations = new ArrayList<Relation>(Utils.filter(relations, new Predicate<Relation>() {
-                @Override
-                public boolean evaluate(Relation r) {
-                    return filter.match(r);
-                }
-            }));
+            this.filter = filter;
+            updateFilteredRelations();
             List<Relation> sel = getSelectedRelations();
             fireContentsChanged(this, 0, getSize());
@@ -864 +873 @@
                     continue;
                 }
-                if (relations.get(i).isNew()) {
+                if (getVisibleRelation(i).isNew()) {
                     continue;
                 }
-                ret.add(relations.get(i));
+                ret.add(getVisibleRelation(i));
             }
             return ret;
@@ -884 +893 @@
                     continue;
                 }
-                ret.add(relations.get(i));
+                ret.add(getVisibleRelation(i));
             }
             return ret;