Changeset 29736 in osm for applications/editors/josm/plugins/openstreetbugs/src/org

Timestamp:

2013-07-02T23:50:50+02:00 (12 years ago)

Author:

donvip

Message:

[josm_openstreetbugs] code cleanup before even thinking about bringing it into core for future notes support

Location:

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb

Files:

• OsbPlugin.java (modified) (1 diff)
• api/CloseAction.java (modified) (1 diff)
• api/DownloadAction.java (modified) (1 diff)
• api/EditAction.java (modified) (1 diff)
• api/NewAction.java (modified) (1 diff)
• api/util/HttpResponse.java (deleted)
• api/util/HttpUtils.java (modified) (5 diffs)
• gui/dialogs/TextInputDialog.java (modified) (2 diffs)

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java

@@ -273 +273 @@
     }
 
-    public void setLayer(OsbLayer layer) {
-        this.layer = layer;
-    }
-
     public DataSet getDataSet() {
         return dataSet;
     }
 
-    public void setDataSet(DataSet dataSet) {
-        this.dataSet = dataSet;
-    }
-
     public OsbDialog getDialog() {
         return dialog;

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java

@@ -54 +54 @@
             result = "ok";
         } else {
-            result = HttpUtils.post(uri, null, post, CHARSET);
+            result = HttpUtils.post(uri, post, CHARSET);
         }
 

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/DownloadAction.java

@@ -64 +64 @@
 
         // download the data
-        String content = HttpUtils.get(uri, null, CHARSET);
+        String content = HttpUtils.get(uri, CHARSET);
 
         // clear dataset

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java

@@ -57 +57 @@
             result = "ok";
         } else {
-            result = HttpUtils.post(uri, null, post, CHARSET);
+            result = HttpUtils.post(uri, post, CHARSET);
         }
 

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java

@@ -65 +65 @@
             result = "ok 12345";
         } else {
-            result = HttpUtils.post(uri, null, post, CHARSET);
+            result = HttpUtils.post(uri, post, CHARSET);
         }
 

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java

@@ -28 +28 @@
 package org.openstreetmap.josm.plugins.osb.api.util;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -36 +34 @@
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
+
+import org.openstreetmap.josm.tools.Utils;
 
 public class HttpUtils {
-    public static String get(String url, Map<String, String> headers, String charset) throws IOException {
-        URL page = new URL(url);
-        URLConnection con = page.openConnection();
-        if(headers != null) {
-            for (Iterator<Entry<String,String>> iterator = headers.entrySet().iterator(); iterator.hasNext();) {
-                Entry<String, String> entry = iterator.next();
-                con.setRequestProperty(entry.getKey(), entry.getValue());
-            }
-        }
-
+    public static String get(String url, String charset) throws IOException {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         int length = -1;
         byte[] b = new byte[1024];
-        InputStream in = con.getInputStream();
+        InputStream in = Utils.openURL(new URL(url));
         while( (length = in.read(b)) > 0 ) {
             bos.write(b, 0, length);
         }
+        Utils.close(in);
 
         return new String(bos.toByteArray(), charset);
-    }
-
-    public static HttpResponse getResponse(String url, Map<String, String> headers, String charset) throws IOException {
-        URL page = new URL(url);
-        URLConnection con = page.openConnection();
-        if(headers != null) {
-            for (Iterator<Entry<String,String>> iterator = headers.entrySet().iterator(); iterator.hasNext();) {
-                Entry<String, String> entry = iterator.next();
-                con.setRequestProperty(entry.getKey(), entry.getValue());
-            }
-        }
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        int length = -1;
-        byte[] b = new byte[1024];
-        InputStream in = con.getInputStream();
-        while( (length = in.read(b)) > 0 ) {
-            bos.write(b, 0, length);
-        }
-
-        HttpResponse response = new HttpResponse(new String(bos.toByteArray(), charset), con.getHeaderFields());
-        return response;
     }
 
@@ -88 +54 @@
      *
      * @param url
-     * @param headers
      * @param content the post body
      * @param responseCharset the expected charset of the response
@@ -94 +59 @@
      * @throws IOException
      */
-    public static String post(String url, Map<String, String> headers, String content, String responseCharset) throws IOException {
+    public static String post(String url, String content, String responseCharset) throws IOException {
         // initialize the connection
         URL page = new URL(url);
         URLConnection con = page.openConnection();
         con.setDoOutput(true);
-        if(headers != null) {
-            for (Iterator<Entry<String,String>> iterator = headers.entrySet().iterator(); iterator.hasNext();) {
-                Entry<String, String> entry = iterator.next();
-                con.setRequestProperty(entry.getKey(), entry.getValue());
-            }
-        }
 
         //send the post
@@ -119 +78 @@
             bos.write(b, 0, length);
         }
+        Utils.close(in);
+        Utils.close(os);
 
         return new String(bos.toByteArray(), responseCharset);
     }
-
-    /**
-     * Adds a parameter to a given URI
-     * @param uri
-     * @param param
-     * @param value
-     * @return
-     */
-    public static String addParameter(String uri, String param, String value) {
-        StringBuilder sb = new StringBuilder(uri);
-        if(uri.contains("?")) {
-            sb.append('&');
-        } else {
-            sb.append('?');
-        }
-
-        sb.append(param);
-        sb.append('=');
-        sb.append(value);
-
-        return sb.toString();
-    }
-
-    public static Map<String, List<String>> head(String url, Map<String, String> headers, String charset) throws IOException {
-        URL page = new URL(url);
-        URLConnection con = page.openConnection();
-        if(headers != null) {
-            for (Iterator<Entry<String,String>> iterator = headers.entrySet().iterator(); iterator.hasNext();) {
-                Entry<String, String> entry = iterator.next();
-                con.setRequestProperty(entry.getKey(), entry.getValue());
-            }
-        }
-
-        return con.getHeaderFields();
-    }
-
-    public static String getHeaderField(Map<String, List<String>> headers, String headerField) {
-        if(!headers.containsKey(headerField)) {
-            return null;
-        }
-
-        List<String> value = headers.get(headerField);
-        if(value.size() == 1) {
-            return value.get(0);
-        } else {
-            throw new RuntimeException(tr("Header contains several values and cannot be mapped to a single string"));
-        }
-    }
 }

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java

@@ -49 +49 @@
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
 
 import org.openstreetmap.josm.gui.widgets.ComboBoxHistory;
@@ -153 +154 @@
             }
         }
-        setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+        setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
     }