Changeset 3199 in josm for trunk/src

Timestamp:

2010-04-22T23:39:51+02:00 (14 years ago)

Author:

bastiK

Message:

see #4929 - filtered objects can be selected: fixed the first and the third issue from my reply (select something, then change the filter to include these objects; undo, such that the properties of a selected change and a filter applies)

File:

• trunk/src/org/openstreetmap/josm/data/osm/Filters.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Filters.java

@@ -39 +39 @@
         Collection<OsmPrimitive> seld = new LinkedList<OsmPrimitive> ();
         Collection<OsmPrimitive> self = new LinkedList<OsmPrimitive> ();
-        if(Main.main.getCurrentDataSet() == null)return;
-        Main.main.getCurrentDataSet().setFiltered();
-        Main.main.getCurrentDataSet().setDisabled();
+        DataSet ds = Main.main.getCurrentDataSet();
+        if(ds == null)return;
+        ds.setFiltered();
+        ds.setDisabled();
         for (Filter flt : filters){
             if(flt.enable){
@@ -60 +61 @@
         disabledCount = seld.size() - self.size();
         hiddenCount = self.size();
-        Main.main.getCurrentDataSet().setFiltered(self);
-        Main.main.getCurrentDataSet().setDisabled(seld);
+        ds.setFiltered(self);
+        ds.setDisabled(seld);
+
+        ds.clearSelection(seld);
+
         Main.map.mapView.repaint();
     }