Changeset 33908 in osm for applications

Timestamp:

2017-11-25T02:05:51+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 13007

Location:

applications/editors/josm/plugins/tracer2

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/tracer2/TracerPlugin.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamList.java (modified) (2 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="see #josm11090"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12859"/>
+    <property name="plugin.main.version" value="13007"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerPlugin.java

@@ -24 +24 @@
         s_oPlugin = this;
 
-        File plugindir = new File(this.getPluginDir());
-        if (!plugindir.exists()) {
-            plugindir.mkdirs();
-        }
+        File plugindir = getPluginDirs().getUserDataDirectory(true);
 
         m_oParamList = new ServerParamList(new File(plugindir, "serverParam.cfg").getAbsolutePath());

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamList.java

@@ -8 +8 @@
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
@@ -46 +47 @@
         try (
                 InputStream oIP = getClass().getResourceAsStream("/resources/serverParam.cfg");
-                BufferedReader oReader = new BufferedReader(new InputStreamReader(oIP));
+                BufferedReader oReader = new BufferedReader(new InputStreamReader(oIP, StandardCharsets.UTF_8));
                 ) {
             StringBuilder oBuilder = new StringBuilder();