Changeset 10101 in josm for trunk/src/org

Timestamp:

2016-04-03T14:54:24+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #12705 - catch scripting errors with Java 7 when building invalid overpass API queries

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OverpassDownloadAction.java (modified) (1 diff)
• tools/OverpassTurboQueryWizard.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java

@@ -159 +159 @@
                         overpassQuery.setText(OverpassTurboQueryWizard.getInstance().constructQuery(overpassWizardText));
                     } catch (UncheckedParseException ex) {
+                        Main.error(ex);
                         HelpAwareOptionPane.showOptionDialog(
                                 Main.parent,

trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java

@@ -62 +62 @@
      * @throws UncheckedParseException when the parsing fails
      */
-    public String constructQuery(String search) throws UncheckedParseException {
+    public String constructQuery(String search) {
         try {
             final Object result = ((Invocable) engine).invokeFunction("overpassWizard", search);
@@ -74 +74 @@
             throw new IllegalStateException(e);
         } catch (ScriptException e) {
-            throw new RuntimeException("Failed to execute OverpassTurboQueryWizard", e);
+            throw new UncheckedParseException("Failed to execute OverpassTurboQueryWizard", e);
         }
     }