Merge pull request #726 from csmith/master

Rename Command to BaseCommand.

src/main/java/com/dmdirc/commandparser/aliases/AliasCommandHandler.java

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.aliases;
 
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
@@ -34,7 +35,7 @@ import javax.annotation.Nonnull;
 /**
  * {@link Command} implementation that handles an alias.
  */
-public class AliasCommandHandler extends Command {
+public class AliasCommandHandler extends BaseCommand {
 
     private final Alias alias;
 

src/main/java/com/dmdirc/commandparser/commands/BaseCommand.java

@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * 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.commandparser.commands;
+
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.events.CommandErrorEvent;
+import com.dmdirc.events.CommandOutputEvent;
+import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
+import com.dmdirc.ui.messages.IRCControlCodes;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * Represents a generic command.
+ */
+public abstract class BaseCommand extends Command {
+
+    /** The controller this command is associated with. */
+    private final CommandController controller;
+
+    public BaseCommand(final CommandController controller) {
+        this.controller = controller;
+    }
+
+    protected CommandController getController() {
+        return controller;
+    }
+
+    /**
+     * Sends an output line, if appropriate, to the specified target.
+     *
+     * @param target   The command window to send the line to
+     * @param isSilent Whether this command is being silenced or not
+     * @param message  The output to send
+     */
+    protected final void showOutput(@Nullable final WindowModel target,
+            final boolean isSilent, final String message) {
+        if (!isSilent && target != null) {
+            target.getEventBus().publishAsync(new CommandOutputEvent(target, message));
+        }
+    }
+
+    /**
+     * Sends an error line, if appropriate, to the specified target.
+     *
+     * @param target   The command window to send the line to
+     * @param isSilent Whether this command is being silenced or not
+     * @param message  The error message to send
+     */
+    protected final void showError(@Nullable final WindowModel target,
+            final boolean isSilent, final String message) {
+        if (!isSilent && target != null) {
+            target.getEventBus().publishAsync(new CommandErrorEvent(target, message));
+        }
+    }
+
+    /**
+     * Sends a usage line, if appropriate, to the specified target.
+     *
+     * @param target   The command window to send the line to
+     * @param isSilent Whether this command is being silenced or not
+     * @param name     The name of the command that's raising the error
+     * @param args     The arguments that the command accepts or expects
+     */
+    protected final void showUsage(@Nullable final WindowModel target,
+            final boolean isSilent, final String name, final String args) {
+        if (!isSilent && target != null) {
+            target.getEventBus().publishAsync(new CommandErrorEvent(target,
+                    "Usage: " + controller.getCommandChar() + name + ' ' + args));
+        }
+    }
+
+    /**
+     * Formats the specified data into a table suitable for output in the textpane. It is expected
+     * that each String[] in data has the same number of elements as the headers array.
+     *
+     * @param headers The headers of the table.
+     * @param data    The contents of the table.
+     *
+     * @return A string containing an ASCII table
+     */
+    protected static String doTable(final String[] headers, final String[][] data) {
+        final StringBuilder res = new StringBuilder();
+        res.append(IRCControlCodes.FIXED);
+        res.append(IRCControlCodes.BOLD);
+
+        final int[] maxsizes = new int[headers.length];
+
+        for (int i = 0; i < headers.length; i++) {
+            maxsizes[i] = headers[i].length() + 3;
+
+            for (String[] row : data) {
+                maxsizes[i] = Math.max(maxsizes[i], row[i].length() + 3);
+            }
+
+            doPadding(res, headers[i], maxsizes[i]);
+        }
+
+        for (String[] source : data) {
+            res.append('\n');
+            res.append(IRCControlCodes.FIXED);
+
+            for (int i = 0; i < source.length; i++) {
+                doPadding(res, source[i], maxsizes[i]);
+            }
+        }
+
+        return res.toString();
+    }
+
+    /**
+     * Adds the specified data to the stringbuilder, padding with spaces to the specified size.
+     *
+     * @param builder The stringbuilder to append data to
+     * @param data    The data to be added
+     * @param size    The minimum size that should be used
+     */
+    private static void doPadding(final StringBuilder builder, final String data,
+            final int size) {
+        builder.append(data);
+
+        for (int i = 0; i < size - data.length(); i++) {
+            builder.append(' ');
+        }
+    }
+
+}

src/main/java/com/dmdirc/commandparser/commands/Command.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2015 DMDirc Developers
+ * Copyright (c) 2006-2016 DMDirc Developers
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,129 +24,16 @@ package com.dmdirc.commandparser.commands;
 
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.events.CommandErrorEvent;
-import com.dmdirc.events.CommandOutputEvent;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.ui.messages.IRCControlCodes;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 /**
- * Represents a generic command.
+ * @deprecated Use {@link BaseCommand} directly.
  */
+@Deprecated
 public abstract class Command {
 
-    /** The controller this command is associated with. */
-    private final CommandController controller;
-
-    public Command(final CommandController controller) {
-        this.controller = controller;
-    }
-
-    protected CommandController getController() {
-        return controller;
-    }
-
-    /**
-     * Sends an output line, if appropriate, to the specified target.
-     *
-     * @param target   The command window to send the line to
-     * @param isSilent Whether this command is being silenced or not
-     * @param message  The output to send
-     */
-    protected final void showOutput(@Nullable final WindowModel target,
-            final boolean isSilent, final String message) {
-        if (!isSilent && target != null) {
-            target.getEventBus().publishAsync(new CommandOutputEvent(target, message));
-        }
-    }
-
-    /**
-     * Sends an error line, if appropriate, to the specified target.
-     *
-     * @param target   The command window to send the line to
-     * @param isSilent Whether this command is being silenced or not
-     * @param message  The error message to send
-     */
-    protected final void showError(@Nullable final WindowModel target,
-            final boolean isSilent, final String message) {
-        if (!isSilent && target != null) {
-            target.getEventBus().publishAsync(new CommandErrorEvent(target, message));
-        }
-    }
-
-    /**
-     * Sends a usage line, if appropriate, to the specified target.
-     *
-     * @param target   The command window to send the line to
-     * @param isSilent Whether this command is being silenced or not
-     * @param name     The name of the command that's raising the error
-     * @param args     The arguments that the command accepts or expects
-     */
-    protected final void showUsage(@Nullable final WindowModel target,
-            final boolean isSilent, final String name, final String args) {
-        if (!isSilent && target != null) {
-            target.getEventBus().publishAsync(new CommandErrorEvent(target,
-                    "Usage: " + controller.getCommandChar() + name + ' ' + args));
-        }
-    }
-
-    /**
-     * Formats the specified data into a table suitable for output in the textpane. It is expected
-     * that each String[] in data has the same number of elements as the headers array.
-     *
-     * @param headers The headers of the table.
-     * @param data    The contents of the table.
-     *
-     * @return A string containing an ASCII table
-     */
-    protected static String doTable(final String[] headers, final String[][] data) {
-        final StringBuilder res = new StringBuilder();
-        res.append(IRCControlCodes.FIXED);
-        res.append(IRCControlCodes.BOLD);
-
-        final int[] maxsizes = new int[headers.length];
-
-        for (int i = 0; i < headers.length; i++) {
-            maxsizes[i] = headers[i].length() + 3;
-
-            for (String[] row : data) {
-                maxsizes[i] = Math.max(maxsizes[i], row[i].length() + 3);
-            }
-
-            doPadding(res, headers[i], maxsizes[i]);
-        }
-
-        for (String[] source : data) {
-            res.append('\n');
-            res.append(IRCControlCodes.FIXED);
-
-            for (int i = 0; i < source.length; i++) {
-                doPadding(res, source[i], maxsizes[i]);
-            }
-        }
-
-        return res.toString();
-    }
-
-    /**
-     * Adds the specified data to the stringbuilder, padding with spaces to the specified size.
-     *
-     * @param builder The stringbuilder to append data to
-     * @param data    The data to be added
-     * @param size    The minimum size that should be used
-     */
-    private static void doPadding(final StringBuilder builder, final String data,
-            final int size) {
-        builder.append(data);
-
-        for (int i = 0; i < size - data.length(); i++) {
-            builder.append(' ');
-        }
-    }
-
     /**
      * Executes this command.
      *
@@ -157,6 +44,6 @@ public abstract class Command {
      * @since 0.6.4
      */
     public abstract void execute(@Nonnull WindowModel origin, CommandArguments args,
-            CommandContext context);
+                                 CommandContext context);
 
 }

src/main/java/com/dmdirc/commandparser/commands/channel/Ban.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
@@ -43,7 +43,7 @@ import javax.inject.Inject;
 /**
  * The kick command bans a specified user or host from the channel.
  */
-public class Ban extends Command implements IntelligentCommand {
+public class Ban extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("ban",

src/main/java/com/dmdirc/commandparser/commands/channel/Cycle.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
@@ -41,7 +41,7 @@ import javax.inject.Inject;
  * The cycle command allows users to rapidly part and rejoin a channel.
  */
 @CommandOptions(allowOffline = false)
-public class Cycle extends Command {
+public class Cycle extends BaseCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("cycle",

src/main/java/com/dmdirc/commandparser/commands/channel/Invite.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
@@ -45,7 +45,7 @@ import javax.inject.Inject;
  * @since 0.6.4
  */
 @CommandOptions(allowOffline = false)
-public class Invite extends Command implements ExternalCommand {
+public class Invite extends BaseCommand implements ExternalCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("invite",

src/main/java/com/dmdirc/commandparser/commands/channel/KickReason.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
@@ -38,17 +38,16 @@ import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
-import java.util.Optional;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
+import java.util.Optional;
 
 /**
  * The kick command kicks a specified user from the channel. This version allows the user to specify
  * a reason.
  */
 @CommandOptions(allowOffline = false)
-public class KickReason extends Command implements IntelligentCommand {
+public class KickReason extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("kick",

src/main/java/com/dmdirc/commandparser/commands/channel/Mode.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -47,8 +47,7 @@ import javax.inject.Inject;
  * The mode command allows the user to inspect and change channel modes.
  */
 @CommandOptions(allowOffline = false)
-public class Mode extends Command implements IntelligentCommand,
-        ExternalCommand {
+public class Mode extends BaseCommand implements IntelligentCommand, ExternalCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("mode",

src/main/java/com/dmdirc/commandparser/commands/channel/Names.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -45,8 +45,7 @@ import javax.inject.Inject;
  * Sends a names request.
  */
 @CommandOptions(allowOffline = false)
-public class Names extends Command implements IntelligentCommand,
-        ExternalCommand {
+public class Names extends BaseCommand implements IntelligentCommand, ExternalCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("names",

src/main/java/com/dmdirc/commandparser/commands/channel/Part.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
@@ -41,7 +41,7 @@ import javax.inject.Inject;
  * The part command parts the current channel with a specified part message.
  */
 @CommandOptions(allowOffline = false)
-public class Part extends Command {
+public class Part extends BaseCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("part",

src/main/java/com/dmdirc/commandparser/commands/channel/SetNickColour.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
@@ -40,15 +40,14 @@ import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.colours.Colour;
 
-import java.util.Optional;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
+import java.util.Optional;
 
 /**
  * Allows the user to set a nickname on the channel to use a custom colour.
  */
-public class SetNickColour extends Command implements IntelligentCommand {
+public class SetNickColour extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("setnickcolour",

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

@@ -27,7 +27,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
@@ -41,16 +41,15 @@ import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
 
-import java.util.Optional;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
+import java.util.Optional;
 
 /**
  * The show topic command shows the user the current topic.
  */
 @CommandOptions(allowOffline = false)
-public class ShowTopic extends Command implements ExternalCommand {
+public class ShowTopic extends BaseCommand implements ExternalCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("topic",

src/main/java/com/dmdirc/commandparser/commands/chat/Me.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.ValidatingCommand;
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
@@ -42,7 +42,7 @@ import javax.inject.Inject;
 /**
  * The me command sends a CTCP action to the current channel.
  */
-public class Me extends Command implements ValidatingCommand {
+public class Me extends BaseCommand implements ValidatingCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("me",

src/main/java/com/dmdirc/commandparser/commands/global/AliasCommand.java

@@ -29,7 +29,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.aliases.Alias;
 import com.dmdirc.commandparser.aliases.AliasFactory;
 import com.dmdirc.commandparser.aliases.AliasManager;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
@@ -37,15 +37,14 @@ import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
 
-import java.util.Optional;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
+import java.util.Optional;
 
 /**
  * The alias command allows users to create aliases on-the-fly.
  */
-public class AliasCommand extends Command implements IntelligentCommand {
+public class AliasCommand extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("alias",

src/main/java/com/dmdirc/commandparser/commands/global/AllServers.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
@@ -43,7 +43,7 @@ import javax.inject.Inject;
 /**
  * The AllServers command allows users to issue commands to all servers.
  */
-public class AllServers extends Command implements IntelligentCommand {
+public class AllServers extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("allservers",

src/main/java/com/dmdirc/commandparser/commands/global/Clear.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
@@ -39,7 +39,7 @@ import javax.inject.Inject;
 /**
  * The clear command clears the main text area of the current window.
  */
-public class Clear extends Command implements IntelligentCommand {
+public class Clear extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("clear",

src/main/java/com/dmdirc/commandparser/commands/global/Echo.java

@@ -27,7 +27,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.flags.CommandFlag;
@@ -40,6 +40,9 @@ import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
@@ -48,14 +51,10 @@ import java.util.Date;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-
 /**
  * The echo commands simply echos text to the current window.
  */
-public class Echo extends Command implements IntelligentCommand {
+public class Echo extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("echo",

src/main/java/com/dmdirc/commandparser/commands/global/Exit.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.LifecycleController;
@@ -39,7 +39,7 @@ import javax.inject.Inject;
  * The exit command allows the user to quit DMDirc with a custom quit message. When the client
  * quits, it disconnects all servers (with the quit message supplied) and saves the config file.
  */
-public class Exit extends Command {
+public class Exit extends BaseCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("exit",

src/main/java/com/dmdirc/commandparser/commands/global/Help.java

@@ -26,6 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
@@ -35,20 +36,19 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.IRCControlCodes;
 
+import javax.annotation.Nonnull;
+import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nonnull;
-import javax.inject.Inject;
-
 /**
  * The help command shows the user a list of available commands, along with their arguments, and a
  * description. It is context-aware, so channel commands are only displayed when in a channel
  * window, for example.
  */
-public class Help extends Command implements IntelligentCommand {
+public class Help extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("help",

src/main/java/com/dmdirc/commandparser/commands/global/Ifplugin.java

@@ -27,7 +27,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.parsers.CommandParser;
@@ -40,17 +40,16 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
 
-import java.util.Optional;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
+import java.util.Optional;
 
 /**
  * The if plugin command allows the user to execute commands based on whether or not a plugin is
  * loaded.
  */
-public class Ifplugin extends Command implements IntelligentCommand {
+public class Ifplugin extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("ifplugin",

src/main/java/com/dmdirc/commandparser/commands/global/LoadPlugin.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
@@ -36,15 +36,14 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.PluginMetaData;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
-import java.util.stream.Collectors;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
+import java.util.stream.Collectors;
 
 /**
  * Allows the user to load a plugin.
  */
-public class LoadPlugin extends Command implements IntelligentCommand {
+public class LoadPlugin extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("loadplugin",

src/main/java/com/dmdirc/commandparser/commands/global/NewServer.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.profiles.ProfileManager;
@@ -40,16 +40,15 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.util.InvalidURIException;
 import com.dmdirc.util.URIParser;
 
-import java.net.URI;
-import java.util.stream.Collectors;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
+import java.net.URI;
+import java.util.stream.Collectors;
 
 /**
  * The new server command allows users to open a new server window.
  */
-public class NewServer extends Command implements IntelligentCommand {
+public class NewServer extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("newserver",

src/main/java/com/dmdirc/commandparser/commands/global/OpenWindow.java

@@ -27,7 +27,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.GlobalConfig;
@@ -47,7 +47,7 @@ import java.util.Optional;
 /**
  * Opens a new window.
  */
-public class OpenWindow extends Command implements IntelligentCommand {
+public class OpenWindow extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("openwindow",

src/main/java/com/dmdirc/commandparser/commands/global/ReloadIdentities.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
@@ -40,7 +40,7 @@ import javax.inject.Inject;
 /**
  * Allows the user to reload identities.
  */
-public class ReloadIdentities extends Command implements IntelligentCommand {
+public class ReloadIdentities extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("reloadidentities",

src/main/java/com/dmdirc/commandparser/commands/global/ReloadPlugin.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
@@ -35,15 +35,14 @@ import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
-import java.util.stream.Collectors;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
+import java.util.stream.Collectors;
 
 /**
  * Allows the user to reload a plugin.
  */
-public class ReloadPlugin extends Command implements IntelligentCommand {
+public class ReloadPlugin extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("reloadplugin",

src/main/java/com/dmdirc/commandparser/commands/global/SaveConfig.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
@@ -40,7 +40,7 @@ import javax.inject.Inject;
 /**
  * Allows the user to save the config file.
  */
-public final class SaveConfig extends Command implements IntelligentCommand {
+public final class SaveConfig extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("saveconfig",

src/main/java/com/dmdirc/commandparser/commands/global/SetCommand.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
@@ -44,17 +44,16 @@ import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
-import java.util.List;
-import java.util.Optional;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
+import java.util.List;
+import java.util.Optional;
 
 /**
  * The set command allows the user to inspect and change global config settings.
  */
-public class SetCommand extends Command implements IntelligentCommand {
+public class SetCommand extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("set",

src/main/java/com/dmdirc/commandparser/commands/global/UnloadPlugin.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
@@ -35,15 +35,14 @@ import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
-import java.util.stream.Collectors;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
+import java.util.stream.Collectors;
 
 /**
  * Allows the user to unload a plugin.
  */
-public class UnloadPlugin extends Command implements IntelligentCommand {
+public class UnloadPlugin extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("unloadplugin",

src/main/java/com/dmdirc/commandparser/commands/server/AllChannels.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
@@ -44,7 +44,7 @@ import javax.inject.Inject;
 /**
  * The AllChannels command allows the user to issue a command to all channels on a server.
  */
-public class AllChannels extends Command implements IntelligentCommand {
+public class AllChannels extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("allchannels",

src/main/java/com/dmdirc/commandparser/commands/server/Away.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
@@ -41,7 +41,7 @@ import javax.inject.Inject;
  * The away command allows the user to set their away message.
  */
 @CommandOptions(allowOffline = false)
-public class Away extends Command {
+public class Away extends BaseCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("away",

src/main/java/com/dmdirc/commandparser/commands/server/Back.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
@@ -43,7 +43,7 @@ import javax.inject.Inject;
  * The back command allows the user to unset their away status.
  */
 @CommandOptions(allowOffline = false)
-public class Back extends Command implements IntelligentCommand {
+public class Back extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("back",

src/main/java/com/dmdirc/commandparser/commands/server/ChangeServer.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.events.CommandErrorEvent;
@@ -36,15 +36,14 @@ import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.util.InvalidURIException;
 import com.dmdirc.util.URIParser;
 
-import java.net.URI;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
+import java.net.URI;
 
 /**
  * The /server command allows the user to connect to a new server.
  */
-public class ChangeServer extends Command {
+public class ChangeServer extends BaseCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("server",

src/main/java/com/dmdirc/commandparser/commands/server/Ctcp.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
@@ -45,7 +45,7 @@ import javax.inject.Inject;
  * Allows the user to send CTCP messages.
  */
 @CommandOptions(allowOffline = false)
-public class Ctcp extends Command implements IntelligentCommand {
+public class Ctcp extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("ctcp",

src/main/java/com/dmdirc/commandparser/commands/server/Disconnect.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
@@ -39,7 +39,7 @@ import javax.inject.Inject;
 /**
  * The disconnect command disconnects from the current server.
  */
-public class Disconnect extends Command {
+public class Disconnect extends BaseCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("disconnect",

src/main/java/com/dmdirc/commandparser/commands/server/Ignore.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
@@ -37,18 +37,17 @@ import com.dmdirc.parser.common.IgnoreList;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import javax.annotation.Nonnull;
+import javax.inject.Inject;
 import java.util.List;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 import java.util.stream.Collectors;
 
-import javax.annotation.Nonnull;
-import javax.inject.Inject;
-
 /**
  * Allows the user to add/view/delete ignores.
  */
-public class Ignore extends Command implements IntelligentCommand {
+public class Ignore extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("ignore",

src/main/java/com/dmdirc/commandparser/commands/server/JoinChannelCommand.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
@@ -39,27 +39,24 @@ import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.messages.Styliser;
-
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
+import net.engio.mbassy.listener.Handler;
 
+import javax.annotation.Nonnull;
+import javax.annotation.concurrent.GuardedBy;
+import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import javax.annotation.Nonnull;
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
-import net.engio.mbassy.listener.Handler;
-
 /**
  * Allows the user to join channels.
  *
  * @since 0.6.3m1
  */
-public class JoinChannelCommand extends Command implements IntelligentCommand {
+public class JoinChannelCommand extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("join",

src/main/java/com/dmdirc/commandparser/commands/server/Message.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.WrappableCommand;
@@ -41,17 +41,15 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
-import java.util.Optional;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
+import java.util.Optional;
 
 /**
  * Allows the user to send privmsgs.
  */
 @CommandOptions(allowOffline = false)
-public class Message extends Command implements IntelligentCommand,
-        WrappableCommand {
+public class Message extends BaseCommand implements IntelligentCommand, WrappableCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("msg",

src/main/java/com/dmdirc/commandparser/commands/server/Nick.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
@@ -44,7 +44,7 @@ import javax.inject.Inject;
  * Allows the user to change nickname.
  */
 @CommandOptions(allowOffline = false)
-public class Nick extends Command implements IntelligentCommand {
+public class Nick extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("nick",

src/main/java/com/dmdirc/commandparser/commands/server/Notice.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
@@ -45,7 +45,7 @@ import javax.inject.Inject;
  * Allows the user to send notices.
  */
 @CommandOptions(allowOffline = false)
-public class Notice extends Command implements IntelligentCommand {
+public class Notice extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("notice",

src/main/java/com/dmdirc/commandparser/commands/server/OpenQuery.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.WrappableCommand;
@@ -47,7 +47,7 @@ import javax.inject.Inject;
  * Allows the user to open a query dialog with another user.
  */
 @CommandOptions(allowOffline = false)
-public class OpenQuery extends Command implements IntelligentCommand,
+public class OpenQuery extends BaseCommand implements IntelligentCommand,
         WrappableCommand {
 
     /** A command info object for this command. */

src/main/java/com/dmdirc/commandparser/commands/server/Raw.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
@@ -42,7 +42,7 @@ import javax.inject.Inject;
  * The raw command allows the user to send a raw line of text directly to the irc server.
  */
 @CommandOptions(allowOffline = false)
-public class Raw extends Command {
+public class Raw extends BaseCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("raw",

src/main/java/com/dmdirc/commandparser/commands/server/RawServerCommand.java

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
@@ -39,7 +39,7 @@ import javax.annotation.Nonnull;
  * Implements a raw server command (i.e., a command that is sent to the server as-is.
  */
 @CommandOptions(allowOffline = false)
-public class RawServerCommand extends Command implements CommandInfo {
+public class RawServerCommand extends BaseCommand implements CommandInfo {
 
     /** The name of this raw command. */
     private final String myName;

src/main/java/com/dmdirc/commandparser/commands/server/Reconnect.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
@@ -39,7 +39,7 @@ import javax.inject.Inject;
 /**
  * The reconnect command reconnects to the current server.
  */
-public class Reconnect extends Command {
+public class Reconnect extends BaseCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("reconnect",

src/main/java/com/dmdirc/commandparser/commands/server/Umode.java

@@ -27,7 +27,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
@@ -42,7 +42,7 @@ import javax.inject.Inject;
  * Allows the user to change user modes.
  */
 @CommandOptions(allowOffline = false)
-public class Umode extends Command {
+public class Umode extends BaseCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("umode",

src/main/java/com/dmdirc/commandparser/commands/server/Whois.java

@@ -27,7 +27,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
@@ -42,7 +42,7 @@ import javax.inject.Inject;
  * Requests information about another user on the server.
  */
 @CommandOptions(allowOffline = false)
-public class Whois extends Command {
+public class Whois extends BaseCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("whois",