Changeset 3304 in josm

Timestamp:

Jun 3, 2010 9:29:39 PM (3 years ago)

Author:

stoecker

Message:

catch all errors thrown from search

File:

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

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

@@ -294 +294 @@
 
             if (regexp && key.length() > 0 && !key.equals("*")) {
-                keyPattern = Pattern.compile(key);
+                try {
+                    keyPattern = Pattern.compile(key, regexFlags(false));
+                } 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()));
+                }
             } else {
                 keyPattern = null;
@@ -300 +306 @@
             if (regexp && this.value.length() > 0 && !this.value.equals("*")) {
                 try {
-                    valuePattern = Pattern.compile(this.value);
+                    valuePattern = Pattern.compile(this.value, regexFlags(false));
                 } catch (PatternSyntaxException e) {
-                    throw new ParseError(tr("Pattern Syntax Error: Pattern {0} in {1} is illegal!", e.getPattern(), value));
+                    throw new ParseError(tr(rxErrorMsg, e.getPattern(), e.getIndex(), e.getMessage()));
+                } catch (Exception e) {
+                    throw new ParseError(tr(rxErrorMsg, value, tr("<unknown>"), e.getMessage()));
                 }
             } else {