Abstract parseHost[Full]

src/com/dmdirc/Channel.java

@@ -550,7 +550,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener,
             // Format topics
 
             args.add("");
-            args.addAll(Arrays.asList(ClientInfo.parseHostFull(((Topic) arg).getClient())));
+            args.addAll(Arrays.asList(server.getParser().parseHostmask(((Topic) arg).getClient())));
             args.add(((Topic) arg).getTopic());
             args.add(((Topic) arg).getTime() * 1000);
 

src/com/dmdirc/Invite.java

@@ -91,7 +91,7 @@ public class Invite {
      * @return This invite's source
      */
     public String[] getSource() {
-        return ClientInfo.parseHostFull(source);
+        return server.getParser().parseHostmask(source);
     }
     
     /**

src/com/dmdirc/Query.java

@@ -80,7 +80,8 @@ public final class Query extends MessageTarget implements
      * @param newServer The server object that this Query belongs to
      */
     public Query(final Server newServer, final String newHost) {
-        super("query", ClientInfo.parseHost(newHost), newServer.getConfigManager());
+        super("query", newServer.getParser().parseHostmask(newHost)[0],
+                newServer.getConfigManager());
 
         this.server = newServer;
         this.host = newHost;
@@ -140,8 +141,7 @@ public final class Query extends MessageTarget implements
 
         for (String part : splitLine(window.getTranscoder().encode(line))) {
             if (!part.isEmpty()) {
-                server.getParser().sendMessage(ClientInfo.parseHost(host),
-                        part);
+                server.getParser().sendMessage(getNickname(), part);
 
                 final StringBuffer buff = new StringBuffer("querySelfMessage");
 
@@ -176,7 +176,8 @@ public final class Query extends MessageTarget implements
         final int maxLineLength = server.getParser().getMaxLength("PRIVMSG", host);
 
         if (maxLineLength >= action.length() + 2) {
-            server.getParser().sendAction(ClientInfo.parseHost(host), window.getTranscoder().encode(action));
+            server.getParser().sendAction(getNickname(),
+                    window.getTranscoder().encode(action));
 
             final StringBuffer buff = new StringBuffer("querySelfAction");
 
@@ -199,7 +200,7 @@ public final class Query extends MessageTarget implements
     @Override
     public void onPrivateMessage(final Parser parser, final String message,
             final String remoteHost) {
-        final String[] parts = ClientInfo.parseHostFull(remoteHost);
+        final String[] parts = parser.parseHostmask(host);
 
         final StringBuffer buff = new StringBuffer("queryMessage");
 
@@ -218,7 +219,7 @@ public final class Query extends MessageTarget implements
     @Override
     public void onPrivateAction(final Parser parser, final String message,
             final String remoteHost) {
-        final String[] parts = ClientInfo.parseHostFull(host);
+        final String[] parts = parser.parseHostmask(host);
 
         final StringBuffer buff = new StringBuffer("queryAction");
 
@@ -231,9 +232,7 @@ public final class Query extends MessageTarget implements
      * Updates the QueryWindow's title.
      */
     private void updateTitle() {
-        final String title = ClientInfo.parseHost(host);
-
-        window.setTitle(title);
+        window.setTitle(getNickname());
     }
 
     /**
@@ -241,10 +240,11 @@ public final class Query extends MessageTarget implements
      */
     public void reregister() {
         final CallbackManager callbackManager = server.getParser().getCallbackManager();
+        final String nick = getNickname();
 
         try {
-            callbackManager.addCallback(PrivateActionListener.class, this, ClientInfo.parseHost(host));
-            callbackManager.addCallback(PrivateMessageListener.class, this, ClientInfo.parseHost(host));
+            callbackManager.addCallback(PrivateActionListener.class, this, nick);
+            callbackManager.addCallback(PrivateMessageListener.class, this, nick);
             callbackManager.addCallback(QuitListener.class, this);
             callbackManager.addCallback(NickChangeListener.class, this);
         } catch (CallbackNotFoundException ex) {
@@ -256,7 +256,7 @@ public final class Query extends MessageTarget implements
     @Override
     public void onNickChanged(final Parser tParser, final ClientInfo cClient,
             final String sOldNick) {
-        if (sOldNick.equals(ClientInfo.parseHost(host))) {
+        if (sOldNick.equals(getNickname())) {
             final CallbackManager callbackManager = server.getParser().getCallbackManager();
 
             callbackManager.delCallback(PrivateActionListener.class, this);
@@ -289,7 +289,7 @@ public final class Query extends MessageTarget implements
     @Override
     public void onQuit(final Parser tParser, final ClientInfo cClient,
             final String sReason) {
-        if (cClient.getNickname().equals(ClientInfo.parseHost(host))) {
+        if (cClient.getNickname().equals(getNickname())) {
             final StringBuffer format = new StringBuffer(sReason.isEmpty()
                 ? "queryQuit" : "queryQuitReason");
 
@@ -354,7 +354,7 @@ public final class Query extends MessageTarget implements
      * @return The nickname of this query's user
      */
     public String getNickname() {
-        return ClientInfo.parseHost(host);
+        return server.getParser().parseHostmask(host)[0];
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/Server.java

@@ -482,10 +482,10 @@ public class Server extends WritableFrameContainer implements Serializable {
      * @return True iff the query is known, false otherwise
      */
     public boolean hasQuery(final String host) {
-        final String nick = ClientInfo.parseHost(host);
+        final String nick = parser.parseHostmask(host)[0];
 
         for (Query query : queries) {
-            if (converter.equalsIgnoreCase(ClientInfo.parseHost(query.getHost()), nick)) {
+            if (converter.equalsIgnoreCase(parser.parseHostmask(query.getHost())[0], nick)) {
                 return true;
             }
         }
@@ -500,10 +500,10 @@ public class Server extends WritableFrameContainer implements Serializable {
      * @return The appropriate query object
      */
     public Query getQuery(final String host) {
-        final String nick = ClientInfo.parseHost(host);
+        final String nick = parser.parseHostmask(host)[0];
 
         for (Query query : queries) {
-            if (converter.equalsIgnoreCase(ClientInfo.parseHost(query.getHost()), nick)) {
+            if (converter.equalsIgnoreCase(parser.parseHostmask(query.getHost())[0], nick)) {
                 return query;
             }
         }
@@ -603,7 +603,7 @@ public class Server extends WritableFrameContainer implements Serializable {
         if (!hasQuery(host)) {
             final Query newQuery = new Query(this, host);
 
-            tabCompleter.addEntry(TabCompletionType.QUERY_NICK, ClientInfo.parseHost(host));
+            tabCompleter.addEntry(TabCompletionType.QUERY_NICK, parser.parseHostmask(host)[0]);
             queries.add(newQuery);
         }
     }

src/com/dmdirc/ServerEventHandler.java

@@ -132,7 +132,7 @@ public final class ServerEventHandler extends EventHandler
         owner.doNotification("privateCTCP", CoreActionType.SERVER_CTCP,
                 owner.getParser().getClientInfoOrFake(sHost), sType, sMessage);
 
-        owner.sendCTCPReply(ClientInfo.parseHost(sHost), sType, sMessage);
+        owner.sendCTCPReply(tParser.parseHostmask(sHost)[0], sType, sMessage);
     }
 
     /** {@inheritDoc} */

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

@@ -29,7 +29,6 @@ import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
@@ -55,7 +54,7 @@ public final class ShowTopic extends ChannelCommand implements ExternalCommand {
             if (cChannel.getTopic().isEmpty()) {
                 sendLine(origin, isSilent, "channelNoTopic", cChannel);
             } else {
-                final String[] parts = ClientInfo.parseHostFull(cChannel.getTopicSetter());
+                final String[] parts = server.getParser().parseHostmask(cChannel.getTopicSetter());
 
                 sendLine(origin, isSilent, "channelTopicDiscovered",
                         "", parts[0], parts[1], parts[2], cChannel.getTopic(),

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

@@ -267,4 +267,13 @@ public interface Parser extends Runnable {
      */
     RegexStringList getIgnoreList();
 
+    /**
+     * Parses the specified hostmask into an array containing a nickname,
+     * username and hostname, in that order.
+     *
+     * @param hostmask The hostmask to be parsed
+     * @return An array containing the nickname, username and hostname
+     */
+    String[] parseHostmask(String hostmask);
+
 }

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

@@ -2062,4 +2062,10 @@ class IRCParser implements SecureParser, Runnable {
 		}
 	}
 
+    /** {@inheritDoc} */
+    @Override
+    public String[] parseHostmask(final String hostmask) {
+        return IRCClientInfo.parseHostFull(hostmask);
+    }
+
 }