Changeset 11446 in josm for trunk/src/org

Timestamp:

2017-01-09T19:00:10+01:00 (8 years ago)

Author:

stoecker

Message:

add search option to find deleted objects (e.g. to purge them)

Location:

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

Files:

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

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

@@ -462 +462 @@
                 .addKeyword("new", "new ", tr("all new objects"))
                 .addKeyword("selected", "selected ", tr("all selected objects"))
-                .addKeyword("incomplete", "incomplete ", tr("all incomplete objects")),
+                .addKeyword("incomplete", "incomplete ", tr("all incomplete objects"))
+                .addKeyword("deleted", "deleted ", tr("all deleted objects (checkbox <b>{0}</b> must be enabled)", tr("all objects"))),
                 GBC.eol());
             right.add(new SearchKeywordRow(hcbSearchString)

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

@@ -112 +112 @@
     public class CoreSimpleMatchFactory implements SimpleMatchFactory {
         private final Collection<String> keywords = Arrays.asList("id", "version", "type", "user", "role",
-                "changeset", "nodes", "ways", "tags", "areasize", "waylength", "modified", "selected",
+                "changeset", "nodes", "ways", "tags", "areasize", "waylength", "modified", "deleted", "selected",
                 "incomplete", "untagged", "closed", "new", "indownloadedarea",
                 "allindownloadedarea", "inview", "allinview", "timestamp", "nth", "nth%", "hasRole");
@@ -121 +121 @@
             case "modified":
                 return new Modified();
+            case "deleted":
+                return new Deleted();
             case "selected":
                 return new Selected();
@@ -1256 +1258 @@
 
     /**
+     * Matches all objects that have been deleted
+     */
+    private static class Deleted extends Match {
+        @Override
+        public boolean match(OsmPrimitive osm) {
+            return osm.isDeleted();
+        }
+
+        @Override
+        public String toString() {
+            return "deleted";
+        }
+    }
+
+    /**
      * Matches all objects currently selected
      */