Changeset 1814 in josm for trunk/src/org/openstreetmap/josm/actions/search

Timestamp:

2009-07-19T19:04:49+02:00 (15 years ago)

Author:

Gubaer

Message:

removed dependencies to Main.ds, removed Main.ds
removed AddVisitor, NameVisitor, DeleteVisitor - unnecessary double dispatching for these simple cases

Location:

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

Files:

• SearchAction.java (modified) (3 diffs)
• SearchCompiler.java (modified) (19 diffs)
• SelectionWebsiteLoader.java (modified) (3 diffs)

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

@@ -164 +164 @@
         }
         try {
-            Collection<OsmPrimitive> sel = Main.ds.getSelected();
+            Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
             SearchCompiler.Match matcher = SearchCompiler.compile(search, caseSensitive, regexSearch);
             int foundMatches = 0;
-            for (OsmPrimitive osm : Main.ds.allNonDeletedCompletePrimitives()) {
+            for (OsmPrimitive osm : Main.main.getCurrentDataSet().allNonDeletedCompletePrimitives()) {
                 if (mode == SearchMode.replace) {
                     if (matcher.match(osm)) {
@@ -183 +183 @@
                 }
             }
-            Main.ds.setSelected(sel);
+            Main.main.getCurrentDataSet().setSelected(sel);
             if (foundMatches == 0) {
                 String msg = null;
@@ -241 +241 @@
      */
     protected void refreshEnabled() {
-        setEnabled(Main.map != null
-                && Main.map.mapView !=null
-                && Main.map.mapView.getEditLayer() != null
-        );
+        setEnabled(getEditLayer() != null);
     }
 

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

@@ -133 +133 @@
                 String value = null;
 
-                if (key.equals("timestamp"))
+                if (key.equals("timestamp")) {
                     value = DateUtils.fromDate(osm.getTimestamp());
-                else
+                } else {
                     value = osm.get(key);
+                }
 
                 if (value == null)
@@ -169 +170 @@
 
         public ExactKeyValue(boolean regexp, String key, String value) throws ParseError {
-            if (key == "") {
+            if (key == "")
                 throw new ParseError(tr("Key cannot be empty when tag operator is used. Sample use: key=value"));
-            }
             this.key = key;
             this.value = value;
@@ -223 +223 @@
         public boolean match(OsmPrimitive osm) throws ParseError {
 
-            if (osm.keys == null || osm.keys.isEmpty()) {
+            if (osm.keys == null || osm.keys.isEmpty())
                 return mode == Mode.NONE;
-            }
 
             switch (mode) {
@@ -238 +237 @@
             case ANY_KEY:
                 for (String v:osm.keys.values()) {
-                    if (v.equals(value)) {
+                    if (v.equals(value))
                         return true;
-                    }
                 }
                 return false;
@@ -247 +245 @@
             case ANY_KEY_REGEXP:
                 for (String v:osm.keys.values()) {
-                    if (valuePattern.matcher(v).matches()) {
+                    if (valuePattern.matcher(v).matches())
                         return true;
-                    }
                 }
                 return false;
@@ -257 +254 @@
                     if (keyPattern.matcher(entry.getKey()).matches()) {
                         if (mode == Mode.ANY_VALUE_REGEXP
-                                || valuePattern.matcher(entry.getValue()).matches()) {
+                                || valuePattern.matcher(entry.getValue()).matches())
                             return true;
-                        }
                     }
                 }
@@ -265 +261 @@
             case MISSING_KEY_REGEXP:
                 for (String k:osm.keys.keySet()) {
-                    if (keyPattern.matcher(k).matches()) {
+                    if (keyPattern.matcher(k).matches())
                         return false;
-                    }
                 }
                 return true;
@@ -337 +332 @@
                 // is not Java 1.5
                 //String name = java.text.Normalizer.normalize(name, java.text.Normalizer.Form.NFC);
-                if (!caseSensitive)
+                if (!caseSensitive) {
                     name = name.toLowerCase();
+                }
                 if (name.indexOf(search) != -1)
                     return true;
@@ -356 +352 @@
             } else if ("relation".equals(type)) {
                 this.type = Relation.class;
-            } else {
+            } else
                 throw new ParseError(tr("Unknown primitive type: {0}. Allowed values are node, way or relation",
                         type));
-            }
         }
         @Override public boolean match(OsmPrimitive osm) {
@@ -441 +436 @@
             // "parent" (null) should mean the same as "parent()"
             // (Always). I.e. match everything
-            if (child == null)
+            if (child == null) {
                 child = new Always();
+            }
 
             if (osm instanceof Way) {
-                for (Node n : ((Way)osm).nodes)
+                for (Node n : ((Way)osm).nodes) {
                     isParent |= child.match(n);
+                }
             } else if (osm instanceof Relation) {
                 for (RelationMember member : ((Relation)osm).members) {
-                    if (member.member != null)
+                    if (member.member != null) {
                         isParent |= child.match(member.member);
+                    }
                 }
             }
@@ -464 +462 @@
             // "child" (null) should mean the same as "child()"
             // (Always). I.e. match everything
-            if (parent == null)
+            if (parent == null) {
                 parent = new Always();
+            }
 
             boolean isChild = false;
-            CollectBackReferencesVisitor backRefs = new CollectBackReferencesVisitor(Main.ds);
+            CollectBackReferencesVisitor backRefs = new CollectBackReferencesVisitor(Main.main.getCurrentDataSet());
             osm.visit(backRefs);
             for (OsmPrimitive p : backRefs.data) {
@@ -485 +484 @@
 
     public static Match compile(String searchStr, boolean caseSensitive, boolean regexSearch)
-            throws ParseError {
+    throws ParseError {
         return new SearchCompiler(caseSensitive, regexSearch,
                 new PushbackTokenizer(
-                    new PushbackReader(new StringReader(searchStr))))
-            .parse();
+                        new PushbackReader(new StringReader(searchStr))))
+        .parse();
     }
 
     public Match parse() throws ParseError {
         Match m = parseJuxta();
-        if (!tokenizer.readIfEqual(null)) {
+        if (!tokenizer.readIfEqual(null))
             throw new ParseError(tr("Unexpected token: {0}", tokenizer.nextToken()));
-        }
         return m;
     }
@@ -515 +513 @@
         if (tokenizer.readIfEqual("|")) {
             Match b = parseNot();
-            if (a == null || b == null) {
+            if (a == null || b == null)
                 throw new ParseError(tr("Missing arguments for or."));
-            }
             return new Or(a, b);
         }
@@ -526 +523 @@
         if (tokenizer.readIfEqual("-")) {
             Match m = parseParens();
-            if (m == null) {
+            if (m == null)
                 throw new ParseError(tr("Missing argument for not."));
-            }
             return new Not(m);
         }
@@ -537 +533 @@
         if (tokenizer.readIfEqual("(")) {
             Match m = parseJuxta();
-            if (!tokenizer.readIfEqual(")")) {
+            if (!tokenizer.readIfEqual(")"))
                 throw new ParseError(tr("Expected closing parenthesis."));
-            }
             return m;
         }
@@ -550 +545 @@
         if (tokenizer.readIfEqual(":")) {
             String tok2 = tokenizer.readText();
-            if (tok == null) tok = "";
-            if (tok2 == null) tok2 = "";
+            if (tok == null) {
+                tok = "";
+            }
+            if (tok2 == null) {
+                tok2 = "";
+            }
             return parseKV(tok, tok2);
         }
@@ -557 +556 @@
         if (tokenizer.readIfEqual("=")) {
             String tok2 = tokenizer.readText();
-            if (tok == null) tok = "";
-            if (tok2 == null) tok2 = "";
+            if (tok == null) {
+                tok = "";
+            }
+            if (tok2 == null) {
+                tok2 = "";
+            }
             return new ExactKeyValue(regexSearch, tok, tok2);
         }
 
-        if (tok == null) {
+        if (tok == null)
             return null;
-        } else if (tok.equals("modified")) {
+        else if (tok.equals("modified"))
             return new Modified();
-        } else if (tok.equals("incomplete")) {
+        else if (tok.equals("incomplete"))
             return new Incomplete();
-        } else if (tok.equals("untagged")) {
+        else if (tok.equals("untagged"))
             return new Untagged();
-        } else if (tok.equals("selected")) {
+        else if (tok.equals("selected"))
             return new Selected();
-        } else if (tok.equals("child")) {
+        else if (tok.equals("child"))
             return new Child(parseParens());
-        } else if (tok.equals("parent")) {
+        else if (tok.equals("parent"))
             return new Parent(parseParens());
-        } else {
+        else
             return new Any(tok);
-        }
     }
 
     private Match parseKV(String key, String value) throws ParseError {
-        if (key.equals("type")) {
+        if (key.equals("type"))
             return new ExactType(value);
-        } else if (key.equals("user")) {
+        else if (key.equals("user"))
             return new UserMatch(value);
-        } else if (key.equals("nodes")) {
+        else if (key.equals("nodes")) {
             try {
                 String[] range = value.split("-");
-                if (range.length == 1) {
+                if (range.length == 1)
                     return new NodeCount(Integer.parseInt(value));
-                } else if (range.length == 2) {
+                else if (range.length == 2)
                     return new NodeCountRange(Integer.parseInt(range[0]), Integer.parseInt(range[1]));
-                } else {
+                else
                     throw new ParseError(tr("Wrong number of parameters for nodes operator."));
-                }
             } catch (NumberFormatException e) {
                 throw new ParseError(tr("Incorrect value of nodes operator: {0}. Nodes operator expects number of nodes or range, for example nodes:10-20", value));
@@ -606 +607 @@
                 throw new ParseError(tr("Incorrect value of id operator: {0}. Number is expected.", value));
             }
-        } else {
+        } else
             return new KeyValue(key, value);
-        }
     }
 
@@ -627 +627 @@
         // insensitively, but the OSM data is in Unicode. With
         // UNICODE_CASE casefolding is made Unicode-aware.
-        if (!caseSensitive)
+        if (!caseSensitive) {
             searchFlags |= (Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+        }
 
         return searchFlags;

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

@@ -40 +40 @@
     @Override protected void realRun() {
         progressMonitor.setTicksCount(2);
-        sel = mode != SearchAction.SearchMode.remove ? new LinkedList<OsmPrimitive>() : Main.ds.allNonDeletedPrimitives();
+        sel = mode != SearchAction.SearchMode.remove ? new LinkedList<OsmPrimitive>() : Main.main.getCurrentDataSet().allNonDeletedPrimitives();
         try {
             URLConnection con = url.openConnection();
@@ -47 +47 @@
             progressMonitor.subTask(tr("Downloading..."));
             Map<Long, String> ids = idReader.parseIds(in);
-            for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) {
+            for (OsmPrimitive osm : Main.main.getCurrentDataSet().allNonDeletedPrimitives()) {
                 if (ids.containsKey(osm.id) && osm.getClass().getName().toLowerCase().endsWith(ids.get(osm.id))) {
                     if (mode == SearchAction.SearchMode.remove) {
@@ -86 +86 @@
     @Override protected void finish() {
         if (sel != null) {
-            Main.ds.setSelected(sel);
+            Main.main.getCurrentDataSet().setSelected(sel);
         }
     }