Remove unused stuff from ServerInfo

Change-Id: Id2c55d69befbbbc1738ad7debb05d0a4d43a8396
Reviewed-on: http://gerrit.dmdirc.com/2181
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/parser/irc/ServerInfo.java

@@ -23,7 +23,6 @@
 package com.dmdirc.parser.irc;
 
 import java.net.URI;
-import java.net.URISyntaxException;
 
 /**
  * Contains Server information.
@@ -37,42 +36,11 @@ public class ServerInfo {
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
-    private static final long serialVersionUID = 1;
-    /** Are we using a socks proxy (Default: false). */
-    private boolean useSocksProxy;
-    /** Proxy server to connect to (Default: "127.0.0.1"). */
-    private String proxyHost = "127.0.0.1";
-    /** Port server listens on for client connections (Default: 8080). */
-    private int proxyPort = 1080;
-    /** Proxy username if required. */
-    private String proxyUser = "";
-    /** Proxy password if required. */
-    private String proxyPass = "";
+    private static final long serialVersionUID = 2;
+
     /** URI used to create this ServerInfo if applicable. */
     private URI uri;
 
-    /**
-     * Constructor using specifed host, port and password, SSL/Proxy must be
-     * specifed separately.
-     *
-     * @param serverHost Host to use
-     * @param serverPort Port to use
-     * @param serverPass Password to use
-     */
-    public ServerInfo(final String serverHost, final int serverPort,
-            final String serverPass) {
-        try {
-            uri = new URI("irc", serverPass, serverHost, serverPort, null,
-                    null, null);
-        } catch (URISyntaxException ex) {
-            try {
-                uri = new URI("irc", null, "127.0.0.1", -1, null, null, null);
-            } catch (URISyntaxException ex1) {
-                //Won't happen
-            }
-        }
-    }
-
     /**
      * Creates a new ServerInfo which will represent the server described by
      * the specified URI.
@@ -132,96 +100,6 @@ public class ServerInfo {
         return "ircs".equals(uri.getScheme());
     }
 
-    /**
-     * Set if we are connecting via a socks proxy.
-     *
-     * @param newValue true if we are using socks, else false
-     */
-    public void setUseSocks(final boolean newValue) {
-        useSocksProxy = newValue;
-    }
-
-    /**
-     * Get if we are connecting via a socks proxy.
-     *
-     * @return true if we are using socks, else false
-     */
-    public boolean getUseSocks() {
-        return useSocksProxy;
-    }
-
-    /**
-     * Set the Proxy hostname.
-     *
-     * @param newValue Value to set to.
-     */
-    public void setProxyHost(final String newValue) {
-        proxyHost = newValue;
-    }
-
-    /**
-     * Get the Proxy hostname.
-     *
-     * @return Current Proxy hostname
-     */
-    public String getProxyHost() {
-        return proxyHost;
-    }
-
-    /**
-     * Set the Proxy port.
-     *
-     * @param newValue Value to set to.
-     */
-    public void setProxyPort(final int newValue) {
-        proxyPort = newValue;
-    }
-
-    /**
-     * Get the Proxy port.
-     *
-     * @return Current Proxy port
-     */
-    public int getProxyPort() {
-        return proxyPort;
-    }
-
-    /**
-     * Set the Proxy username.
-     *
-     * @param newValue Value to set to.
-     */
-    public void setProxyUser(final String newValue) {
-        proxyUser = newValue;
-    }
-
-    /**
-     * Get the Proxy username.
-     *
-     * @return Current Proxy username
-     */
-    public String getProxyUser() {
-        return proxyUser;
-    }
-
-    /**
-     * Set the Proxy password.
-     *
-     * @param newValue Value to set to.
-     */
-    public void setProxyPass(final String newValue) {
-        proxyPass = newValue;
-    }
-
-    /**
-     * Get the Proxy password.
-     *
-     * @return Current Proxy password
-     */
-    public String getProxyPass() {
-        return proxyPass;
-    }
-
     /**
      * Retrieves a String describing any channels included in this ServerInfo's
      * URI.

test/com/dmdirc/harness/parser/TestParser.java

@@ -27,6 +27,7 @@ import com.dmdirc.parser.common.QueuePriority;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.*;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Timer;
@@ -36,11 +37,11 @@ public class TestParser extends IRCParser implements Parser {
     public final List<String> sentLines = new ArrayList<String>();
 
     public String nick = "nick";
-    
+
     public String network = null;
 
     public TestParser() {
-        super(new ServerInfo("", -1, ""));
+        super(new ServerInfo(buildURI()));
         currentSocketState = SocketState.OPEN;
     }
 
@@ -49,20 +50,28 @@ public class TestParser extends IRCParser implements Parser {
         currentSocketState = SocketState.OPEN;
     }
 
+    private static URI buildURI() {
+        try {
+            return new URI("irc://host:1234/");
+        } catch (URISyntaxException ex) {
+            return null;
+        }
+    }
+
     @Override
     protected boolean doSendString(String line, QueuePriority priority, boolean fromParser) {
         sentLines.add(line);
         return true;
     }
-    
+
     public String[] getLine(int index) {
         return tokeniseLine(sentLines.get(index));
     }
-    
+
     public void injectLine(String line) {
         processLine(new IRCReader.ReadLine(line, IRCParser.tokeniseLine(line)));
     }
-    
+
     public void injectConnectionStrings() {
         final String[] lines = new String[]{
             "NOTICE AUTH :Blah, blah",
@@ -76,13 +85,13 @@ public class TestParser extends IRCParser implements Parser {
             ":server 005 " + nick + " MAXNICKLEN=15 TOPICLEN=250 AWAYLEN=160 MODES=6 " +
                     "CHANMODES=bIeR,k,l,imnpstrDducCNMT :are supported by this server",
         };
-        
+
         sendConnectionStrings();
-        
+
         for (String line : lines) {
             injectLine(line);
         }
-        
+
         sentLines.clear();
     }
 
@@ -95,7 +104,7 @@ public class TestParser extends IRCParser implements Parser {
     public void run() {
         injectConnectionStrings();
     }
-    
+
     public void runSuper() {
         super.run();
     }

test/com/dmdirc/parser/irc/ServerInfoTest.java

@@ -28,10 +28,10 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class ServerInfoTest {
-    
+
     @Test
     public void testHost() throws URISyntaxException {
-        final ServerInfo si = new ServerInfo(new URI("ircs", "pass1", "host0", 
+        final ServerInfo si = new ServerInfo(new URI("ircs", "pass1", "host0",
                 5, null, null, null));
         assertEquals("host0", si.getHost());
     }
@@ -79,27 +79,5 @@ public class ServerInfoTest {
                 5, null, null, null));
         assertFalse(si.isSSL());
     }
-    
-    @Test
-    public void testUseSocks() {
-        final ServerInfo si = new ServerInfo("host0", 5, "pass1");
-        assertFalse(si.getUseSocks());
-        si.setUseSocks(true);
-        assertTrue(si.getUseSocks());
-    }
-    
-    @Test
-    public void testProxyHost() {
-        final ServerInfo si = new ServerInfo("host0", 5, "pass1");
-        si.setProxyHost("foo");
-        assertEquals("foo", si.getProxyHost());
-    }
-    
-    @Test
-    public void testProxyPort() {
-        final ServerInfo si = new ServerInfo("host0", 5, "pass1");
-        si.setProxyPort(1024);
-        assertEquals(1024, si.getProxyPort());
-    }
-    
+
 }