Parser tidying

Remove public non-final fields in favour of getters
Remove some unused and some useless methods

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

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

@@ -109,9 +109,9 @@ public class IRCParser implements SecureParser, EncodingParser, Runnable {
      * Nickname here is *not* always accurate.<br><br>
      * ClientInfo variable tParser.getMyself() should be used for accurate info.
      */
-    public MyInfo me = new MyInfo();
+    private MyInfo me = new MyInfo();
     /**    Server Info requested by user. */
-    public ServerInfo server;
+    private ServerInfo server;
     /** The proxy to use to connect. */
     private URI proxy;
     /** Should PINGs be sent to the server to check if its alive? */
@@ -258,12 +258,10 @@ public class IRCParser implements SecureParser, EncodingParser, Runnable {
             public void checkServerTrusted(final X509Certificate[] certs, final String authType) {
             }
         },};
-    /** Should fake (channel)clients be created for callbacks where they do not exist? */
-    private boolean createFake = true;
     /** Should channels automatically request list modes? */
     private boolean autoListMode = true;
     /** Should part/quit/kick callbacks be fired before removing the user internally? */
-    boolean removeAfterCallback = true;
+    private boolean removeAfterCallback = true;
     /** This is the TrustManager used for SSL Sockets. */
     private TrustManager[] myTrustManager = trustAllCerts;
     /** The KeyManagers used for client certificates for SSL sockets. */
@@ -423,24 +421,6 @@ public class IRCParser implements SecureParser, EncodingParser, Runnable {
         return myMap;
     }
 
