Changeset 2264 in josm for trunk/src/org/openstreetmap/josm/actions/search

Timestamp:

2009-10-10T14:14:28+02:00 (15 years ago)

Author:

stoecker

Message:

applied #3676 - patch by Dave Hansen - cleanup selection handling interface

Location:

trunk/src/org/openstreetmap/josm/actions/search

Files:

• SearchAction.java (modified) (3 diffs)
• SearchCompiler.java (modified) (1 diff)

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

@@ -26 +26 @@
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.data.osm.Filter;
+import org.openstreetmap.josm.data.osm.DataSet;
 
 public class SearchAction extends JosmAction{
@@ -89 +90 @@
         left.add(input, GBC.eop().fill(GBC.HORIZONTAL));
         left.add(replace, GBC.eol());
+        DataSet ds = Main.main.getCurrentDataSet();
         left.add(add, GBC.eol());
         left.add(remove, GBC.eol());
@@ -237 +239 @@
         //        }
 
-        Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
+        final DataSet ds = Main.main.getCurrentDataSet();
+        Collection<OsmPrimitive> sel = ds.getSelected();
         int foundMatches = getSelection(s, sel, new Function(){
             public Boolean isSomething(OsmPrimitive o){
-                return o.isSelected();
+                return ds.isSelected(o);
             }
         });
-        Main.main.getCurrentDataSet().setSelected(sel);
+        ds.setSelected(sel);
         if (foundMatches == 0) {
             String msg = null;

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

@@ -424 +424 @@
     private static class Selected extends Match {
         @Override public boolean match(OsmPrimitive osm) {
-            return osm.isSelected();
+            return Main.main.getCurrentDataSet().isSelected(osm);
         }
         @Override public String toString() {return "selected";}