Replace Server with Connection in some more places

Also allow subclasses in ActionComponentChains.

Change-Id: I90ae66664119d1306313166af920bb892a0ec69a
Reviewed-on: http://gerrit.dmdirc.com/2936
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/ChannelEventHandler.java

@@ -24,6 +24,7 @@ package com.dmdirc;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.common.CallbackManager;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
@@ -66,7 +67,7 @@ public class ChannelEventHandler extends EventHandler implements
 
     /** {@inheritDoc} */
     @Override
-    protected Server getServer() {
+    protected Connection getConnection() {
         return owner.getServer();
     }
 

src/com/dmdirc/EventHandler.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc;
 
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.common.CallbackManager;
@@ -39,7 +40,7 @@ public abstract class EventHandler implements CallbackInterface {
      * owner's parser.
      */
     public void registerCallbacks() {
-        final CallbackManager cbm = getServer().getParser().getCallbackManager();
+        final CallbackManager cbm = getConnection().getParser().getCallbackManager();
 
         try {
             for (Class<?> iface : this.getClass().getInterfaces()) {
@@ -57,8 +58,8 @@ public abstract class EventHandler implements CallbackInterface {
      * Unregisters all callbacks that have been registered by this event handler.
      */
     public void unregisterCallbacks() {
-        if (getServer().getParser() != null) {
-            getServer().getParser().getCallbackManager().delAllCallback(this);
+        if (getConnection().getParser() != null) {
+            getConnection().getParser().getCallbackManager().delAllCallback(this);
         }
     }
 
@@ -74,12 +75,12 @@ public abstract class EventHandler implements CallbackInterface {
             final CallbackManager cbm, final Class<T> type);
 
     /**
-     * Retrieves the server belonging to this EventHandler's owner.
+     * Retrieves the connection that this event handler is for.
      *
      * @since 0.6.3m1
-     * @return This EventHandler's expected server
+     * @return This EventHandler's expected connection.
      */
-    protected abstract Server getServer();
+    protected abstract Connection getConnection();
 
     /**
      * Checks that the specified parser is the same as the one the server is
@@ -89,11 +90,11 @@ public abstract class EventHandler implements CallbackInterface {
      * @param parser The parser to check
      */
     protected void checkParser(final Parser parser) {
-        if (parser != getServer().getParser()) {
+        if (parser != getConnection().getParser()) {
             parser.disconnect("Shouldn't be in use");
             throw new IllegalArgumentException("Event called from a parser that's not in use (#"
-                    + getServer().getStatus().getParserID(parser)
-                    + ").\n\n " + getServer().getStatus().getTransitionHistory());
+                    + getConnection().getStatus().getParserID(parser)
+                    + ").\n\n " + getConnection().getStatus().getTransitionHistory());
         }
     }
 

src/com/dmdirc/Invite.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc;
 
+import com.dmdirc.interfaces.Connection;
+
 import java.util.Date;
 
 import lombok.Getter;
@@ -32,8 +34,8 @@ import lombok.Getter;
 @SuppressWarnings("PMD.UnusedPrivateField")
 public class Invite {
 
-    /** The server this invite was on. */
-    private final Server server;
+    /** The connection this invite was on. */
+    private final Connection connection;
 
     /** The channel this invite is for. */
     @Getter
@@ -49,12 +51,12 @@ public class Invite {
     /**
      * Creates a new instance of Invite.
      *
-     * @param server The server that this invite was received for
+     * @param connection The connection that this invite was received on
      * @param channel The channel that this invite is for
      * @param source The source of this invite
      */
-    public Invite(final Server server, final String channel, final String source) {
-        this.server = server;
+    public Invite(final Connection connection, final String channel, final String source) {
+        this.connection = connection;
         this.channel = channel;
         this.source = source;
         this.timestamp = new Date().getTime();
@@ -67,20 +69,20 @@ public class Invite {
      * @see Server#parseHostmask(java.lang.String)
      */
     public String[] getSource() {
-        return server.parseHostmask(source);
+        return connection.parseHostmask(source);
     }
 
     /**
      * Join the channel that belongs to this invite.
      */
     public void accept() {
-        server.acceptInvites(this);
+        connection.acceptInvites(this);
     }
 
     /**
      * Decline this invite removing it from the invite list.
      */
     public void decline() {
-        server.removeInvite(this);
+        connection.removeInvite(this);
     }
 }

src/com/dmdirc/ServerEventHandler.java

@@ -24,6 +24,7 @@ package com.dmdirc;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.common.AwayState;
@@ -76,7 +77,7 @@ public class ServerEventHandler extends EventHandler implements
 
     /** {@inheritDoc} */
     @Override
-    protected Server getServer() {
+    protected Connection getConnection() {
         return owner;
     }
 

src/com/dmdirc/actions/ActionComponentChain.java

@@ -59,7 +59,7 @@ public class ActionComponentChain implements ActionComponent {
             if (component == null) {
                 throw new IllegalArgumentException("Component " + componentName
                         + " not found");
-            } else if (component.appliesTo() == current) {
+            } else if (component.appliesTo().isAssignableFrom(current)) {
                 components.add(component);
                 current = component.getType();
             } else {

src/com/dmdirc/actions/CoreActionComponent.java

@@ -25,7 +25,7 @@ package com.dmdirc.actions;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
-import com.dmdirc.Server;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.ui.Window;
@@ -52,10 +52,10 @@ public enum CoreActionComponent implements ActionComponent {
     SERVER_NAME {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object arg) { return ((Server) arg).getAddress(); }
+        public Object get(final Object arg) { return ((Connection) arg).getAddress(); }
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return Server.class; }
+        public Class<?> appliesTo() { return Connection.class; }
         /** {@inheritDoc} */
         @Override
         public Class<?> getType() { return String.class; }
@@ -69,10 +69,10 @@ public enum CoreActionComponent implements ActionComponent {
         /** {@inheritDoc} */
         @Override
         @ComponentOptions(requireConnected = true)
-        public Object get(final Object arg) { return ((Server) arg).getNetwork(); }
+        public Object get(final Object arg) { return ((Connection) arg).getNetwork(); }
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return Server.class; }
+        public Class<?> appliesTo() { return Connection.class; }
         /** {@inheritDoc} */
         @Override
         public Class<?> getType() { return String.class; }
@@ -89,10 +89,10 @@ public enum CoreActionComponent implements ActionComponent {
     SERVER_PROTOCOL {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object arg) { return ((Server) arg).getProtocol(); }
+        public Object get(final Object arg) { return ((Connection) arg).getProtocol(); }
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return Server.class; }
+        public Class<?> appliesTo() { return Connection.class; }
         /** {@inheritDoc} */
         @Override
         public Class<?> getType() { return String.class; }
@@ -105,10 +105,10 @@ public enum CoreActionComponent implements ActionComponent {
     SERVER_MYAWAYREASON {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object arg) { return ((Server) arg).getAwayMessage(); }
+        public Object get(final Object arg) { return ((Connection) arg).getAwayMessage(); }
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return Server.class; }
+        public Class<?> appliesTo() { return Connection.class; }
         /** {@inheritDoc} */
         @Override
         public Class<?> getType() { return String.class; }
@@ -122,10 +122,10 @@ public enum CoreActionComponent implements ActionComponent {
         /** {@inheritDoc} */
         @Override
         @ComponentOptions(requireConnected = true)
-        public Object get(final Object arg) { return ((Server) arg).getParser().getChannelUserModes(); }
+        public Object get(final Object arg) { return ((Connection) arg).getParser().getChannelUserModes(); }
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return Server.class; }
+        public Class<?> appliesTo() { return Connection.class; }
         /** {@inheritDoc} */
         @Override
         public Class<?> getType() { return String.class; }
@@ -140,7 +140,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         @ComponentOptions(requireConnected = true)
         public Object get(final Object arg) {
-            final Server server = (Server) arg;
+            final Connection server = (Connection) arg;
 
             if (server == null || server.getParser() == null) {
                 Logger.appError(ErrorLevel.LOW, "SERVER_MYNICKNAME.get() called with null element",
@@ -157,7 +157,7 @@ public enum CoreActionComponent implements ActionComponent {
         }
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return Server.class; }
+        public Class<?> appliesTo() { return Connection.class; }
         /** {@inheritDoc} */
         @Override
         public Class<?> getType() { return String.class; }
@@ -170,10 +170,10 @@ public enum CoreActionComponent implements ActionComponent {
     SERVER_PROFILE {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object arg) { return ((Server) arg).getProfile(); }
+        public Object get(final Object arg) { return ((Connection) arg).getProfile(); }
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return Server.class; }
+        public Class<?> appliesTo() { return Connection.class; }
         /** {@inheritDoc} */
         @Override
         public Class<?> getType() { return ConfigProvider.class; }
@@ -555,7 +555,7 @@ public enum CoreActionComponent implements ActionComponent {
         public Class<?> appliesTo() { return Window.class; }
         /** {@inheritDoc} */
         @Override
-        public Class<?> getType() { return Server.class; }
+        public Class<?> getType() { return Connection.class; }
         /** {@inheritDoc} */
         @Override
         public String getName() { return "server"; }

src/com/dmdirc/actions/metatypes/ServerEvents.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.actions.metatypes;
 
-import com.dmdirc.Server;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.actions.ActionMetaType;
 import com.dmdirc.parser.interfaces.ClientInfo;
 
@@ -32,23 +32,23 @@ import com.dmdirc.parser.interfaces.ClientInfo;
 public enum ServerEvents implements ActionMetaType {
 
     /** Server ping event type. */
-    SERVER_PING(new String[]{"server", "ping"}, Server.class, Long.class),
+    SERVER_PING(new String[]{"server", "ping"}, Connection.class, Long.class),
     /** Server numeric event type. */
-    SERVER_NUMERIC(new String[]{"server", "numeric", "arguments"}, Server.class, Integer.class, String[].class),
+    SERVER_NUMERIC(new String[]{"server", "numeric", "arguments"}, Connection.class, Integer.class, String[].class),
     /** Server event with argument. */
-    SERVER_EVENT_WITH_ARG(new String[]{"server", "message"}, Server.class, String.class),
+    SERVER_EVENT_WITH_ARG(new String[]{"server", "message"}, Connection.class, String.class),
     /** Server nick change. */
-    SERVER_NICKCHANGE(new String[]{"server", "old nickname", "new nickname"}, Server.class, String.class, String.class),
+    SERVER_NICKCHANGE(new String[]{"server", "old nickname", "new nickname"}, Connection.class, String.class, String.class),
     /** Server event, with source and argument. */
-    SERVER_SOURCED_EVENT_WITH_ARG(new String[]{"server", "user", "message"}, Server.class, ClientInfo.class, String.class),
+    SERVER_SOURCED_EVENT_WITH_ARG(new String[]{"server", "user", "message"}, Connection.class, ClientInfo.class, String.class),
     /** Server CTCP event. */
-    SERVER_CTCP_EVENT(new String[]{"server", "user", "type", "content"}, Server.class, ClientInfo.class, String.class, String.class),
+    SERVER_CTCP_EVENT(new String[]{"server", "user", "type", "content"}, Connection.class, ClientInfo.class, String.class, String.class),
     /** Server event with argument. */
-    SERVER_UNKNOWN_EVENT(new String[]{"server", "source", "target", "message"}, Server.class, String.class, String.class, String.class),
+    SERVER_UNKNOWN_EVENT(new String[]{"server", "source", "target", "message"}, Connection.class, String.class, String.class, String.class),
     /** Server invite event. */
-    SERVER_INVITE(new String[]{"server", "source", "channel"}, Server.class, ClientInfo.class, String.class),
+    SERVER_INVITE(new String[]{"server", "source", "channel"}, Connection.class, ClientInfo.class, String.class),
     /** Server event type. */
-    SERVER_EVENT(new String[]{"server"}, Server.class);
+    SERVER_EVENT(new String[]{"server"}, Connection.class);
 
     /** The names of the arguments for this meta type. */
     private String[] argNames;

src/com/dmdirc/actions/wrappers/PerformWrapper.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.actions.wrappers;
 
-import com.dmdirc.Server;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionComponentChain;
 import com.dmdirc.actions.ActionCondition;
@@ -33,6 +32,7 @@ import com.dmdirc.actions.ConditionTree;
 import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.CoreActionComponent;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.logger.ErrorLevel;
@@ -230,7 +230,7 @@ public class PerformWrapper extends ActionGroup {
 
         if (profile != null) {
             conditions.add(new ActionCondition(0,
-                    new ActionComponentChain(Server.class, PP_COMP_NAME, ActionManager.getActionManager()),
+                    new ActionComponentChain(Connection.class, PP_COMP_NAME, ActionManager.getActionManager()),
                     CoreActionComparison.STRING_EQUALS, profile));
         }
 

src/com/dmdirc/lists/GroupListManager.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.lists;
 
-import com.dmdirc.Server;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.GroupListEndListener;
@@ -48,8 +48,8 @@ public class GroupListManager implements GroupListStartListener,
     /** List of registered listeners. */
     private final ListenerList listenerList = new ListenerList();
 
-    /** The server to request group information from. */
-    private final Server server;
+    /** The connection to request group information from. */
+    private final Connection connection;
 
     /** The cached groups. */
     @Getter
@@ -65,10 +65,10 @@ public class GroupListManager implements GroupListStartListener,
     public void startSearch(final String searchTerm) {
         groups.clear();
 
-        server.getParser().getCallbackManager().addCallback(GroupListStartListener.class, this);
-        server.getParser().getCallbackManager().addCallback(GroupListEntryListener.class, this);
-        server.getParser().getCallbackManager().addCallback(GroupListEndListener.class, this);
-        server.getParser().requestGroupList(searchTerm);
+        connection.getParser().getCallbackManager().addCallback(GroupListStartListener.class, this);
+        connection.getParser().getCallbackManager().addCallback(GroupListEntryListener.class, this);
+        connection.getParser().getCallbackManager().addCallback(GroupListEndListener.class, this);
+        connection.getParser().requestGroupList(searchTerm);
     }
 
     /** {@inheritDoc} */
@@ -97,7 +97,7 @@ public class GroupListManager implements GroupListStartListener,
      * @param entry Group list entry to join
      */
     public void joinGroupListEntry(final GroupListEntry entry) {
-        server.join(new ChannelJoinRequest(entry.getName()));
+        connection.join(new ChannelJoinRequest(entry.getName()));
     }
 
     /**