Changeset 33889 in osm for applications

Timestamp:

2017-11-25T01:29:53+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 13007

Location:

applications/editors/josm/plugins/ext_tools

Files:

• build.xml (modified) (1 diff)
• src/ext_tools/ExtTool.java (modified) (3 diffs)
• src/ext_tools/ExtToolsPlugin.java (modified) (1 diff)

applications/editors/josm/plugins/ext_tools/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="ExtTools: help shortcut paser, rebuild"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12726"/>
+    <property name="plugin.main.version" value="13007"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/ext_tools/src/ext_tools/ExtTool.java

@@ -5 +5 @@
 import java.awt.Cursor;
 import java.awt.GridBagLayout;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -187 +187 @@
         ProcessBuilder builder;
         builder = new ProcessBuilder(cmdParams);
-        builder.directory(new File(ExtToolsPlugin.plugin.getPluginDir()));
+        builder.directory(ExtToolsPlugin.plugin.getPluginDirs().getUserDataDirectory(false));
 
         final StringBuilder debugstr = new StringBuilder();
@@ -219 +219 @@
                 while ((len = errStream.read(buffer)) > 0) {
                     synchronized (debugstr) {
-                        debugstr.append(new String(buffer, 0, len));
+                        debugstr.append(new String(buffer, 0, len, StandardCharsets.UTF_8));
                     }
                     System.err.write(buffer, 0, len);

applications/editors/josm/plugins/ext_tools/src/ext_tools/ExtToolsPlugin.java

@@ -21 +21 @@
         plugin = this;
 
-        File plugindir = new File(this.getPluginDir());
-        if (!plugindir.exists())
-            plugindir.mkdirs();
+        File plugindir = getPluginDirs().getUserDataDirectory(true);
 
         myTools = new ToolsInformation(new File(plugindir, "tools.cfg").getAbsolutePath());