Use @ChildImplementations

Change-Id: I7178085b05baaf1923f0d41e936c863e4f79a0aa
Depends-On: Ib43769c82b0a5ca1a0ac3bd6fd91e4105b0c2a87
Reviewed-on: http://gerrit.dmdirc.com/1992
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/addons/parser_msn/MSNParser.java

@@ -24,9 +24,9 @@ package com.dmdirc.addons.parser_msn;
 
 import com.dmdirc.parser.common.BaseParser;
 import com.dmdirc.parser.common.ChannelJoinRequest;
+import com.dmdirc.parser.common.ChildImplementations;
 import com.dmdirc.parser.common.DefaultStringConverter;
 import com.dmdirc.parser.common.QueuePriority;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.LocalClientInfo;
@@ -46,11 +46,12 @@ import net.sf.jml.impl.MsnMessengerFactory;
 /**
  * A parser which can understand the MSN protocol.
  */
+@ChildImplementations({
+    MSNClientInfo.class, MSNLocalClientInfo.class, MSNFakeChannel.class,
+    MSNChannelClientInfo.class
+})
 public class MSNParser extends BaseParser {
 
-    /** A map of this parser's implementations of common interfaces. */
-    private static final Map<Class<?>, Class<?>> IMPL_MAP
-            = new HashMap<Class<?>, Class<?>>();
     /** MSN Connection. */
     private MsnMessenger msn;
     /** A cache of known clients. */
@@ -61,21 +62,13 @@ public class MSNParser extends BaseParser {
     /** The fake channel to use is useFakeChannel is enabled. */
     private MSNFakeChannel fakeChannel;
 
-    /** Creates map of this parser's implementations of common interfaces. */
-    static {
-        IMPL_MAP.put(ClientInfo.class, MSNClientInfo.class);
-        IMPL_MAP.put(LocalClientInfo.class, MSNLocalClientInfo.class);
-        IMPL_MAP.put(ChannelInfo.class, MSNFakeChannel.class);
-        IMPL_MAP.put(ChannelClientInfo.class, MSNChannelClientInfo.class);
-    }
-
     /**
      * Creates a new parser for the specified address.
      *
      * @param address The address to connect to
      */
     public MSNParser(final URI address) {
-        super(address, IMPL_MAP);
+        super(address);
 
         useFakeChannel = address.getQuery().matches(
                 "(?i).*(^|&)showchannel($|&).*");

src/com/dmdirc/addons/parser_xmpp/XmppParser.java

@@ -25,12 +25,11 @@ package com.dmdirc.addons.parser_xmpp;
 import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.common.BaseSocketAwareParser;
 import com.dmdirc.parser.common.ChannelJoinRequest;
+import com.dmdirc.parser.common.ChildImplementations;
 import com.dmdirc.parser.common.DefaultStringConverter;
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.common.QueuePriority;
-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.StringConverter;
 import com.dmdirc.parser.interfaces.callbacks.AwayStateListener;
@@ -74,18 +73,12 @@ import org.jivesoftware.smackx.muc.MultiUserChat;
 /**
  * A parser which can understand the XMPP protocol.
  */
+@ChildImplementations({
+    XmppClientInfo.class, XmppLocalClientInfo.class, XmppFakeChannel.class,
+    XmppChannelClientInfo.class
+})
 public class XmppParser extends BaseSocketAwareParser {
 
-    /** A map of this parser's implementations of common interfaces. */
-    private static final Map<Class<?>, Class<?>> IMPL_MAP = new HashMap<Class<?>, Class<?>>();
-
-    static {
-        IMPL_MAP.put(ClientInfo.class, XmppClientInfo.class);
-        IMPL_MAP.put(LocalClientInfo.class, XmppLocalClientInfo.class);
-        IMPL_MAP.put(ChannelInfo.class, XmppFakeChannel.class);
-        IMPL_MAP.put(ChannelClientInfo.class, XmppChannelClientInfo.class);
-    }
-
     /** Pattern to use to extract priority. */
     private static final Pattern PRIORITY_PATTERN
             = Pattern.compile("(?i)(?:^|&)priority=([0-9]+)(?:$|&)");
@@ -114,7 +107,7 @@ public class XmppParser extends BaseSocketAwareParser {
      * @param address The address to connect to
      */
     public XmppParser(final URI address) {
-        super(address, IMPL_MAP);
+        super(address);
 
          if (address.getQuery() == null) {
             useFakeChannel = false;