Changeset 2790 in josm

Timestamp:

2010-01-09T16:37:29+01:00 (15 years ago)

Author:

jttt

Message:

Fixed #4164 Searching for type:node blocked by system many minutes

File:

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

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

@@ -12 +12 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -201 +202 @@
     }
 
-    public static Integer getSelection(SearchSetting s, Collection<OsmPrimitive> sel, Function f) {
-        Integer foundMatches = 0;
+    public static int getSelection(SearchSetting s, Collection<OsmPrimitive> sel, Function f) {
+        int foundMatches = 0;
         try {
             String searchText = s.text;
@@ -211 +212 @@
             /*System.out.println(searchText);*/
             SearchCompiler.Match matcher = SearchCompiler.compile(searchText, s.caseSensitive, s.regexSearch);
-            foundMatches = 0;
+
+            if (s.mode == SearchMode.replace) {
+                sel.clear();
+            }
+
             for (OsmPrimitive osm : Main.main.getCurrentDataSet().allNonDeletedCompletePrimitives()) {
                 if (s.mode == SearchMode.replace) {
@@ -217 +222 @@
                         sel.add(osm);
                         ++foundMatches;
-                    } else {
-                        sel.remove(osm);
                     }
                 } else if (s.mode == SearchMode.add && !f.isSomething(osm) && matcher.match(osm)) {
@@ -262 +265 @@
 
         final DataSet ds = Main.main.getCurrentDataSet();
-        Collection<OsmPrimitive> sel = ds.getSelected();
+        Collection<OsmPrimitive> sel = new HashSet<OsmPrimitive>(ds.getSelected());
         int foundMatches = getSelection(s, sel, new Function(){
             public Boolean isSomething(OsmPrimitive o){