Changeset 5162 in josm

Timestamp:

Apr 4, 2012 11:06:00 AM (14 months ago)

Author:

akks

Message:

Josm XML-JS configurator, see #4421: bugfixes, JS variables for directories and version

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/CustomConfigurator.java (modified) (5 diffs)
• gui/preferences/advanced/AdvancedPreference.java (modified) (1 diff)

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

@@ -228 +228 @@
         try {
             String toXML = Main.pref.toXML(true);
-            InputStream is = new ByteArrayInputStream(toXML.getBytes());
+            InputStream is = new ByteArrayInputStream(toXML.getBytes("UTF-8"));
             DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
             builderFactory.setValidating(false);
@@ -422 +422 @@
             try {
                 is = new BufferedInputStream(new FileInputStream(file));
+                String fileDir = file.getParentFile().getAbsolutePath();
+                if (fileDir!=null) engine.eval("scriptDir='"+normalizeDirName(fileDir) +"';");
                 DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
                 builderFactory.setValidating(false);
@@ -448 +450 @@
                 engine = new ScriptEngineManager().getEngineByName("rhino");
                 engine.eval("API={}; API.pref={}; API.fragments={};");
+                
+                engine.eval("homeDir='"+normalizeDirName(Main.pref.getPreferencesDir()) +"';");
+                engine.eval("josmVersion="+Version.getInstance().getVersion()+";");
                 String className =  CustomConfigurator.class.getName();
                 engine.eval("API.messageBox="+className+".messageBox");
@@ -679 +684 @@
          */
         private String evalVars(String s) {
-            Pattern p = Pattern.compile("\\$\\{(.*)\\}");
+            Pattern p = Pattern.compile("\\$\\{([^\\}]*)\\}");
             Matcher mr =  p.matcher(s);
             StringBuffer sb = new StringBuffer();
@@ -713 +718 @@
 
             return tmpPref;
+        }
+
+        private String normalizeDirName(String dir) {
+            String s = dir.replace("\\", "/");
+            if (s.endsWith("/")) s=s.substring(0,s.length()-1);
+            return s;
         }
 

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

@@ -304 +304 @@
             // plugins preference keys may be changed directly later, after plugins are downloaded
             // so we do not want to show it in the table as "changed" now
-            loaded.put("plugins", orig.get("plugins"));
+            Setting pluginSetting = orig.get("plugins");
+            if (pluginSetting!=null) {
+                loaded.put("plugins", pluginSetting);
+            }
         } else {
             loaded = orig;