Changeset 34344 in osm for applications/editors

Timestamp:

2018-06-23T12:55:33+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 13910

Location:

applications/editors/josm/plugins/tracer2

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/tracer2/server/Request.java (modified) (3 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="13007"/>
+    <property name="plugin.main.version" value="13910"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/Request.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.ConnectException;
+import java.io.IOException;
 import java.net.URL;
 
@@ -12 +10 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.HttpClient;
 
 public class Request extends Thread {
@@ -27 +26 @@
     protected String callServer(String strUrl) {
         try {
-            URL oUrl = new URL(URL + strUrl);
-            BufferedReader oReader = new BufferedReader(new InputStreamReader(oUrl.openStream()));
-            StringBuilder oBuilder = new StringBuilder();
-            String strLine;
-            while ((strLine = oReader.readLine()) != null) {
-                oBuilder.append(strLine);
-            }
-            return oBuilder.toString();
-        } catch (ConnectException e) {
+            return HttpClient.create(new URL(URL + strUrl)).connect().fetchContent();
+        } catch (IOException e) {
             JOptionPane.showMessageDialog(Main.parent,
                     tr("Tracer2Server isn''t running. Please start the Server.\nIf you don''t have the server, please download it from\n{0}.",