Changeset 517 in josm for trunk/src

Timestamp:

2008-01-09T11:37:58+01:00 (16 years ago)

Author:

gebner

Message:

SearchCompiler: Report errors.

Location:

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

Files:

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

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

@@ -85 +85 @@
                 }
         }
-        Collection<OsmPrimitive> sel = Main.ds.getSelected();
-        SearchCompiler.Match matcher = SearchCompiler.compile(search, caseSensitive);
-        for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) {
-                if (mode == SearchMode.replace) {
-                        if (matcher.match(osm))
-                                sel.add(osm);
-                        else
-                                sel.remove(osm);
-                } else if (mode == SearchMode.add && !osm.selected && matcher.match(osm))
-                        sel.add(osm);
-                else if (mode == SearchMode.remove && osm.selected && matcher.match(osm))
-                        sel.remove(osm);
-        }
-        Main.ds.setSelected(sel);
+                try {
+                        Collection<OsmPrimitive> sel = Main.ds.getSelected();
+                        SearchCompiler.Match matcher = SearchCompiler.compile(search, caseSensitive);
+                        for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) {
+                                if (mode == SearchMode.replace) {
+                                        if (matcher.match(osm))
+                                                sel.add(osm);
+                                        else
+                                                sel.remove(osm);
+                                } else if (mode == SearchMode.add && !osm.selected && matcher.match(osm))
+                                        sel.add(osm);
+                                else if (mode == SearchMode.remove && osm.selected && matcher.match(osm))
+                                        sel.remove(osm);
+                        }
+                        Main.ds.setSelected(sel);
+                } catch (SearchCompiler.ParseError e) {
+                        JOptionPane.showMessageDialog(Main.parent, e.getMessage());
+                }
     }
 }

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

@@ -165 +165 @@
                 @Override public String toString() {return "incomplete";}
         }
+
+        public static class ParseError extends Exception {
+                public ParseError(String msg) {
+                        super(msg);
+                }
+        }
         
-        public static Match compile(String searchStr, boolean caseSensitive) {
+        public static Match compile(String searchStr, boolean caseSensitive)
+                        throws ParseError {
                 return new SearchCompiler(caseSensitive,
                                 new PushbackTokenizer(
@@ -173 +180 @@
         }
 
-        public Match parse() {
+        public Match parse() throws ParseError {
                 Match m = parseJuxta();
                 if (!tokenizer.readIfEqual(null)) {
-                        throw new RuntimeException("Unexpected token: " + tokenizer.nextToken());
+                        throw new ParseError("Unexpected token: " + tokenizer.nextToken());
                 }
                 return m;
         }
 
-        private Match parseJuxta() {
+        private Match parseJuxta() throws ParseError {
                 Match juxta = new Always();
 
@@ -192 +199 @@
         }
 
-        private Match parseOr() {
+        private Match parseOr() throws ParseError {
                 Match a = parseNot();
                 if (tokenizer.readIfEqual("|")) {
                         Match b = parseNot();
                         if (a == null || b == null) {
-                                throw new RuntimeException("Missing arguments for or.");
+                                throw new ParseError("Missing arguments for or.");
                         }
                         return new Or(a, b);
@@ -204 +211 @@
         }
 
-        private Match parseNot() {
+        private Match parseNot() throws ParseError {
                 if (tokenizer.readIfEqual("-")) {
                         Match m = parseParens();
                         if (m == null) {
-                                throw new RuntimeException("Missing argument for not.");
+                                throw new ParseError("Missing argument for not.");
                         }
                         return new Not(m);
@@ -215 +222 @@
         }
 
-        private Match parseParens() {
+        private Match parseParens() throws ParseError {
                 if (tokenizer.readIfEqual("(")) {
                         Match m = parseJuxta();
                         if (!tokenizer.readIfEqual(")")) {
-                                throw new RuntimeException("Expected closing paren");
+                                throw new ParseError("Expected closing paren");
                         }
                         return m;