Parser now sends queued channel modes as soon as the max number is reached, rather than waiting for the next one

Fixes issue 1107

git-svn-id: http://svn.dmdirc.com/trunk@3905 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/Main.java

@@ -53,7 +53,7 @@ public final class Main {
     public static final String VERSION = "SVN";
 
     /** The SVN revision that this build was made from. */
-    public static final int SVN_REVISION = 3853; // 3853; // 3853; // 3853; // 3628; // 3601;
+    public static final int SVN_REVISION = 3853;
 
     /** Stores the update channel that this version came from, if any. */
     public static final UpdateChannel UPDATE_CHANNEL = UpdateChannel.NONE;

src/com/dmdirc/parser/ChannelInfo.java

@@ -605,7 +605,7 @@ public final class ChannelInfo {
 			}
 		}
 		if (!myParser.isUserSettable(mode)) { return; }
-		if (lModeQueue.size() == modecount) { sendModes(); }
+
 		if (positive) { modestr = "+"; } else { modestr = "-"; }
 		modestr = modestr + mode;
 		if (!myParser.hChanModesBool.containsKey(mode)) {
@@ -614,17 +614,18 @@ public final class ChannelInfo {
 				modestr = modestr + " " + parameter;
 			} else {
 				modecount = myParser.hChanModesOther.get(mode);
-				if ((modecount & myParser.MODE_LIST) == myParser.MODE_LIST) {
+				if ((modecount & IRCParser.MODE_LIST) == IRCParser.MODE_LIST) {
 					modestr = modestr + " " + parameter;
-				} else if (!positive && ((modecount & myParser.MODE_UNSET) == myParser.MODE_UNSET)) {
+				} else if (!positive && ((modecount & IRCParser.MODE_UNSET) == IRCParser.MODE_UNSET)) {
 					modestr = modestr + " " + parameter;
-				} else if (positive && ((modecount & myParser.MODE_SET) == myParser.MODE_SET)) {
+				} else if (positive && ((modecount & IRCParser.MODE_SET) == IRCParser.MODE_SET)) {
 					modestr = modestr + " " + parameter;
 				}
 			}
 		}
-		myParser.callDebugInfo(myParser.DEBUG_INFO, "Queueing mode: %s", modestr);
+		myParser.callDebugInfo(IRCParser.DEBUG_INFO, "Queueing mode: %s", modestr);
 		lModeQueue.add(modestr);
+		if (lModeQueue.size() == modecount) { sendModes(); }        
 	}
 	
 	/**

test/com/dmdirc/parser/ChannelInfoTest.java

@@ -149,7 +149,7 @@ public class ChannelInfoTest extends junit.framework.TestCase {
         assertEquals(0, parser.sentLines.size());
     }
     
-    /*@Test
+    @Test
     public void testModeSendFull() {
         final TestParser parser = new TestParser();
         final ChannelInfo info = getChannelInfo(parser);
@@ -172,7 +172,7 @@ public class ChannelInfoTest extends junit.framework.TestCase {
         assertTrue(modes.indexOf('p') > -1);
         assertTrue(modes.indexOf('t') > -1);
         assertTrue(modes.indexOf('r') > -1);
-    }*/
+    }
     
     @Test
     public void testModeSendExtra() {