Changeset 31869 in osm for applications/editors/josm/plugins

Timestamp:

2015-12-27T15:12:22+01:00 (9 years ago)

Author:

donvip

Message:

[josm_commandline] update to JOSM 9170

Location:

applications/editors/josm/plugins/CommandLine

Files:

• build.xml (modified) (1 diff)
• src/CommandLine/CommandLine.java (modified) (2 diffs)

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

@@ -4 +4 @@
     <property name="commit.message" value="JOSM/CommandLine: fix exception after JOSM update"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7687"/>
+    <property name="plugin.main.version" value="9170"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java

@@ -72 +72 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
@@ -278 +279 @@
                 String url = Main.pref.get("commandline.default.commands.url",
                                 "https://github.com/Foxhind/JOSM-CommandLine-commands/archive/master.zip");
-                try (ZipInputStream zis = new ZipInputStream(Utils.openURL(new URL(url)), StandardCharsets.UTF_8)) {
+                try (ZipInputStream zis = new ZipInputStream(HttpClient.create(new URL(url)).connect().getContent(), StandardCharsets.UTF_8)) {
                         File dir = new File(getPluginDir());
                         if (!dir.exists()) {