Changeset 8131 in josm for trunk

Timestamp:

2015-03-09T23:37:29+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #11220 - Search within selection shows incorrect number of matches

File:

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

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

@@ -496 +496 @@
             if (s.mode == SearchMode.replace) {
                 sel.clear();
+            } else if (s.mode == SearchMode.in_selection) {
+                foundMatches = sel.size();
             }
 
@@ -504 +506 @@
                 all = Main.main.getCurrentDataSet().allNonDeletedCompletePrimitives();
             }
+
             for (OsmPrimitive osm : all) {
                 if (s.mode == SearchMode.replace) {
@@ -516 +519 @@
                     sel.remove(osm);
                     ++foundMatches;
-                } else if (s.mode == SearchMode.in_selection &&  p.evaluate(osm) && !matcher.match(osm)) {
+                } else if (s.mode == SearchMode.in_selection && p.evaluate(osm) && !matcher.match(osm)) {
                     sel.remove(osm);
-                    ++foundMatches;
+                    --foundMatches;
                 }
             }