Changeset 10711 in josm


Ignore:
Timestamp:
2016-08-03T09:57:29+02:00 (3 years ago)
Author:
simon04
Message:

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

Location:
trunk/src/org/openstreetmap/josm/actions
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java

    r10382 r10711  
    99
    1010import org.openstreetmap.josm.data.osm.DataSet;
     11import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1112import org.openstreetmap.josm.tools.Shortcut;
    1213
     
    2728            return;
    2829        DataSet ds = getLayerManager().getEditDataSet();
    29         ds.setSelected(ds.allNonDeletedCompletePrimitives());
     30        ds.setSelected(ds.getPrimitives(OsmPrimitive::isSelectable));
    3031    }
    3132
  • trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

    r10658 r10711  
    673673                Collection<OsmPrimitive> all;
    674674                if (setting.allElements) {
    675                     all = Main.getLayerManager().getEditDataSet().allPrimitives();
     675                    all = ds.allPrimitives();
    676676                } else {
    677                     all = Main.getLayerManager().getEditDataSet().allNonDeletedCompletePrimitives();
     677                    all = ds.getPrimitives(OsmPrimitive::isSelectable);
    678678                }
    679679                final ProgressMonitor subMonitor = getProgressMonitor().createSubTaskMonitor(all.size(), false);
Note: See TracChangeset for help on using the changeset viewer.