More parser abstraction, issue 2736

src/com/dmdirc/Channel.java

@@ -371,7 +371,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener,
      */
     public void checkWho() {
         if (onChannel && sendWho) {
-            server.getParser().sendRawMessage("WHO :" + channelInfo.getName());
+            channelInfo.sendWho();
         }
     }
 
@@ -578,6 +578,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener,
      * current topic
      */
     public void setTopic(final String topic) {
-        server.getParser().sendRawMessage("TOPIC " + channelInfo.getName() + " :" + topic);
+        channelInfo.setTopic(topic);
     }
 }

src/com/dmdirc/commandparser/commands/channel/Ban.java

@@ -65,7 +65,8 @@ public final class Ban extends ChannelCommand implements IntelligentCommand {
             host = "*!*@" + user.getClient().getHostname();
         }
         
-        server.getParser().sendRawMessage("MODE " + channel + " +b " + host);
+        channel.getChannelInfo().alterMode(true, 'b', host);
+        channel.getChannelInfo().flushModes();
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/commandparser/commands/server/Away.java

@@ -51,7 +51,7 @@ public final class Away extends ServerCommand {
             final boolean isSilent, final CommandArguments args) {
         final String line = args.getArgumentsAsString();
 
-        server.getParser().sendRawMessage("AWAY :" + line);
+        server.getParser().getLocalClient().setAway(line);
     }
     
     

src/com/dmdirc/commandparser/commands/server/Back.java

@@ -59,7 +59,7 @@ public final class Back extends ServerCommand implements IntelligentCommand {
     @Override
     public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final CommandArguments args) {        
-        server.getParser().sendRawMessage("AWAY");
+        server.getParser().getLocalClient().setBack();
     }
     
     

src/com/dmdirc/commandparser/commands/server/Ctcp.java

@@ -63,8 +63,8 @@ public final class Ctcp extends ServerCommand implements IntelligentCommand {
         if (args.getArguments().length < 2) {
             showUsage(origin, isSilent, "ctcp", "<target> <type> [arguments]");
         } else {
-            server.getParser().sendRawMessage("PRIVMSG " + args.getArguments()[0] + " :"
-                    + ((char) 1) + args.getArgumentsAsString(1) + ((char) 1));
+            server.getParser().sendCTCP(args.getArguments()[0],
+                    args.getArguments()[1], args.getArgumentsAsString(2));
             sendLine(origin, isSilent, "selfCTCP", args.getArguments()[0],
                     args.getArgumentsAsString(1));
         }

src/com/dmdirc/commandparser/commands/server/Message.java

@@ -59,8 +59,8 @@ public final class Message extends ServerCommand implements IntelligentCommand,
         if (args.getArguments().length < 2) {
             showUsage(origin, isSilent, "msg", "<target> <message>");
         } else {
-            server.getParser().sendRawMessage("PRIVMSG " + args.getArguments()[0] + " :"
-                    + args.getArgumentsAsString(1));
+            server.getParser().sendMessage(args.getArguments()[0],
+                    args.getArgumentsAsString(1));
             sendLine(origin, isSilent, "selfMessage", args.getArguments()[0],
                     args.getArgumentsAsString(1));
         }

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

@@ -41,6 +41,13 @@ public interface ChannelInfo {
      */
     String getName();
 
+    /**
+     * Changes the topic of this channel.
+     *
+     * @param topic This channel's new topic
+     */
+    void setTopic(String topic);
+
     /**
      * Retrieves the current topic or subject of this channel.
      *
@@ -108,6 +115,11 @@ public interface ChannelInfo {
      */
     void part(String reason);
 
+    /**
+     * Sends a WHO request to get details about people who are on the channel.
+     */
+    void sendWho();
+
     /**
      * Adjust the modes on this channel. This method should queue modes to be
      * sent in one go, according to the configuration/behaviour of the backend

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

@@ -45,6 +45,18 @@ public interface LocalClientInfo extends ClientInfo {
      */
     String getModes();
 
+    /**
+     * Marks the local client as being away.
+     *
+     * @param reason The reason for being away
+     */
+    void setAway(String reason);
+
+    /**
+     * Marks the local client as being back (not away).
+     */
+    void setBack();
+
     /**
      * Alters the user modes of the local client. This method will queue modes
      * to be sent in one go, according to the behaviour/configuration of the

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

@@ -278,6 +278,14 @@ public interface Parser extends Runnable {
      */
     void sendMessage(String target, String message);
 
+    /**
+     * Sends a notice to the specified target.
+     *
+     * @param target The target to send the notice to
+     * @param message The message to be sent
+     */
+    void sendNotice(String target, String message);
+
     /**
      * Sends an action to the specified target.
      *

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

@@ -389,7 +389,7 @@ public class IRCChannelInfo implements ChannelInfo {
 	 *
 	 * @param sNewTopic New contents of topic
 	 */	
-	protected void setTopic(final String sNewTopic) { sTopic = sNewTopic; }
+	protected void setInternalTopic(final String sNewTopic) { sTopic = sNewTopic; }
 	
         /** {@inheritDoc} */
         @Override
@@ -724,5 +724,17 @@ public class IRCChannelInfo implements ChannelInfo {
             myParser.partChannel(sName, reason);
         }
 
+    /** {@inheritDoc} */
+    @Override
+    public void setTopic(final String topic) {
+        myParser.sendRawMessage("TOPIC " + sName + " :" + topic);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void sendWho() {
+        myParser.sendRawMessage("WHO " + sName);
+    }
+
 }
 

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

@@ -402,4 +402,16 @@ public class IRCClientInfo implements LocalClientInfo {
             }
         }
 
+    /** {@inheritDoc} */
+    @Override
+    public void setAway(String reason) {
+        myParser.sendRawMessage("AWAY :" + reason);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setBack() {
+        myParser.sendRawMessage("AWAY");
+    }
+
 }

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

@@ -1519,12 +1519,8 @@ public class IRCParser implements SecureParser, Runnable {
 		sendString("PRIVMSG " + target + " :" + message);
 	}
 
-	/**
-	 * Send a notice message to a target.
-	 *
-	 * @param target Target
-	 * @param message Message to send
-	 */
+	/** {@inheritDoc} */
+        @Override
 	public void sendNotice(final String target, final String message) {
 		if (target == null || message == null) { return; }
 		if (target.isEmpty()/* || sMessage.isEmpty()*/) { return; }

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

@@ -41,7 +41,7 @@ public class ProcessTopic extends IRCProcessor {
 		if (sParam.equals("332")) {
 			iChannel = getChannel(token[3]);
 			if (iChannel == null) { return; }
-			iChannel.setTopic(token[token.length-1]);
+			iChannel.setInternalTopic(token[token.length-1]);
 		} else if (sParam.equals("333")) {
 			if (token.length > 3) {
 				iChannel = getChannel(token[3]);
@@ -64,7 +64,7 @@ public class ProcessTopic extends IRCProcessor {
 			iChannel.setTopicTime(System.currentTimeMillis() / 1000);
 			if (token[0].charAt(0) == ':') { token[0] = token[0].substring(1); }
 			iChannel.setTopicUser(token[0]);
-			iChannel.setTopic(token[token.length-1]);
+			iChannel.setInternalTopic(token[token.length-1]);
 			callChannelTopic(iChannel,false);
 		}
 	}

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

@@ -74,7 +74,7 @@ public class ChannelInfoTest {
 
     @Test
     public void testTopic() {
-        ci.setTopic("abcdef");
+        ci.setInternalTopic("abcdef");
 
         assertEquals("abcdef", ci.getTopic());
     }