Tidy up now child implementations are handled in BaseParser

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

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

@@ -29,7 +29,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * Implements common base functionality for parsers.
+ * Implements common base functionality for parsers.<p>
+ * Implementations of this class must be annotated with
+ * {@link ChildImplementations} to define the implementations to use for
+ * instances of {@link ClientInfo}, {@link ChannelInfo}, etc.
  */
 public abstract class BaseParser implements Parser {
 
@@ -55,10 +58,19 @@ public abstract class BaseParser implements Parser {
      * 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) {
+    public BaseParser(final URI uri) {
         this.uri = uri;
+
+        final Map<Class<?>, Class<?>> implementations
+                = new HashMap<Class<?>, Class<?>>();
+
+        for (Class<?> child : this.getClass().getAnnotation(ChildImplementations.class).value()) {
+            for (Class<?> iface : child.getInterfaces()) {
+                implementations.put(iface, child);
+            }
+        }
+
         this.callbackManager = new CallbackManager(this, implementations);
     }
 

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

@@ -26,7 +26,6 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.URI;
-import java.util.Map;
 
 import javax.net.SocketFactory;
 
@@ -49,10 +48,9 @@ public abstract class BaseSocketAwareParser extends BaseParser {
      * 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);
+    public BaseSocketAwareParser(final URI uri) {
+        super(uri);
     }
 
     /** {@inheritDoc} */

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

@@ -0,0 +1,44 @@
+/*
+ * 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.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Defines implementations of child classes for a parser.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface ChildImplementations {
+
+    /**
+     * Gets the class names of implementations for children of a parser.
+     *
+     * @return An array of child classes
+     */
+    Class[] value();
+
+}