Changeset 4061 for branches

Timestamp:

Dec 7, 2010, 11:07:13 AM (13 years ago)

Author:

Gregory Vincic

Message:

Cleaning up source code

Location:

branches/gregorys

Files:

• build.xml (modified) (1 diff)
• src/pse/shared/Client.java (modified) (1 diff)
• src/pse/shared/Parts.java (modified) (2 diffs)

branches/gregorys/build.xml

@@ -91 +91 @@
            classpathref="classpath"
            debug="true"
-           deprecation="true">
+           deprecation="true"
+       includeantruntime="false">
       <compilerarg value="-Xlint:unchecked" />
     </javac>

branches/gregorys/src/pse/shared/Client.java

@@ -1 +1 @@
 /* 
-  Copyright (C) 2010 Gregory Vincic
-  License: http://www.gnu.org/licenses/gpl-3.0.txt
+    Copyright (C) 2010 Gregory Vincic
+    License: http://www.gnu.org/licenses/gpl-3.0.txt
 */
 package pse.shared;
 
+import java.io.*;
 import org.apache.commons.httpclient.*;
 import org.apache.commons.httpclient.methods.*;
 import org.apache.commons.httpclient.methods.multipart.*;
-import java.io.*;
 
 /**
- Wrapper for apaches HttpClient.
+    Wrapper for apaches HttpClient.
 */
 public class Client
 {
-
- /**
-  Sends a multipart POST request to the given url with the given parts as parameters.
-  @param url to send the request to
-  @param parts parameters to send
- */
- public InputStream post(String url, Parts parts) throws IOException
- {
-  PostMethod postMethod;
-    HttpClient httpClient;
-  MultipartRequestEntity entity;
-  Integer statusCode;
-  InputStream in;
-  
-  httpClient = new HttpClient();
-  postMethod = new PostMethod(url);
-  entity = new MultipartRequestEntity(parts.toArray(), postMethod.getParams());
-
-  postMethod.setRequestEntity(entity);
-  statusCode = httpClient.executeMethod(postMethod);
-  return postMethod.getResponseBodyAsStream();
- }
+    
+    /**
+        Sends a multipart POST request to the given url with the given parts as parameters.
+        @param url to send the request to
+        @param parts parameters to send
+    */
+    public InputStream post(String url, Parts parts) throws IOException
+    {
+        PostMethod postMethod;
+        HttpClient httpClient;
+        MultipartRequestEntity entity;
+        Integer statusCode;
+        InputStream in;
+          
+        httpClient = new HttpClient();
+        postMethod = new PostMethod(url);
+        entity = new MultipartRequestEntity(parts.toArray(), postMethod.getParams());
+        
+        postMethod.setRequestEntity(entity);
+        statusCode = httpClient.executeMethod(postMethod);
+        return postMethod.getResponseBodyAsStream();
+    }
 }

branches/gregorys/src/pse/shared/Parts.java

@@ -1 +1 @@
 /* 
-  Copyright (C) 2010 Gregory Vincic
-  License: http://www.gnu.org/licenses/gpl-3.0.txt
+    Copyright (C) 2010 Gregory Vincic
+    License: http://www.gnu.org/licenses/gpl-3.0.txt
 */
 package pse.shared;
@@ -7 +7 @@
 import java.io.File;
 import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.ArrayList;
-import java.net.URI;
+import org.apache.commons.httpclient.*;
 import org.apache.commons.httpclient.methods.multipart.*;
-import org.apache.commons.httpclient.*;
 
 /**
- Parts are parameters send with the httpclient. 
+    Parts are parameters send with the httpclient. 
 */
 public class Parts extends ArrayList<Part>
 {
- public Parts(int size)
- {
-  super(size);
- }
-
-
- public void add(String name, String value)
- {
-  Part part;
-  part = new StringPart(name, value);
-  this.add(part);
- }
-
-
- public void add(String name, List<String> value)
- {
-  Part part;
-  for(String v : value)
-  {
-   part = new StringPart(name, v);
-   this.add(part);
-  }
- }
-
-
- public void add(String name, URI uri) throws IOException
- {
-  File file;
-  FilePartSource source;
-  FilePart part;
-
-  file = new File(uri);
-  source = new FilePartSource(file);
-  part = new FilePart(name, source);
-  this.add(part);
- }
-
-
- public Part[] toArray()
- {
-  Part[] list;
-  list = new Part[this.size()];
-  for(int i = 0; i < this.size(); i++)
-  {
-   list[i] = this.get(i);
-  }
-  return list;
- }
+    public Parts(int size)
+    {
+        super(size);
+    }
+    
+    public void add(String name, String value)
+    {
+        Part part;
+        part = new StringPart(name, value);
+        this.add(part);
+    }
+    
+    public void add(String name, List<String> value)
+    {
+        Part part;
+        for(String v : value)
+        {
+            part = new StringPart(name, v);
+            this.add(part);
+        }
+    }
+    
+    public void add(String name, URI uri) throws IOException
+    {
+        File file;
+        FilePartSource source;
+        FilePart part;
+        
+        file = new File(uri);
+        source = new FilePartSource(file);
+        part = new FilePart(name, source);
+        this.add(part);
+    }
+    
+    public Part[] toArray()
+    {
+        Part[] list;
+        list = new Part[this.size()];
+        for(int i = 0; i < this.size(); i++)
+        {
+            list[i] = this.get(i);
+        }
+        return list;
+    }
 }