Parser base abstraction/tidying

Depends-On: I3bfbb811a5b5055d8dbe511a0390c3413d133292
Depends-On: I4ff484e8a2597017283eea557170c4aeb2029faa
Change-Id: I694d18a653ca8c3e3cad9d0e766e2fd207e615e9
Reviewed-on: http://gerrit.dmdirc.com/1854
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/parser/irc/IRCCallbackObjectSpecific.java → src/com/dmdirc/parser/common/BaseChannelClientInfo.java

@@ -20,52 +20,63 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.common;
 
-import com.dmdirc.parser.common.CallbackManager;
-import com.dmdirc.parser.common.CallbackObjectSpecific;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.LocalClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
+
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * A specific callback object for use with the IRC Parser.
- *
- * @since 0.6.3m2
- * @author chris
+ * Provides a basic implementation of the {@link ChannelClientInfo} interface.
  */
-public class IRCCallbackObjectSpecific extends CallbackObjectSpecific {
+public abstract class BaseChannelClientInfo implements ChannelClientInfo {
+    
+    /** A map for random data associated with the client to be stored in. */
+    private final Map<Object, Object> map = new HashMap<Object, Object>();
+    
+    /** The channel that the client is associated with. */
+    private final ChannelInfo channel;
+    
+    /** The client that is associated with the channel. */
+    private final ClientInfo client;
 
-    /** A map of interfaces to the classes which should be instansiated for them. */
-    protected static final Map<Class<?>, Class<?>> IMPL_MAP = new HashMap<Class<?>, Class<?>>();
+    /**
+     * Creates a new BaseChannelClientInfo object for the specified client's
+     * association with the specified channel.
+     *
+     * @param channel The channel the association is with
+     * @param client The user that holds the association
+     */
+    public BaseChannelClientInfo(final ChannelInfo channel, final ClientInfo client) {
+        this.channel = channel;
+        this.client = client;
+    }
 
-    static {
-        IMPL_MAP.put(ChannelClientInfo.class, IRCChannelClientInfo.class);
-        IMPL_MAP.put(ChannelInfo.class, IRCChannelInfo.class);
-        IMPL_MAP.put(ClientInfo.class, IRCClientInfo.class);
-        IMPL_MAP.put(LocalClientInfo.class, IRCClientInfo.class);
+    /** {@inheritDoc} */
+    @Override
+    public ChannelInfo getChannel() {
+        return channel;
     }
 
-    public IRCCallbackObjectSpecific(final Parser parser,
-            final CallbackManager<?> manager, final Class<? extends CallbackInterface> type) {
-        super(parser, manager, type);
+    /** {@inheritDoc} */
+    @Override
+    public ClientInfo getClient() {
+        return client;
     }
 
     /** {@inheritDoc} */
     @Override
-    protected String translateHostname(final String hostname) {
-        return IRCClientInfo.parseHost(hostname);
+    public Map<Object, Object> getMap() {
+        return map;
     }
 
     /** {@inheritDoc} */
     @Override
-    protected Class<?> getImplementation(final Class<?> type) {
-        return IMPL_MAP.containsKey(type) ? IMPL_MAP.get(type) : type;
+    public String toString() {
+        return getImportantMode() + client.toString();
     }
 
 }

src/com/dmdirc/parser/common/BaseChannelInfo.java

@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.parser.common;
+
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.Parser;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Provides a basic implementation of the {@link ChannelInfo} interface.
+ */
+public abstract class BaseChannelInfo implements ChannelInfo {
+    
+    /** The parser that owns this client. */
+    private final Parser parser;
+    
+    /** A map for random data associated with the client to be stored in. */
+    private final Map<Object, Object> map = new HashMap<Object, Object>();
+    
+    /** The clients in this channel. */
+    private final Map<String, ChannelClientInfo> clients = new HashMap<String, ChannelClientInfo>();
+    
+    /** The name of this channel. */
+    private final String name;
+
+    public BaseChannelInfo(final Parser parser, final String name) {
+        this.parser = parser;
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Map<Object, Object> getMap() {
+        return map;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Parser getParser() {
+        return parser;
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void sendMessage(final String message) {
+        parser.sendMessage(name, message);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void sendAction(final String action) {
+        parser.sendAction(name, action);
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public Collection<ChannelClientInfo> getChannelClients() {
+        return clients.values();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getChannelClientCount() {
+        return clients.size();
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public ChannelClientInfo getChannelClient(final String client) {
+        return getChannelClient(client, false);
+    }
+    
+    /**
+     * Adds a new client to this channel's user list.
+     *
+     * @param key The key to identify the client by
+     * @param client The client to be added
+     */
+    protected void addClient(final String key, final ChannelClientInfo client) {
+        clients.put(key, client);
+    }
+    
+    /**
+     * Removes an existing client from this channel's user list.
+     *
+     * @param key The key that the client is identified by
+     */
+    protected void removeClient(final String key) {
+        clients.remove(key);
+    }
+    
+    /**
+     * Retrieves the client identified by the specified key.
+     *
+     * @param key The key identifying the client to be retrieved
+     * @return The client corresponding to the give key
+     */
+    protected ChannelClientInfo getClient(final String key) {
+        return clients.get(key);
+    }
+
+}

src/com/dmdirc/parser/common/BaseClientInfo.java

@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.parser.common;
+
+import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.parser.interfaces.Parser;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Provides a basic implementation of the {@link ClientInfo} interface.
+ */
+public abstract class BaseClientInfo implements ClientInfo {
+
+    /** The parser that owns this client. */
+    private final Parser parser;
+
+    /** A map for random data associated with the client to be stored in. */
+    private final Map<Object, Object> map = new HashMap<Object, Object>();
+
+    /** The user's details. */
+    private String nick, user, host, realname = null;
+
+    /**
+     * Creates a new base client info for the specified parser with the
+     * specified details.
+     *
+     * @param parser The parser that owns this client info object
+     * @param nick The nickname of the user this object represents
+     * @param user The username of the user this object represents
+     * @param host The hostname of the user this object represents
+     */
+    public BaseClientInfo(final Parser parser, final String nick,
+            final String user, final String host) {
+        this.parser = parser;
+        this.nick = nick;
+        this.user = user;
+        this.host = host;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getNickname() {
+        return nick;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getUsername() {
+        return user;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getHostname() {
+        return host;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getRealname() {
+        return realname;
+    }
+
+    /**
+     * Sets the hostname of this user.
+     *
+     * @param host The new hostname
+     */
+    protected void setHostname(final String host) {
+        this.host = host;
+    }
+
+    /**
+     * Sets the nickname of this user.
+     *
+     * @param nick The new nickname
+     */
+    protected void setLocalNickname(final String nick) {
+        this.nick = nick;
+    }
+
+    /**
+     * Sets the realname of this user.
+     *
+     * @param realname The new realname
+     */
+    protected void setRealname(final String realname) {
+        this.realname = realname;
+    }
+
+    /**
+     * Sets the username of this user.
+     *
+     * @param user The new username
+     */
+    protected void setUsername(final String user) {
+        this.user = user;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Map<Object, Object> getMap() {
+        return map;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Parser getParser() {
+        return parser;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String toString() {
+        return getNickname();
+    }
+
+}

src/com/dmdirc/parser/common/BaseParser.java

@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.parser.common;
+
+import com.dmdirc.parser.interfaces.Parser;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Implements common base functionality for parsers.
+ */
+public abstract class BaseParser implements Parser {
+
+    /** The URI that this parser was constructed for. */
+    private final URI uri;
+
+    /** The ignore list for this parser. */
+    private IgnoreList ignoreList;
+
+    /** The ping timer interval for this parser. */
+    private long pingTimerInterval;
+
+    /** The ping timer fraction for this parser. */
+    private int pingTimerFraction;
+
+    /** The callback manager to use for this parser. */
+    private final CallbackManager callbackManager;
+
+    /** A map for callers to use to store things for no sane reason. */
+    private final Map<Object, Object> map = new HashMap<Object, Object>();
+
+    /**
+     * Creates a new base parser for the specified URI.
+     *
+     * @param uri The URI this parser will connect to.
+     * @param implementations A map of interface implementations for this parser
+     */
+    public BaseParser(final URI uri, final Map<Class<?>, Class<?>> implementations) {
+        this.uri = uri;
+        this.callbackManager = new CallbackManager(this, implementations);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public URI getURI() {
+        return uri;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public IgnoreList getIgnoreList() {
+        return ignoreList;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setIgnoreList(final IgnoreList ignoreList) {
+        this.ignoreList = ignoreList;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public long getPingTimerInterval() {
+        return pingTimerInterval;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setPingTimerInterval(final long newValue) {
+        pingTimerInterval = newValue;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getPingTimerFraction() {
+        return pingTimerFraction;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setPingTimerFraction(final int newValue) {
+        pingTimerFraction = newValue;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public CallbackManager getCallbackManager() {
+        return callbackManager;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Map<Object, Object> getMap() {
+        return map;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void joinChannel(final String channel) {
+        joinChannels(new ChannelJoinRequest(channel));
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void joinChannel(final String channel, final String key) {
+        joinChannels(new ChannelJoinRequest(channel, key));
+    }
+
+}

src/com/dmdirc/parser/common/BaseSocketAwareParser.java

@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.parser.common;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.URI;
+import java.util.Map;
+
+import javax.net.SocketFactory;
+
+/**
+ * A base parser which can construct a SocketFactory given socket-related
+ * options.
+ */
+public abstract class BaseSocketAwareParser extends BaseParser {
+    
+    /** The IP address or hostname that this parser's sockets should bind to. */
+    private String bindIp = null;
+    
+    /** The socket that was most recently created by this parser. */
+    private Socket socket;
+    
+    /** The local port that this parser's *most recently created* socket bound to. */
+    private int localPort = -1;
+
+    /**
+     * Creates a new base parser for the specified URI.
+     *
+     * @param uri The URI this parser will connect to.
+     * @param implementations A map of interface implementations for this parser
+     */
+    public BaseSocketAwareParser(final URI uri, final Map<Class<?>, Class<?>> implementations) {
+        super(uri, implementations);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getBindIP() {
+        return bindIp;
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void setBindIP(final String ip) {
+        bindIp = ip;
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public int getLocalPort() {
+        if (localPort == -1 && socket != null) {
+            // Try to update the local port from the socket, as it may have
+            // bound since the last time we tried
+            localPort = socket.getLocalPort();
+        }
+
+        return localPort;
+    }
+    
+    /**
+     * Convenience method to record the local port of the specified socket.
+     *
+     * @param socket The socket whose port is being recorded
+     * @return The socket reference passed in, for convenience
+     */
+    private Socket handleSocket(final Socket socket) {
+        // Store the socket as it might not have been bound yet
+        this.socket = socket;
+        this.localPort = socket.getLocalPort();
+
+        return socket;
+    }
+
+    /**
+     * Creates a socket factory that can be used by this parser.
+     *
+     * @return An appropriately configured socket factory
+     */
+    protected SocketFactory getSocketFactory() {
+        return new SocketFactory() {
+
+            /** {@inheritDoc} */
+            @Override
+            public Socket createSocket(final String host, final int port) throws IOException {
+                if (bindIp == null) {
+                    return handleSocket(new Socket(host, port));
+                } else {
+                    return handleSocket(new Socket(host, port, InetAddress.getByName(bindIp), 0));
+                }
+            }
+            
+            /** {@inheritDoc} */
+            @Override
+            public Socket createSocket(final InetAddress host, final int port) throws IOException {
+                if (bindIp == null) {
+                    return handleSocket(new Socket(host, port));
+                } else {
+                    return handleSocket(new Socket(host, port, InetAddress.getByName(bindIp), 0));
+                }
+            }
+
+            /** {@inheritDoc} */
+            @Override
+            public Socket createSocket(final String host, final int port,
+                    final InetAddress localHost, final int localPort) throws IOException {
+                return handleSocket(new Socket(host, port,
+                        bindIp == null ? localHost : InetAddress.getByName(bindIp), localPort));
+            }
+
+            /** {@inheritDoc} */
+            @Override
+            public Socket createSocket(final InetAddress address,
+                    final int port, final InetAddress localAddress,
+                    final int localPort) throws IOException {
+                return handleSocket(new Socket(address, port,
+                        bindIp == null ? localAddress : InetAddress.getByName(bindIp), localPort));
+            }
+            
+        };
+    }
+}

src/com/dmdirc/parser/common/CallbackManager.java

@@ -30,15 +30,12 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * IRC Parser Callback Manager.
+ * Parser Callback Manager.
  * Manages adding/removing/calling callbacks.
- *
- * @param <T> The type of parser which this manager managers callbacks for
- * @author            Shane Mc Cormack
  */
-public abstract class CallbackManager<T extends Parser> {
+public class CallbackManager {
 
-    static final Class[] CLASSES = {
+    private static final Class[] CLASSES = {
         AwayStateListener.class, OtherAwayStateListener.class,
         ChannelOtherAwayStateListener.class, ChannelActionListener.class,
         ChannelCtcpListener.class, ChannelCtcpReplyListener.class,
@@ -60,7 +57,7 @@ public abstract class CallbackManager<T extends Parser> {
         PingSuccessListener.class, PingSentListener.class,
         PrivateActionListener.class, PrivateCtcpListener.class,
         PrivateCtcpReplyListener.class, PrivateMessageListener.class,
-        PrivateNoticeListener.class, Post005Listener.class, QuitListener.class,
+        PrivateNoticeListener.class, QuitListener.class,
         ServerErrorListener.class, ServerReadyListener.class,
         SocketCloseListener.class, UnknownActionListener.class,
         UnknownCtcpListener.class, UnknownCtcpReplyListener.class,
@@ -74,12 +71,17 @@ public abstract class CallbackManager<T extends Parser> {
     private final Map<Class<? extends CallbackInterface>, CallbackObject> callbackHash
             = new HashMap<Class<? extends CallbackInterface>, CallbackObject>();
 
+    private final Map<Class<?>, Class<?>> implementationMap;
+
     /**
      * Constructor to create a CallbackManager.
      *
      * @param parser Parser that owns this callback manager.
+     * @param implementationMap A map of implementations to use
      */
-    protected CallbackManager(final T parser) {
+    public CallbackManager(final Parser parser, final Map<Class<?>, Class<?>> implementationMap) {
+        this.implementationMap = implementationMap;
+
         initialise(parser);
     }
 
@@ -88,7 +90,7 @@ public abstract class CallbackManager<T extends Parser> {
      *
      * @param parser The parser associated with this CallbackManager
      */
-    protected void initialise(final T parser) {
+    protected void initialise(final Parser parser) {
         for (Class<?> type : CLASSES) {
             if (type.isAnnotationPresent(SpecificCallback.class)) {
                 addCallbackType(getSpecificCallbackObject(parser, type));
@@ -105,7 +107,9 @@ public abstract class CallbackManager<T extends Parser> {
      * @param type The type of callback to create an object for
      * @return The relevant CallbackObject
      */
-    protected abstract CallbackObject getCallbackObject(T parser, Class<?> type);
+    protected CallbackObject getCallbackObject(final Parser parser, final Class<?> type) {
+        return new CallbackObject(parser, this, type.asSubclass(CallbackInterface.class), implementationMap);
+    }
 
     /**
      * Retrieves a relevant {@link CallbackObjectSpecific} for the specified type.
@@ -114,7 +118,9 @@ public abstract class CallbackManager<T extends Parser> {
      * @param type The type of callback to create an object for
      * @return The relevant CallbackObject
      */
-    protected abstract CallbackObjectSpecific getSpecificCallbackObject(T parser, Class<?> type);
+    protected CallbackObjectSpecific getSpecificCallbackObject(final Parser parser, final Class<?> type) {
+        return new CallbackObjectSpecific(parser, this, type.asSubclass(CallbackInterface.class), implementationMap);
+    }
 
     /**
      * Add new callback type.

src/com/dmdirc/parser/common/CallbackObject.java

@@ -39,12 +39,9 @@ import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
- * CallbackObject.
  * Superclass for all callback types.
- *
- * @author            Shane Mc Cormack
  */
-public abstract class CallbackObject {
+public class CallbackObject {
 
     /** The type of callback that this object is operating with. */
     protected final Class<? extends CallbackInterface> type;
@@ -57,7 +54,10 @@ public abstract class CallbackObject {
     protected Parser myParser;
 
     /** Reference to the CallbackManager in charge of this callback. */
-    protected CallbackManager<?> myManager;
+    protected CallbackManager myManager;
+    
+    /** A map of interfaces to their concrete implementations. */
+    private final Map<Class<?>, Class<?>> implementationMap;
 
     /**
      * Create a new instance of the Callback Object.
@@ -65,13 +65,17 @@ public abstract class CallbackObject {
      * @param parser Parser That owns this callback
      * @param manager CallbackManager that is in charge of this callback
      * @param type The type of callback to use
-     * @since 0.6.3m1
+     * @param implementationMap A map of interfaces to their parser-specific
+     * implementations
+     * @since 0.6.6
      */
-    public CallbackObject(final Parser parser, final CallbackManager<?> manager,
-            final Class<? extends CallbackInterface> type) {
+    public CallbackObject(final Parser parser, final CallbackManager manager,
+            final Class<? extends CallbackInterface> type,
+            final Map<Class<?>, Class<?>> implementationMap) {
         this.myParser = parser;
         this.myManager = manager;
         this.type = type;
+        this.implementationMap = implementationMap;
     }
 
     /**
@@ -305,6 +309,8 @@ public abstract class CallbackObject {
      * @param type The type to be instansiated
      * @return A concrete implementation of that type
      */
-    protected abstract Class<?> getImplementation(final Class<?> type);
+    protected Class<?> getImplementation(final Class<?> type) {
+        return implementationMap.containsKey(type) ? implementationMap.get(type) : type;
+    }
 
 }

src/com/dmdirc/parser/common/CallbackObjectSpecific.java

@@ -33,12 +33,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * CallbackObjectSpecific.
  * Superclass for all callback types that have a "specific" target.
- *
- * @author            Shane Mc Cormack
  */
-public abstract class CallbackObjectSpecific extends CallbackObject {
+public class CallbackObjectSpecific extends CallbackObject {
 
     /** Hashtable for storing specific information for callback. */
     protected final Map<CallbackInterface, String> specificData
@@ -50,11 +47,13 @@ public abstract class CallbackObjectSpecific extends CallbackObject {
      * @param parser Parser That owns this callback
      * @param manager CallbackManager that is in charge of this callback
      * @param type The type of callback to use
+     * @param implementationMap A map of interfaces to their parser-specific
      * @since 0.6.3m1
      */
-    public CallbackObjectSpecific(final Parser parser, final CallbackManager<?> manager,
-            final Class<? extends CallbackInterface> type) {
-        super(parser, manager, type);
+    public CallbackObjectSpecific(final Parser parser, final CallbackManager manager,
+            final Class<? extends CallbackInterface> type,
+            final Map<Class<?>, Class<?>> implementationMap) {
+        super(parser, manager, type, implementationMap);
     }
 
     /**
@@ -91,7 +90,9 @@ public abstract class CallbackObjectSpecific extends CallbackObject {
      * @param hostname The hostname to be parsed
      * @return The translated hostname
      */
-    protected abstract String translateHostname(final String hostname);
+    protected String translateHostname(final String hostname) {
+        return myParser.parseHostmask(hostname)[0];
+    }
 
     // We override the default add method to make sure that any add with no
     // specifics will have the specific data removed.

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

@@ -332,7 +332,7 @@ public interface Parser extends Runnable {
      *
      * @return This parser's callback manager
      */
-    CallbackManager<? extends Parser> getCallbackManager();
+    CallbackManager getCallbackManager();
 
     /**
      * Retrieves the latency between the parser and the server in milliseconds.

src/com/dmdirc/parser/interfaces/callbacks/Post005Listener.java

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-import java.util.Date;
-
-/**
- * Called after 001.
- */
-public interface Post005Listener extends CallbackInterface {
-
-    /**
-     * Called after 005.
-     *
-     * @param parser Reference to the parser object that made the callback.
-     * @param date The date/time at which the event occured
-     * @see com.dmdirc.parser.irc.Process001#callPost005
-     */
-    void onPost005(Parser parser, Date date);
-
-}

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

@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.parser.irc;
-
-import com.dmdirc.parser.common.CallbackManager;
-import com.dmdirc.parser.common.CallbackObject;
-import com.dmdirc.parser.common.CallbackObjectSpecific;
-import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
-
-/**
- * Handles callbacks for the IRC Parser.
- *
- * @author chris
- */
-public class IRCCallbackManager extends CallbackManager<IRCParser> {
-
-    public IRCCallbackManager(final IRCParser parser) {
-        super(parser);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected CallbackObject getCallbackObject(final IRCParser parser, final Class<?> type) {
-        return new IRCCallbackObject(parser, this, type.asSubclass(CallbackInterface.class));
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected CallbackObjectSpecific getSpecificCallbackObject(final IRCParser parser,
-            final Class<?> type) {
-        return new IRCCallbackObjectSpecific(parser, this,
-                type.asSubclass(CallbackInterface.class));
-    }
-
-}

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

@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.parser.irc;
-
-import com.dmdirc.parser.common.CallbackManager;
-import com.dmdirc.parser.common.CallbackObject;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.LocalClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A callback object for the IRC parser.
- *
- * @since 0.6.3m2
- * @author chris
- */
-public class IRCCallbackObject extends CallbackObject {
-
-    /**
-     * A map of interfaces to the classes which should be instansiated for them.
-     */
-    protected static final Map<Class<?>, Class<?>> IMPL_MAP
-            = new HashMap<Class<?>, Class<?>>();
-
-    static {
-        IMPL_MAP.put(ChannelClientInfo.class, IRCChannelClientInfo.class);
-        IMPL_MAP.put(ChannelInfo.class, IRCChannelInfo.class);
-        IMPL_MAP.put(ClientInfo.class, IRCClientInfo.class);
-        IMPL_MAP.put(LocalClientInfo.class, IRCClientInfo.class);
-    }
-
-    /**
-     * Creates a new IRC parser callback object.
-     *
-     * @param parser Parser this callback is owned by
-     * @param manager Manager callback is owned by
-     * @param type Callback type
-     */
-    public IRCCallbackObject(final Parser parser,
-            final CallbackManager<?> manager,
-            final Class<? extends CallbackInterface> type) {
-        super(parser, manager, type);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected Class<?> getImplementation(final Class<?> type) {
-        return IMPL_MAP.containsKey(type) ? IMPL_MAP.get(type) : type;
-    }
-
-}

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

@@ -29,8 +29,12 @@ import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.common.QueuePriority;
 import com.dmdirc.parser.common.SystemEncoder;
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Encoder;
 import com.dmdirc.parser.interfaces.EncodingParser;
+import com.dmdirc.parser.interfaces.LocalClientInfo;
 import com.dmdirc.parser.interfaces.SecureParser;
 import com.dmdirc.parser.interfaces.callbacks.*; //NOPMD
 import com.dmdirc.parser.irc.IRCReader.ReadLine;
@@ -85,6 +89,16 @@ public class IRCParser implements SecureParser, EncodingParser, Runnable {
     /** List Mode Queue Debug Information. */
     public static final int DEBUG_LMQ = 8;
     //public static final int DEBUG_SOMETHING = 16; //Next thingy
+    
+    /** A map of this parser's implementations of common interfaces. */
+    public static final Map<Class<?>, Class<?>> IMPL_MAP = new HashMap<Class<?>, Class<?>>();
+
+    static {
+        IMPL_MAP.put(ChannelClientInfo.class, IRCChannelClientInfo.class);
+        IMPL_MAP.put(ChannelInfo.class, IRCChannelInfo.class);
+        IMPL_MAP.put(ClientInfo.class, IRCClientInfo.class);
+        IMPL_MAP.put(LocalClientInfo.class, IRCClientInfo.class);
+    }
 
     /** Attempt to update user host all the time, not just on Who/Add/NickChange. */
     static final boolean ALWAYS_UPDATECLIENT = true;
@@ -218,7 +232,7 @@ public class IRCParser implements SecureParser, EncodingParser, Runnable {
     private IgnoreList myIgnoreList = new IgnoreList();
 
     /** Reference to the callback Manager. */
-    private final CallbackManager<IRCParser> myCallbackManager = new IRCCallbackManager(this);
+    private final CallbackManager myCallbackManager = new CallbackManager(this, IMPL_MAP);
     /** Reference to the Processing Manager. */
     private final ProcessingManager myProcessingManager = new ProcessingManager(this);
 
@@ -485,7 +499,9 @@ public class IRCParser implements SecureParser, EncodingParser, Runnable {
 
     /** {@inheritDoc} */
     @Override
-    public CallbackManager<IRCParser> getCallbackManager() { return myCallbackManager;    }
+    public CallbackManager getCallbackManager() {
+        return myCallbackManager;
+    }
 
     /**
      * Get a reference to the default TrustManager for SSL Sockets.
@@ -656,7 +672,7 @@ public class IRCParser implements SecureParser, EncodingParser, Runnable {
         if (!h005Info.containsKey("USERMODES")) { parseUserModes(); }
         if (!h005Info.containsKey("CHANMODES")) { parseChanModes(); }
 
-        return getCallbackManager().getCallbackType(Post005Listener.class).call();
+        return getCallbackManager().getCallbackType(ServerReadyListener.class).call();
     }
 
     //---------------------------------------------------------------------------

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

@@ -123,7 +123,7 @@ public abstract class IRCProcessor {
      *
      * @return Reference to the CallbackManager
      */
-    protected final CallbackManager<?> getCallbackManager() {
+    protected final CallbackManager getCallbackManager() {
         return myParser.getCallbackManager();
     }
 

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

@@ -23,7 +23,6 @@
 package com.dmdirc.parser.irc;
 
 import com.dmdirc.parser.common.ParserError;
-import com.dmdirc.parser.interfaces.callbacks.ServerReadyListener;
 
 /**
  * Process a 001 message.
@@ -66,7 +65,6 @@ public class Process001 extends IRCProcessor {
             }
         }
 
-        callServerReady();
         myParser.startPingTimer();
 
         final String channels = myParser.server.getChannels();
@@ -75,16 +73,6 @@ public class Process001 extends IRCProcessor {
         }
     }
 
-    /**
-     * Callback to all objects implementing the ServerReady Callback.
-     *
-     * @see IServerReady
-     * @return true if a method was called, false otherwise
-     */
-    protected boolean callServerReady() {
-        return getCallbackManager().getCallbackType(ServerReadyListener.class).call();
-    }
-
     /**
      * What does this IRCProcessor handle.
      *

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

@@ -33,8 +33,8 @@ import com.dmdirc.parser.interfaces.callbacks.ChannelKickListener;
 import com.dmdirc.parser.interfaces.callbacks.ConnectErrorListener;
 import com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener;
 import com.dmdirc.parser.interfaces.callbacks.NumericListener;
-import com.dmdirc.parser.interfaces.callbacks.Post005Listener;
 import com.dmdirc.parser.interfaces.callbacks.ServerErrorListener;
+import com.dmdirc.parser.interfaces.callbacks.ServerReadyListener;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -198,10 +198,10 @@ public class IRCParserTest {
     }
 
     @Test
-    public void testPost005() throws CallbackNotFoundException {
-        final Post005Listener test = mock(Post005Listener.class);
+    public void testServerReady() throws CallbackNotFoundException {
+        final ServerReadyListener test = mock(ServerReadyListener.class);
         final TestParser parser = new TestParser();
-        parser.getCallbackManager().addCallback(Post005Listener.class, test);
+        parser.getCallbackManager().addCallback(ServerReadyListener.class, test);
 
         final String[] strings = {
             "NOTICE AUTH :Blah, blah",
@@ -218,11 +218,11 @@ public class IRCParserTest {
         };
 
         for (String string : strings) {
-            verify(test, never()).onPost005((Parser) anyObject(), (Date) anyObject());
+            verify(test, never()).onServerReady((Parser) anyObject(), (Date) anyObject());
             parser.injectLine(string);
         }
 
-        verify(test).onPost005(same(parser), (Date) anyObject());
+        verify(test).onServerReady(same(parser), (Date) anyObject());
     }
 
     @Test