Cleanup

Author: hannesa2

.idea/codeStyles/Project.xml

@@ -31,10 +31,6 @@ public abstract class PLFileDownloaderBase extends PLObjectBase implements PLIFi
     private Runnable mThreadRunnable;
     private PLFileDownloaderListener mListener;
 
-    public PLFileDownloaderBase() {
-        this(null, null);
-    }
-
     public PLFileDownloaderBase(String url) {
         this(url, null);
     }
@@ -98,22 +94,6 @@ public PLIFileDownloader setMaxAttempts(int maxAttemps) {
         return this;
     }
 
-    protected Thread getThread() {
-        return mThread;
-    }
-
-    protected void setThread(Thread thread) {
-        mThread = thread;
-    }
-
-    protected Runnable getThreadRunnable() {
-        return mThreadRunnable;
-    }
-
-    protected void setThreadRunnable(Runnable threadRunnable) {
-        mThreadRunnable = threadRunnable;
-    }
-
     @Override
     public PLFileDownloaderListener getListener() {
         return mListener;

library/src/main/java/com/panoramagl/downloaders/PLFileDownloaderBase.java

@@ -35,20 +35,11 @@
 import java.io.InputStream;
 
 public class PLHTTPFileDownloader extends PLFileDownloaderBase {
-    /**static code*/
 
     static {
         Protocol.registerProtocol("https", new Protocol("https", new EasySSLSocketFactory(), 443));
     }
 
-    /**
-     * init methods
-     */
-
-    public PLHTTPFileDownloader() {
-        super();
-    }
-
     public PLHTTPFileDownloader(String url) {
         super(url);
     }
@@ -98,7 +89,7 @@ protected byte[] downloadFile() {
             is = method.getResponseBodyAsStream();
             bas = new ByteArrayOutputStream();
             byte[] buffer = new byte[256];
-            int length = 0, total = 0;
+            int length, total = 0;
             // Read stream
             while ((length = is.read(buffer)) != -1) {
                 if (this.isRunning()) {

library/src/main/java/com/panoramagl/downloaders/PLHTTPFileDownloader.java

@@ -20,23 +20,16 @@
  */
 
 import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
-import org.apache.http.conn.ConnectTimeoutException;
-import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.params.HttpParams;
 
 import java.io.IOException;
 import java.net.InetAddress;
-import java.net.InetSocketAddress;
 import java.net.Socket;
-import java.net.UnknownHostException;
 
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocket;
 import javax.net.ssl.TrustManager;
 
 /**
- * This socket factory will create ssl socket that accepts self signed
- * certificate
+ * This socket factory will create ssl socket that accepts self signed certificate
  *
  * @author olamy
  * @version $Id: EasySSLSocketFactory.java 765355 2009-04-15 20:59:07Z evenisse
@@ -50,8 +43,7 @@ public class EasySSLSocketFactory implements ProtocolSocketFactory {
     private static SSLContext createEasySSLContext() throws IOException {
         try {
             SSLContext context = SSLContext.getInstance("TLS");
-            context.init(null, new TrustManager[]{new EasyX509TrustManager(
-                    null)}, null);
+            context.init(null, new TrustManager[]{new EasyX509TrustManager(null)}, null);
             return context;
         } catch (Throwable e) {
             throw new IOException(e.getMessage());
@@ -65,92 +57,33 @@ private SSLContext getSSLContext() throws IOException {
         return this.sslcontext;
     }
 
-    /**
-     * @see org.apache.http.conn.scheme.SocketFactory#connectSocket(Socket,
-     * String, int, InetAddress, int,
-     * HttpParams)
-     */
-    public Socket connectSocket(Socket sock, String host, int port,
-                                InetAddress localAddress, int localPort, HttpParams params)
-            throws IOException, UnknownHostException, ConnectTimeoutException {
-        int connTimeout = HttpConnectionParams.getConnectionTimeout(params);
-        int soTimeout = HttpConnectionParams.getSoTimeout(params);
-
-        InetSocketAddress remoteAddress = new InetSocketAddress(host, port);
-        SSLSocket sslsock = (SSLSocket) ((sock != null) ? sock : createSocket());
-
-        if ((localAddress != null) || (localPort > 0)) {
-            // we need to bind explicitly
-            if (localPort < 0) {
-                localPort = 0; // indicates "any"
-            }
-            InetSocketAddress isa = new InetSocketAddress(localAddress,
-                    localPort);
-            sslsock.bind(isa);
-        }
-
-        sslsock.connect(remoteAddress, connTimeout);
-        sslsock.setSoTimeout(soTimeout);
-        return sslsock;
-
-    }
-
-    /**
-     * @see org.apache.http.conn.scheme.SocketFactory#createSocket()
-     */
-    public Socket createSocket() throws IOException {
-        return getSSLContext().getSocketFactory().createSocket();
-    }
-
-    /**
-     * @see org.apache.http.conn.scheme.SocketFactory#isSecure(Socket)
-     */
-    public boolean isSecure(Socket socket) throws IllegalArgumentException {
-        return true;
-    }
-
-    /**
-     * @see org.apache.http.conn.scheme.LayeredSocketFactory#createSocket(Socket,
-     * String, int, boolean)
-     */
-    public Socket createSocket(Socket socket, String host, int port,
-                               boolean autoClose) throws IOException, UnknownHostException {
-        return getSSLContext().getSocketFactory().createSocket(socket, host, port, autoClose);
-    }
-
     // -------------------------------------------------------------------
     // javadoc in org.apache.http.conn.scheme.SocketFactory says :
     // Both Object.equals() and Object.hashCode() must be overridden
     // for the correct operation of some connection managers
     // -------------------------------------------------------------------
 
     public boolean equals(Object obj) {
-        return ((obj != null) && obj.getClass().equals(
-                EasySSLSocketFactory.class));
+        return ((obj != null) && obj.getClass().equals(EasySSLSocketFactory.class));
     }
 
     public int hashCode() {
         return EasySSLSocketFactory.class.hashCode();
     }
 
     @Override
-    public Socket createSocket(String arg0, int arg1) throws IOException,
-            UnknownHostException {
+    public Socket createSocket(String arg0, int arg1) throws IOException {
         return getSSLContext().getSocketFactory().createSocket(arg0, arg1);
     }
 
     @Override
-    public Socket createSocket(String arg0, int arg1, InetAddress arg2,
-                               int arg3) throws IOException, UnknownHostException {
+    public Socket createSocket(String arg0, int arg1, InetAddress arg2, int arg3) throws IOException {
         return getSSLContext().getSocketFactory().createSocket(arg0, arg1, arg2, arg3);
     }
 
     @Override
-    public Socket createSocket(String arg0, int arg1, InetAddress arg2,
-                               int arg3,
-                               org.apache.commons.httpclient.params.HttpConnectionParams arg4)
-            throws IOException, UnknownHostException,
-            org.apache.commons.httpclient.ConnectTimeoutException {
+    public Socket createSocket(String arg0, int arg1, InetAddress arg2, int arg3, org.apache.commons.httpclient.params.HttpConnectionParams arg4)
+            throws IOException {
         return getSSLContext().getSocketFactory().createSocket(arg0, arg1, arg2, arg3);
     }
 }