Changeset 5441 in josm

Timestamp:

2012-08-13T09:05:30+02:00 (12 years ago)

Author:

bastiK

Message:

remove duplicate class

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified) (4 diffs)

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

@@ -47 +47 @@
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Property;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -474 +475 @@
     }
 
-    public interface Function{
-        public Boolean isSomething(OsmPrimitive o);
-    }
-
-    public static int getSelection(SearchSetting s, Collection<OsmPrimitive> sel, Function f) {
+    public static int getSelection(SearchSetting s, Collection<OsmPrimitive> sel, Predicate<OsmPrimitive> p) {
         int foundMatches = 0;
         try {
@@ -500 +497 @@
                         ++foundMatches;
                     }
-                } else if (s.mode == SearchMode.add && !f.isSomething(osm) && matcher.match(osm)) {
+                } else if (s.mode == SearchMode.add && !p.evaluate(osm) && matcher.match(osm)) {
                     sel.add(osm);
                     ++foundMatches;
-                } else if (s.mode == SearchMode.remove && f.isSomething(osm) && matcher.match(osm)) {
+                } else if (s.mode == SearchMode.remove && p.evaluate(osm) && matcher.match(osm)) {
                     sel.remove(osm);
                     ++foundMatches;
-                } else if (s.mode == SearchMode.in_selection &&  f.isSomething(osm)&& !matcher.match(osm)) {
+                } else if (s.mode == SearchMode.in_selection &&  p.evaluate(osm) && !matcher.match(osm)) {
                     sel.remove(osm);
                     ++foundMatches;
@@ -570 +567 @@
 
     public static void search(SearchSetting s) {
-        // FIXME: This is confusing. The GUI says nothing about loading primitives from an URL. We'd like to *search*
-        // for URLs in the current data set.
-        // Disabling until a better solution is in place
-        //
-        //        if (search.startsWith("http://") || search.startsWith("ftp://") || search.startsWith("https://")
-        //                || search.startsWith("file:/")) {
-        //            SelectionWebsiteLoader loader = new SelectionWebsiteLoader(search, mode);
-        //            if (loader.url != null && loader.url.getHost() != null) {
-        //                Main.worker.execute(loader);
-        //                return;
-        //            }
-        //        }
 
         final DataSet ds = Main.main.getCurrentDataSet();
         Collection<OsmPrimitive> sel = new HashSet<OsmPrimitive>(ds.getAllSelected());
-        int foundMatches = getSelection(s, sel, new Function(){
-            public Boolean isSomething(OsmPrimitive o){
+        int foundMatches = getSelection(s, sel, new Predicate<OsmPrimitive>(){
+            @Override
+            public boolean evaluate(OsmPrimitive o){
                 return ds.isSelected(o);
             }