Changeset 9524 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2016-01-18T01:46:48+01:00 (8 years ago)

Author:

Don-vip

Message:

CustomConfigurator - add unit test, javadoc, and use JavaScript engine instead of rhino, gone with Java 8 (replaced by Nashorn)

File:

• trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java

@@ -97 +97 @@
     }
 
+    /**
+     * Resets the log.
+     */
+    public static void resetLog() {
+        summary = new StringBuilder();
+    }
+
+    /**
+     * Read configuration script from XML file, modifying main preferences
+     * @param dir - directory
+     * @param fileName - XML file name
+     */
     public static void readXML(String dir, String fileName) {
         readXML(new File(dir, fileName));
@@ -474 +486 @@
             try {
                 this.mainPrefs = mainPrefs;
-                summary = new StringBuilder();
-                engine = new ScriptEngineManager().getEngineByName("rhino");
+                resetLog();
+                engine = new ScriptEngineManager().getEngineByName("JavaScript");
                 engine.eval("API={}; API.pref={}; API.fragments={};");
 
@@ -493 +505 @@
             } catch (Exception ex) {
                 log("Error: initializing script engine: "+ex.getMessage());
+                Main.error(ex);
             }
         }