cleaned up old uploader code

mlni · Nov 30, 2010 · 12ace0c · 12ace0c
1 parent 1c80348
commit 12ace0c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 64 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/ee/mattijagula/mikker/upload/Uploader.java b/src/ee/mattijagula/mikker/upload/Uploader.java
@@ -10,11 +10,8 @@
 import org.apache.commons.httpclient.methods.multipart.PartSource;
 
 import java.io.ByteArrayInputStream;
-import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
 
 public class Uploader {
     private static final String BOUNDARY = "----WebKitFormBoundary8NHXoPOgtdmTKB7e";
@@ -37,7 +34,6 @@ private void doUpload(final byte content[], ProgressListener progressListener)
             throws IOException, UploadFailedException {
         HttpClient client = new HttpClient();
 
-        // PostMethod post = new PostMethod("http://localhost/~matti/recorder/upload.php");
         PostMethod post = new PostMethod(ctx.getUploadUrl());
 
         post.addRequestHeader("User-Agent", ctx.getUserAgent());
@@ -78,56 +74,4 @@ public InputStream createInputStream() throws IOException {
             throw new UploadFailedException("Upload failed with code " + HttpStatus.getStatusText(status));
         }
     }
-
-    public void upload_old(byte content[]) throws IOException {
-        URL url = new URL(ctx.getUploadUrl());
-        HttpURLConnection theUrlConnection = (HttpURLConnection) url.openConnection();
-        theUrlConnection.setRequestMethod("POST");
-        theUrlConnection.setDoOutput(true);
-        theUrlConnection.setDoInput(true);
-        theUrlConnection.setUseCaches(false);
-
-        theUrlConnection.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + BOUNDARY);
-        if (!"".equals(ctx.getCookies()))
-            theUrlConnection.setRequestProperty("Cookie", ctx.getCookies());
-        theUrlConnection.setRequestProperty("User-Agent", ctx.getUserAgent());
-
-        DataOutputStream httpOut = new DataOutputStream(theUrlConnection.getOutputStream());
-
-        String str = "--" + BOUNDARY + "\r\n"
-                   + "Content-Disposition: form-data; name=\"" + ctx.getFileFieldName() + "\"; filename=\"" + ctx.getUploadFilename() + "\"\r\n"
-                   + "Content-Type: " + ctx.getUploadMimeType() + "\r\n"
-                   + "\r\n";
-
-        httpOut.write(str.getBytes());
-
-        httpOut.write(content);
-
-        KeyValuePairParser.Pair postParameters[] = ctx.getAdditionalPostParameters();
-        for (KeyValuePairParser.Pair pair : postParameters) {
-            String name = pair.key;
-            String value = pair.value;
-            httpOut.write(("\r\n--" + BOUNDARY + "\r\n").getBytes());
-            httpOut.write(("Content-Disposition: form-data; name=\""+ name +"\"\r\n" +
-                    "\r\n").getBytes());
-            httpOut.write(value.getBytes());
-        }
-
-        // last one gets extra hypens at the end
-        httpOut.write(("\r\n--" + BOUNDARY + "--\r\n").getBytes());
-
-        httpOut.flush();
-        httpOut.close();
-
-        // read & parse the response
-        InputStream is = theUrlConnection.getInputStream();
-        StringBuilder response = new StringBuilder();
-        byte[] respBuffer = new byte[4096];
-        int len;
-        while ((len = is.read(respBuffer)) >= 0) {
-            response.append(new String(respBuffer, 0, len).trim());
-        }
-        is.close();
-        System.out.println(response.toString());
-    }
 }