Changeset 3303 in josm for trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

Timestamp:

2010-06-03T21:20:54+02:00 (14 years ago)

Author:

stoecker

Message:

catch all errors thrown from search (there are also out of array index and the like)

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) (2 diffs)

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

@@ -164 +164 @@
                 try {
                     this.keyPattern = Pattern.compile(key, searchFlags);
+                } catch (PatternSyntaxException e) {
+                    throw new ParseError(tr(rxErrorMsg, e.getPattern(), e.getIndex(), e.getMessage()));
+                } catch (Exception e) {
+                    throw new ParseError(tr(rxErrorMsg, key, tr("<unknown>"), e.getMessage()));
+                }
+                try {
                     this.valuePattern = Pattern.compile(value, searchFlags);
                 } catch (PatternSyntaxException e) {
                     throw new ParseError(tr(rxErrorMsg, e.getPattern(), e.getIndex(), e.getMessage()));
+                } catch (Exception e) {
+                    throw new ParseError(tr(rxErrorMsg, value, tr("<unknown>"), e.getMessage()));
                 }
                 this.key = key;
@@ -369 +377 @@
                 } catch (PatternSyntaxException e) {
                     throw new ParseError(tr(rxErrorMsg, e.getPattern(), e.getIndex(), e.getMessage()));
+                } catch (Exception e) {
+                    throw new ParseError(tr(rxErrorMsg, s, tr("<unknown>"), e.getMessage()));
                 }
                 this.search = s;