Make the last of the mode managers private.

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

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

@@ -66,6 +66,8 @@ public class IRCChannelInfo implements ChannelInfo {
     private final IRCParser parser;
     /** Mode manager to use for user modes. */
     private final ModeManager userModeManager;
+    /** Mode manager to use for channel modes. */
+    private final ModeManager chanModeManager;
     /** Mode manager to use for prefix mode information. */
     private final PrefixModeManager prefixModeManager;
     /** Channel Name. */
@@ -100,14 +102,17 @@ public class IRCChannelInfo implements ChannelInfo {
      * @param parser Reference to parser that owns this channelclient (used for modes)
      * @param prefixModeManager The manager to use for prefix modes.
      * @param userModeManager Mode manager to use for user modes.
+     * @param chanModeManager Mode manager to use for channel modes.
      * @param name Channel name.
      */
     public IRCChannelInfo(final IRCParser parser, final PrefixModeManager prefixModeManager,
-            final ModeManager userModeManager, final String name) {
+            final ModeManager userModeManager, final ModeManager chanModeManager,
+            final String name) {
         map = new HashMap<>();
         this.parser = parser;
         this.prefixModeManager = prefixModeManager;
         this.userModeManager = userModeManager;
+        this.chanModeManager = chanModeManager;
         this.name = name;
     }
 
@@ -615,7 +620,7 @@ public class IRCChannelInfo implements ChannelInfo {
         }
 
         modestr = (add ? "+" : "-") + mode;
-        if (parser.chanModesBool.isMode(mode)) {
+        if (chanModeManager.isMode(mode)) {
             final String teststr = (add ? "-" : "+") + mode;
             if (modeQueue.contains(teststr)) {
                 modeQueue.remove(teststr);

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

@@ -169,7 +169,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * <p>
      * Channel modes discovered but not listed in 005 are stored as boolean modes automatically (and a ERROR_WARNING Error is called)
      */
-    public final ModeManager chanModesBool = new ModeManager();
+    private final ModeManager chanModesBool = new ModeManager();
     /**
      * Hashtable storing known non-boolean chan modes (klbeI etc).
      * Non Boolean Modes (for Channels) are stored together in this hashtable, the value param
@@ -283,7 +283,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
     public IRCParser(final MyInfo myDetails, final URI uri) {
         super(uri);
 
-        myProcessingManager = new ProcessingManager(this, prefixModes, userModes);
+        myProcessingManager = new ProcessingManager(this, prefixModes, userModes, chanModesBool);
         myself = new IRCClientInfo(this, userModes, "myself").setFake(true);
 
         out = new OutputQueue();

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

@@ -70,9 +70,10 @@ public class ProcessingManager {
      * @param parser IRCParser that owns this Processing Manager
      * @param prefixModeManager The manager to use to access prefix modes.
      * @param userModeManager Mode manager to use for user modes.
+     * @param chanModeManager Mode manager to use for channel modes.
      */
     public ProcessingManager(final IRCParser parser, final PrefixModeManager prefixModeManager,
-            final ModeManager userModeManager) {
+            final ModeManager userModeManager, final ModeManager chanModeManager) {
         this.parser = parser;
         //------------------------------------------------
         // Add processors
@@ -95,7 +96,8 @@ public class ProcessingManager {
         // INVITE
         addProcessor(new ProcessInvite(parser, this));
         // JOIN
-        addProcessor(new ProcessJoin(parser, prefixModeManager, userModeManager, this));
+        addProcessor(new ProcessJoin(parser, prefixModeManager, userModeManager, chanModeManager,
+                this));
         // KICK
         addProcessor(new ProcessKick(parser, this));
         // PRIVMSG
@@ -103,7 +105,8 @@ public class ProcessingManager {
         addProcessor(new ProcessMessage(parser, prefixModeManager, this));
         // MODE
         // 324
-        addProcessor(new ProcessMode(parser, prefixModeManager, userModeManager, this));
+        addProcessor(new ProcessMode(parser, prefixModeManager, userModeManager, chanModeManager,
+                this));
         // 372
         // 375
         // 376

src/com/dmdirc/parser/irc/processors/ProcessJoin.java

@@ -49,6 +49,8 @@ public class ProcessJoin extends IRCProcessor {
     private final PrefixModeManager prefixModeManager;
     /** Mode manager to use for user modes. */
     private final ModeManager userModeManager;
+    /** Mode manager to use for channel modes. */
+    private final ModeManager chanModeManager;
 
     /**
      * Create a new instance of the IRCProcessor Object.
@@ -56,13 +58,16 @@ public class ProcessJoin extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param prefixModeManager The manager to use to access prefix modes.
      * @param userModeManager Mode manager to use for user modes.
+     * @param chanModeManager Mode manager to use for channel modes.
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
     public ProcessJoin(final IRCParser parser, final PrefixModeManager prefixModeManager,
-            final ModeManager userModeManager, final ProcessingManager manager) {
+            final ModeManager userModeManager, final ModeManager chanModeManager,
+            final ProcessingManager manager) {
         super(parser, manager);
         this.prefixModeManager = prefixModeManager;
         this.userModeManager = userModeManager;
+        this.chanModeManager = chanModeManager;
     }
 
     /**
@@ -159,7 +164,8 @@ public class ProcessJoin extends IRCProcessor {
                 }
             }
 
-            iChannel = new IRCChannelInfo(parser, prefixModeManager, userModeManager, channelName);
+            iChannel = new IRCChannelInfo(parser, prefixModeManager, userModeManager,
+                    chanModeManager, channelName);
             // Add ourself to the channel, this will be overridden by the NAMES reply
             iChannel.addClient(iClient);
             parser.addChannel(iChannel);

src/com/dmdirc/parser/irc/processors/ProcessMode.java

@@ -53,6 +53,8 @@ public class ProcessMode extends IRCProcessor {
     private final PrefixModeManager prefixModeManager;
     /** Mode manager to use for user modes. */
     private final ModeManager userModeManager;
+    /** Mode manager to use for channel modes. */
+    private final ModeManager chanModeManager;
 
     /**
      * Create a new instance of the IRCProcessor Object.
@@ -60,13 +62,16 @@ public class ProcessMode extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param prefixModeManager The manager to use to access prefix modes.
      * @param userModeManager Mode manager to use for user modes.
+     * @param chanModeManager Mode manager to use for channel modes.
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
     public ProcessMode(final IRCParser parser, final PrefixModeManager prefixModeManager,
-            final ModeManager userModeManager, final ProcessingManager manager) {
+            final ModeManager userModeManager, final ModeManager chanModeManager,
+            final ProcessingManager manager) {
         super(parser, manager);
         this.prefixModeManager = prefixModeManager;
         this.userModeManager = userModeManager;
+        this.chanModeManager = chanModeManager;
     }
 
     /**
@@ -173,7 +178,7 @@ public class ProcessMode extends IRCProcessor {
                 cPositive = '-';
                 bPositive = false;
             } else {
-                if (parser.chanModesBool.isMode(cMode)) {
+                if (chanModeManager.isMode(cMode)) {
                     bBooleanMode = true;
                 } else if (parser.chanModesOther.containsKey(cMode)) {
                     nValue = parser.chanModesOther.get(cMode);
@@ -208,7 +213,7 @@ public class ProcessMode extends IRCProcessor {
                     continue;
                 } else {
                     // unknown mode - add as boolean
-                    parser.chanModesBool.add(cMode);
+                    chanModeManager.add(cMode);
                     bBooleanMode = true;
                 }
 
@@ -216,9 +221,9 @@ public class ProcessMode extends IRCProcessor {
                     callDebugInfo(IRCParser.DEBUG_INFO, "Boolean Mode: %c {Positive: %b}", cMode, bPositive);
 
                     if (bPositive) {
-                        nCurrent = parser.chanModesBool.insertMode(nCurrent, cMode);
+                        nCurrent = chanModeManager.insertMode(nCurrent, cMode);
                     } else {
-                        nCurrent = parser.chanModesBool.removeMode(nCurrent, cMode);
+                        nCurrent = chanModeManager.removeMode(nCurrent, cMode);
                     }
                 } else {
 

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

@@ -31,7 +31,7 @@ import static org.junit.Assert.*;
 
 public class ChannelInfoTest {
 
-    final IRCChannelInfo ci = new IRCChannelInfo(null, null, null, "name");
+    final IRCChannelInfo ci = new IRCChannelInfo(null, null, null, null, "name");
 
     @Test
     public void testGetName() {