Changeset 3317 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2010-06-08T15:42:33+02:00 (14 years ago)

Author:

stoecker

Message:

allow to search incomplete elements again

Location:

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

Files:

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

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

@@ -158 +158 @@
 
         JCheckBox caseSensitive = new JCheckBox(tr("case sensitive"), initialValues.caseSensitive);
+        JCheckBox allElements = new JCheckBox(tr("all objects"), initialValues.allElements);
+        allElements.setToolTipText(tr("Also include incomplete and deleted objects in search."));
         JCheckBox regexSearch   = new JCheckBox(tr("regular expression"), initialValues.regexSearch);
 
@@ -168 +170 @@
         left.add(in_selection, GBC.eop());
         left.add(caseSensitive, GBC.eol());
+        left.add(allElements, GBC.eol());
         left.add(regexSearch, GBC.eol());
 
@@ -231 +234 @@
         initialValues.mode = mode;
         initialValues.caseSensitive = caseSensitive.isSelected();
+        initialValues.allElements = allElements.isSelected();
         initialValues.regexSearch = regexSearch.isSelected();
         return initialValues;
@@ -277 +281 @@
             }
 
-            for (OsmPrimitive osm : Main.main.getCurrentDataSet().allNonDeletedCompletePrimitives()) {
+            Collection<OsmPrimitive> all;
+            if(s.allElements)
+                all = Main.main.getCurrentDataSet().allPrimitives();
+            else
+                all = Main.main.getCurrentDataSet().allNonDeletedCompletePrimitives();
+            for (OsmPrimitive osm : all) {
                 if (s.mode == SearchMode.replace) {
                     if (matcher.match(osm)) {
@@ -348 +357 @@
     }
 
-    public static void search(String search, SearchMode mode, boolean caseSensitive, boolean regexSearch) {
-        search(new SearchSetting(search, mode, caseSensitive, regexSearch));
+    public static void search(String search, SearchMode mode) {
+        search(new SearchSetting(search, mode, false, false, false));
     }
 
@@ -402 +411 @@
         public boolean caseSensitive;
         public boolean regexSearch;
+        public boolean allElements;
 
         public SearchSetting() {
-            this("", SearchMode.replace, false /* case insensitive */, false /* no regexp */);
-        }
-
-        public SearchSetting(String text, SearchMode mode, boolean caseSensitive, boolean regexSearch) {
+            this("", SearchMode.replace, false /* case insensitive */,
+            false /* no regexp */, false /* only useful primitives */);
+        }
+
+        public SearchSetting(String text, SearchMode mode, boolean caseSensitive,
+        boolean regexSearch, boolean allElements) {
             this.caseSensitive = caseSensitive;
             this.regexSearch = regexSearch;
+            this.allElements = allElements;
             this.mode = mode;
             this.text = text;
@@ -415 +428 @@
 
         public SearchSetting(SearchSetting original) {
-            this(original.text, original.mode, original.caseSensitive, original.regexSearch);
+            this(original.text, original.mode, original.caseSensitive,
+            original.regexSearch, original.allElements);
         }
 
@@ -422 +436 @@
             String cs = caseSensitive ?
                     /*case sensitive*/  trc("search", "CS") :
-                        /*case insensitive*/  trc("search", "CI");
-                    /*regex search*/
-                    String rx = regexSearch ? (", " + trc("search", "RX")) : "";
-                    return "\"" + text + "\" (" + cs + rx + ", " + mode + ")";
+                    /*case insensitive*/  trc("search", "CI");
+            String rx = regexSearch ? (", " +
+                    /*regex search*/ trc("search", "RX")) : "";
+            String all = allElements ? (", " +
+                    /*all elements*/ trc("search", "A")) : "";
+            return "\"" + text + "\" (" + cs + rx + all + ", " + mode + ")";
         }
 
@@ -435 +451 @@
             return (o.caseSensitive == this.caseSensitive
                     && o.regexSearch == this.regexSearch
+                    && o.allElements == this.allElements
                     && o.mode.equals(this.mode)
                     && o.text.equals(this.text));
@@ -463 +480 @@
                 } else if (s.charAt(index) == 'R') {
                     result.regexSearch = true;
+                } else if (s.charAt(index) == 'A') {
+                    result.allElements = true;
                 } else if (s.charAt(index) == ' ') {
                     break;
@@ -493 +512 @@
                 result.append('R');
             }
+            if (allElements) {
+                result.append('A');
+            }
             result.append(' ');
             result.append(text);

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

@@ -583 +583 @@
     private static class Untagged extends Match {
         @Override public boolean match(OsmPrimitive osm) {
-            return !osm.isTagged();
+            return !osm.isTagged() && !osm.isIncomplete();
         }
         @Override public String toString() {return "untagged";}