-    /**
-     * Get the current Value of createFake.
-     *
-     * @return Value of createFake (true if fake clients will be added for callbacks, else false)
-     */
-    public boolean getCreateFake() {
-        return createFake;
-    }
-
-    /**
-     * Set the current Value of createFake.
-     *
-     * @param newValue New value to set createFake
-     */
-    public void setCreateFake(final boolean newValue) {
-        createFake = newValue;
-    }
-
     /**
      * Get the current Value of autoListMode.
      *
@@ -1191,6 +1171,16 @@ public class IRCParser implements SecureParser, EncodingParser, Runnable {
         return serverName;
     }
 
+    /**
+     * Gets the ServerInfo object that corresponds to the server that this
+     * parser is configured to connect to.
+     *
+     * @return This parser's configured server info.
+     */
+    public ServerInfo getServerInfo() {
+        return server;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getLastLine() {
@@ -1360,33 +1350,6 @@ public class IRCParser implements SecureParser, EncodingParser, Runnable {
         stringConverter = new IRCStringConverter(encoding);
     }
 
-    /**
-     * Get the known boolean chanmodes in 005 order.
-     * Modes are returned in the order that the ircd specifies the modes in 005
-     * with any newly-found modes (mode being set that wasn't specified in 005)
-     * being added at the end.
-     *
-     * @return All the currently known boolean modes
-     */
-    public String getBoolChanModes005() {
-        // This code isn't the nicest, as Hashtable's don't lend themselves to being
-        // ordered.
-        // Order isn't really important, and this code only takes 3 lines of we
-        // don't care about it but ordered guarentees that on a specific ircd this
-        // method will ALWAYs return the same value.
-        final char[] modes = new char[chanModesBool.size()];
-
-        for (Map.Entry<Character, Long> entry : chanModesBool.entrySet()) {
-            // nTemp should never be less than 0
-            if (entry.getValue() > 0) {
-                final double pos = Math.log(entry.getValue()) / Math.log(2);
-                modes[(int) pos] = entry.getKey();
-            }
-        }
-
-        return new String(modes);
-    }
-
     /**
      * Process CHANMODES from 005.
      */
@@ -1662,15 +1625,6 @@ public class IRCParser implements SecureParser, EncodingParser, Runnable {
         h005Info.put("PREFIXSTRING", bits[0]);
     }
 
-    /**
-     * Check if server is ready.
-     *
-     * @return true if 001 has been recieved, false otherwise.
-     */
-    public boolean isReady() {
-        return got001;
-    }
-
     /** {@inheritDoc} */
     @Override
     public void joinChannel(final String channel) {
@@ -2017,22 +1971,6 @@ public class IRCParser implements SecureParser, EncodingParser, Runnable {
         return ServerType.findServerType(h005Info.get("004IRCD"), networkName, h005Info.get("003IRCD"), h005Info.get("002IRCD"));
     }
 
-    /**
-     * Get the name of the ircd.
-     *
-     * @param getType if this is false the string from 004 is returned. Else a guess of the type (ircu, hybrid, ircnet)
-     * @return IRCD Version or Type
-     * @deprecated Use getServerSoftware() or getServerSoftwareType() instead.
-     */
-    @Deprecated
-    public String getIRCD(final boolean getType) {
-        if (getType) {
-            return getServerSoftwareType();
-        } else {
-            return getServerSoftware();
-        }
-    }
-
     /** {@inheritDoc} */
     @Override
     public String getServerSoftware() {
@@ -2241,6 +2179,16 @@ public class IRCParser implements SecureParser, EncodingParser, Runnable {
         }
     }
 
+    /**
+     * Retrieves the local user information that this parser was configured
+     * with.
+     *
+     * @return This parser's local user configuration
+     */
+    public MyInfo getMyInfo() {
+        return me;
+    }
+
     /**
      * Get the current username (Specified in MyInfo on construction).
      * Get the username given in MyInfo

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

@@ -78,7 +78,7 @@ public class Process001 extends IRCProcessor {
 
         parser.startPingTimer();
 
-        final String channels = parser.server.getChannels();
+        final String channels = parser.getServerInfo().getChannels();
         if (channels != null) {
             parser.joinChannel(channels);
         }

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

@@ -89,14 +89,14 @@ public class ProcessKick extends IRCProcessor {
                 return;
             }
             iChannelKicker = iChannel.getChannelClient(token[0]);
-            if (parser.removeAfterCallback) {
+            if (parser.getRemoveAfterCallback()) {
                 callDebugInfo(IRCParser.DEBUG_INFO, "processKick: calling kick before. {%s | %s | %s | %s | %s}", iChannel, iChannelClient, iChannelKicker, sReason, token[0]);
                 callChannelKick(iChannel, iChannelClient, iChannelKicker, sReason, token[0]);
             }
             callDebugInfo(IRCParser.DEBUG_INFO, "processKick: removing client from channel { %s | %s }", iChannel, iClient);
             iChannel.delClient(iClient);
             callDebugInfo(IRCParser.DEBUG_INFO, "processKick: removed client from channel { %s | %s }", iChannel, iClient);
-            if (!parser.removeAfterCallback) {
+            if (!parser.getRemoveAfterCallback()) {
                 callDebugInfo(IRCParser.DEBUG_INFO, "processKick: calling kick after. {%s | %s | %s | %s | %s}", iChannel, iChannelClient, iChannelKicker, sReason, token[0]);
                 callChannelKick(iChannel, iChannelClient, iChannelKicker, sReason, token[0]);
             }

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

@@ -66,12 +66,12 @@ public class ProcessNickInUse extends IRCProcessor {
                 callDebugInfo(IRCParser.DEBUG_INFO, "Using inbuilt handler");
                 // If this is before 001 we will try and get a nickname, else we will leave the nick as-is
                 if (parser.triedAlt) {
-                    if (parser.getStringConverter().equalsIgnoreCase(parser.thinkNickname, parser.me.getAltNickname())) {
-                        parser.thinkNickname = parser.me.getNickname();
+                    if (parser.getStringConverter().equalsIgnoreCase(parser.thinkNickname, parser.getMyInfo().getAltNickname())) {
+                        parser.thinkNickname = parser.getMyInfo().getNickname();
                     }
-                    parser.getLocalClient().setNickname(parser.me.getPrependChar() + parser.thinkNickname);
+                    parser.getLocalClient().setNickname(parser.getMyInfo().getPrependChar() + parser.thinkNickname);
                 } else {
-                    parser.getLocalClient().setNickname(parser.me.getAltNickname());
+                    parser.getLocalClient().setNickname(parser.getMyInfo().getAltNickname());
                     parser.triedAlt = true;
                 }
             }

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

@@ -84,12 +84,12 @@ public class ProcessPart extends IRCProcessor {
                 // callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got part for channel ("+token[2]+") for a non-existant user. [User: "+token[0]+"]", parser.getLastLine()));
                 return;
             }
-            if (parser.removeAfterCallback) {
+            if (parser.getRemoveAfterCallback()) {
                 callChannelPart(iChannel, iChannelClient, sReason);
             }
             callDebugInfo(IRCParser.DEBUG_INFO, "Removing %s from %s", iClient.getNickname(), iChannel.getName());
             iChannel.delClient(iClient);
-            if (!parser.removeAfterCallback) {
+            if (!parser.getRemoveAfterCallback()) {
                 callChannelPart(iChannel, iChannelClient, sReason);
             }
             if (iClient == parser.getLocalClient()) {

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

@@ -80,7 +80,7 @@ public class ProcessQuit extends IRCProcessor {
         for (IRCChannelInfo iChannel : channelList) {
             iChannelClient = iChannel.getChannelClient(iClient);
             if (iChannelClient != null) {
-                if (parser.removeAfterCallback) {
+                if (parser.getRemoveAfterCallback()) {
                     callChannelQuit(iChannel, iChannelClient, sReason);
                 }
                 if (iClient == parser.getLocalClient()) {
@@ -89,13 +89,13 @@ public class ProcessQuit extends IRCProcessor {
                 } else {
                     iChannel.delClient(iClient);
                 }
-                if (!parser.removeAfterCallback) {
+                if (!parser.getRemoveAfterCallback()) {
                     callChannelQuit(iChannel, iChannelClient, sReason);
                 }
             }
         }
 
-        if (parser.removeAfterCallback) {
+        if (parser.getRemoveAfterCallback()) {
             callQuit(iClient, sReason);
         }
         if (iClient == parser.getLocalClient()) {
@@ -103,7 +103,7 @@ public class ProcessQuit extends IRCProcessor {
         } else {
             parser.removeClient(iClient);
         }
-        if (!parser.removeAfterCallback) {
+        if (!parser.getRemoveAfterCallback()) {
             callQuit(iClient, sReason);
         }
     }

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

@@ -262,16 +262,6 @@ public class IRCParserTest {
         assertEquals("abc.def.ghi.123", parser.getBindIP());
     }
 
-    @Test
-    public void testCreateFake() {
-        final TestParser parser = new TestParser();
-
-        parser.setCreateFake(false);
-        assertFalse(parser.getCreateFake());
-        parser.setCreateFake(true);
-        assertTrue(parser.getCreateFake());
-    }
-
     @Test
     public void testAutoListMode() {
         final TestParser parser = new TestParser();
@@ -329,7 +319,7 @@ public class IRCParserTest {
         assertEquals("bar :abc def", TestParser.getParam("foo :bar :abc def"));
         assertEquals("abc def", TestParser.getParam("abc def"));
     }
-    
+
     @Test
     public void testKick() throws CallbackNotFoundException {
         final TestParser parser = new TestParser();
@@ -344,7 +334,7 @@ public class IRCParserTest {
                 (IRCChannelClientInfo) anyObject(), (IRCChannelClientInfo) anyObject(),
                 anyString(), anyString());
     }
-    
+
     @Test
     public void testIllegalPort2() throws URISyntaxException {
         final TestParser tp = new TestParser(new MyInfo(), new URI("irc://127.0.0.1:65570/"));