Changeset 13331 in josm

Timestamp:

2018-01-16T00:28:24+01:00 (7 years ago)

Author:

Don-vip

Message:

see #14097, see #15783 - robustness to situations where JavaScript engine cannot be retrieved, for whatever reason

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/OpeningHourTest.java (modified) (3 diffs)
• gui/download/OverpassQueryWizardDialog.java (modified) (2 diffs)
• gui/io/CustomConfigurator.java (modified) (2 diffs)
• tools/OverpassTurboQueryWizard.java (modified) (4 diffs)
• tools/Utils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

@@ -12 +12 @@
 import javax.script.Invocable;
 import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
@@ -23 +22 @@
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -36 +36 @@
      * Javascript engine
      */
-    public static final ScriptEngine ENGINE = new ScriptEngineManager(null).getEngineByName("JavaScript");
+    public static final ScriptEngine ENGINE = Utils.getJavaScriptEngine();
 
     /**

trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java

@@ -144 +144 @@
     private Optional<String> tryParseSearchTerm(String searchTerm) {
         try {
-            String query = this.overpassQueryBuilder.constructQuery(searchTerm);
-
-            return Optional.of(query);
-        } catch (UncheckedParseException ex) {
+            return Optional.of(overpassQueryBuilder.constructQuery(searchTerm));
+        } catch (UncheckedParseException | IllegalStateException ex) {
             Logging.error(ex);
             JOptionPane.showMessageDialog(
@@ -158 +156 @@
                     JOptionPane.ERROR_MESSAGE
             );
-
             return Optional.empty();
         }

trunk/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java

@@ -26 +26 @@
 
 import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import javax.swing.JOptionPane;
@@ -421 +420 @@
                 this.mainPrefs = mainPrefs;
                 PreferencesUtils.resetLog();
-                engine = new ScriptEngineManager(null).getEngineByName("JavaScript");
+                engine = Utils.getJavaScriptEngine();
+                if (engine == null) {
+                    throw new ScriptException("Failed to retrieve JavaScript engine");
+                }
                 engine.eval("API={}; API.pref={}; API.fragments={};");
 

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

@@ -7 +7 @@
 import javax.script.Invocable;
 import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
@@ -22 +21 @@
 
     private static OverpassTurboQueryWizard instance;
-    private final ScriptEngine engine = new ScriptEngineManager(null).getEngineByName("JavaScript");
+    private final ScriptEngine engine = Utils.getJavaScriptEngine();
 
     /**
@@ -37 +36 @@
 
     private OverpassTurboQueryWizard() {
-        if (engine == null) {
-            throw new IllegalStateException("Failed to retrieve JavaScript engine");
-        }
         try (CachedFile file = new CachedFile("resource://data/overpass-wizard.js");
              Reader reader = file.getContentReader()) {
-            engine.eval("var console = {error: " + Logging.class.getCanonicalName() + ".warn};");
-            engine.eval("var global = {};");
-            engine.eval(reader);
-            engine.eval("var overpassWizard = function(query) {" +
-                    "  return global.overpassWizard(query, {" +
-                    "    comment: false," +
-                    "    outputFormat: 'xml'," +
-                    "    outputMode: 'recursive_meta'" +
-                    "  });" +
-                    "}");
+            if (engine != null) {
+                engine.eval("var console = {error: " + Logging.class.getCanonicalName() + ".warn};");
+                engine.eval("var global = {};");
+                engine.eval(reader);
+                engine.eval("var overpassWizard = function(query) {" +
+                        "  return global.overpassWizard(query, {" +
+                        "    comment: false," +
+                        "    outputFormat: 'xml'," +
+                        "    outputMode: 'recursive_meta'" +
+                        "  });" +
+                        "}");
+            }
         } catch (ScriptException | IOException ex) {
             throw new IllegalStateException("Failed to initialize OverpassTurboQueryWizard", ex);
@@ -64 +62 @@
      */
     public String constructQuery(String search) {
+        if (engine == null) {
+            throw new IllegalStateException("Failed to retrieve JavaScript engine");
+        }
         try {
             final Object result = ((Invocable) engine).invokeFunction("overpassWizard", search);

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

@@ -61 +61 @@
 import java.util.zip.ZipFile;
 
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
@@ -1720 +1722 @@
     }
 
+    /**
+     * Returns JRE JavaScript Engine (Nashorn by default), if any.
+     * Catches and logs SecurityException and return null in case of error.
+     * @return JavaScript Engine, or null.
+     * @since 13301
+     */
+    public static ScriptEngine getJavaScriptEngine() {
+        try {
+            return new ScriptEngineManager(null).getEngineByName("JavaScript");
+        } catch (SecurityException e) {
+            Logging.error(e);
+            return null;
+        }
+    }
 }