Changeset 10711 in josm for trunk/src

Timestamp:

2016-08-03T09:57:29+02:00 (8 years ago)

Author:

simon04

Message:

fix #13063 - "Select all" and "Search" ignore filters

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• SelectAllAction.java (modified) (2 diffs)
• search/SearchAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java

@@ -9 +9 @@
 
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -27 +28 @@
             return;
         DataSet ds = getLayerManager().getEditDataSet();
-        ds.setSelected(ds.allNonDeletedCompletePrimitives());
+        ds.setSelected(ds.getPrimitives(OsmPrimitive::isSelectable));
     }
 

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -673 +673 @@
                 Collection<OsmPrimitive> all;
                 if (setting.allElements) {
-                    all = Main.getLayerManager().getEditDataSet().allPrimitives();
+                    all = ds.allPrimitives();
                 } else {
-                    all = Main.getLayerManager().getEditDataSet().allNonDeletedCompletePrimitives();
+                    all = ds.getPrimitives(OsmPrimitive::isSelectable);
                 }
                 final ProgressMonitor subMonitor = getProgressMonitor().createSubTaskMonitor(all.size(), false);