Servers are now completely detached from IRC parser. Issue 2736.

src/com/dmdirc/ParserFactory.java

@@ -26,7 +26,7 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.MyInfo;
+import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.irc.ServerInfo;
 import com.dmdirc.util.IrcAddress;
 

src/com/dmdirc/Server.java

@@ -41,10 +41,7 @@ import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SecureParser;
 import com.dmdirc.parser.interfaces.StringConverter;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.IRCStringConverter;
-import com.dmdirc.parser.irc.MyInfo;
-import com.dmdirc.parser.irc.ServerInfo;
+import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -143,7 +140,7 @@ public class Server extends WritableFrameContainer implements Serializable {
     private final IgnoreList ignoreList = new IgnoreList();
 
     /** Our string convertor. */
-    private StringConverter converter = new IRCStringConverter();
+    private StringConverter converter;
 
     // </editor-fold>
     
@@ -674,36 +671,6 @@ public class Server extends WritableFrameContainer implements Serializable {
 
     // <editor-fold defaultstate="collapsed" desc="Miscellaneous methods">
 
-    /**
-     * Construsts a {@link ServerInfo} object for the specified details.
-     *
-     * @param server The hostname or IP address of the server
-     * @param port The port of the server
-     * @param password The password to use, if any
-     * @param ssl Whether or not to use SSL
-     * @return An appropriately configured ServerInfo instance
-     */
-    private ServerInfo buildServerInfo(final String server, final int port,
-            final String password, final boolean ssl) {
-        final ServerInfo myInfo = new ServerInfo(server, port, password);
-        myInfo.setSSL(ssl);
-
-        if (getConfigManager().hasOptionString(DOMAIN_SERVER, "proxy.address")) {
-            myInfo.setUseSocks(true);
-
-            myInfo.setProxyHost(getConfigManager()
-                    .getOption(DOMAIN_SERVER, "proxy.address"));
-            myInfo.setProxyUser(getConfigManager()
-                    .getOption(DOMAIN_SERVER, "proxy.user"));
-            myInfo.setProxyPass(getConfigManager()
-                    .getOption(DOMAIN_SERVER, "proxy.password"));
-            myInfo.setProxyPort(getConfigManager()
-                    .getOptionInt(DOMAIN_SERVER, "proxy.port"));
-        }
-
-        return myInfo;
-    }
-
     /**
      * Builds an appropriately configured {@link IRCParser} for this server.
      *
@@ -822,7 +789,7 @@ public class Server extends WritableFrameContainer implements Serializable {
     /** {@inheritDoc} */
     @Override
     public int getMaxLineLength() {
-        return IRCParser.MAX_LINELENGTH;
+        return parser == null ? -1 : parser.getMaxLength();
     }
 
     /**

src/com/dmdirc/parser/irc/MyInfo.java → src/com/dmdirc/parser/common/MyInfo.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.common;
 
 /**
  * Contains User information.
@@ -29,7 +29,8 @@ package com.dmdirc.parser.irc;
  * @author Chris Smith
  * @see IRCParser
  */
-public final class MyInfo {
+public class MyInfo {
+    
 	/** Character to prepend to nickname if in use (Default "_"). */
 	private char prependChar = '_';	
 	/** Nickname to attempt to use on IRC. */

src/com/dmdirc/parser/interfaces/Parser.java

@@ -90,6 +90,13 @@ public interface Parser extends Runnable {
      */
     int getMaxLength(String type, String target);
 
+    /**
+     * Determines the maximum length any message/raw command may be.
+     *
+     * @return The maximum length of a message
+     */
+    int getMaxLength();
+
     /**
      * Returns a {@link ClientInfo} object which represents the locally
      * connected client.

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.common.IgnoreList;
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.interfaces.SecureParser;
@@ -2032,4 +2033,10 @@ public class IRCParser implements SecureParser, Runnable {
         return 0;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public int getMaxLength() {
+        return MAX_LINELENGTH;
+    }
+
 }

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.harness.parser;
 
+import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.*;
 import java.util.ArrayList;

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.common.ChannelListModeItem;
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.harness.parser.TestIPrivateCTCP;