Changeset 32941 in osm for applications/editors/josm

Timestamp:

2016-09-07T23:37:53+02:00 (8 years ago)

Author:

donvip

Message:

code cleanup

File:

• applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/action/OpenLinkAction.java (modified) (6 diffs)

applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/action/OpenLinkAction.java

@@ -19 +19 @@
 
 import java.awt.event.ActionEvent;
-import java.io.FileOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 
 import org.openstreetmap.josm.Main;
@@ -32 +31 @@
 import org.openstreetmap.josm.plugins.tag2link.data.Link;
 import org.openstreetmap.josm.plugins.tag2link.data.LinkPost;
+import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.OpenBrowser;
 
@@ -37 +37 @@
  * Action allowing to open a general link.
  * @author Don-vip
- *
  */
 @SuppressWarnings("serial")
@@ -58 +57 @@
             try {
                 LinkPost lp = (LinkPost) link;
-                System.out.println("Sending POST request to "+lp.url);
-                HttpURLConnection conn = (HttpURLConnection) new URL(lp.url).openConnection();
-                conn.setDoOutput(true);
-                conn.setRequestMethod("POST");
-                for (String header : lp.headers.keySet()) {
-                    conn.setRequestProperty(header, lp.headers.get(header));
-                }
                 String data = "";
                 for (String param : lp.params.keySet()) {
@@ -72 +64 @@
                     data += param+"="+lp.params.get(param);
                 }
-                try (OutputStreamWriter osw = new OutputStreamWriter(conn.getOutputStream())) {
-                    osw.write(data);
-                    osw.flush();
-                }
                 
                 String filename = "output.pdf";// FIXME: should work for PDF files only (not even tested)
-                try (FileOutputStream fos = new FileOutputStream(filename);
-                     InputStream is = conn.getInputStream()) {
-                    byte[] buffer = new byte[2048];
-                    int n = -1;
-                    while ((n = is.read(buffer)) > -1) {
-                        fos.write(buffer, 0, n);
-                    }
+                try (InputStream is = HttpClient.create(new URL(lp.url), "POST").setHeaders(lp.headers)
+                        .setRequestBody(data.getBytes(StandardCharsets.UTF_8)).connect().getContent()) {
+                    Files.copy(is, new File(filename).toPath());
                 }
                 
@@ -92 +76 @@
                     Main.error(result);
                 }
-                
-            } catch (MalformedURLException ex) {
-                Main.error(ex);
             } catch (IOException ex) {
                 Main.error(ex);