Merge pull request #500 from csmith/master

Extend BaseCommand not Command.

audio/src/main/java/com/dmdirc/addons/audio/AudioCommand.java

 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.WindowModel;
 
-import java.io.File;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
+import java.io.File;
 
 /**
  * The Audio Command allows playing of audio files.
  */
-public class AudioCommand extends Command {
+public class AudioCommand extends BaseCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("audio",

audio/src/main/java/com/dmdirc/addons/audio/BeepCommand.java

 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.WindowModel;
 
-import java.awt.Toolkit;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
+import java.awt.*;
 
 /**
  * The Beep Command emits a beep
  */
-public class BeepCommand extends Command {
+public class BeepCommand extends BaseCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("beep",

calc/src/main/java/com/dmdirc/addons/calc/CalcCommand.java

 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.WindowModel;
 
-import java.text.ParseException;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
+import java.text.ParseException;
 
 /**
  * A command which allows users to evaluate various mathematical expressions, and perform basic
  * calculations.
  */
-public class CalcCommand extends Command {
+public class CalcCommand extends BaseCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("calc",

conditional_execute/src/main/java/com/dmdirc/addons/conditional_execute/ConditionalExecuteCommand.java

 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 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.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * The ConditionalExecute command allows the user to conditionally execute a command based on
  * external and pre-determined conditions.
  */
-public class ConditionalExecuteCommand extends Command {
+public class ConditionalExecuteCommand extends BaseCommand {
 
     /** A command info object for this command. */
     public static final BaseCommandInfo INFO = new BaseCommandInfo("conditionalexecute",

contactlist/src/main/java/com/dmdirc/addons/contactlist/ContactListCommand.java

 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;
 /**
  * Generates a contact list for the channel the command is used in.
  */
-public class ContactListCommand extends Command implements IntelligentCommand {
+public class ContactListCommand extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("contactlist",

dcc/src/main/java/com/dmdirc/addons/dcc/DCCCommand.java

 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;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.BackBufferFactory;
 
-import java.awt.Window;
-import java.io.File;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
+import java.awt.Window;
+import java.io.File;
 
 /**
  * This command allows starting dcc chats/file transfers.
  */
-public class DCCCommand extends Command implements IntelligentCommand {
+public class DCCCommand extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("dcc",

dcop/src/main/java/com/dmdirc/addons/dcop/DcopCommand.java

 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.WindowModel;
 
-import java.util.List;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
+import java.util.List;
 
 /**
  * The dcop command retrieves information from a dcop application.
  */
-public class DcopCommand extends Command {
+public class DcopCommand extends BaseCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("dcop",

debug/src/main/java/com/dmdirc/addons/debug/Debug.java

 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;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.annotation.Nonnull;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.annotation.Nonnull;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 /**
  * Provides various handy ways to test or debug the client.
  */
 @Singleton
-public class Debug extends Command implements IntelligentCommand {
+public class Debug extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("debug",

dns/src/main/java/com/dmdirc/addons/dns/DNSCommand.java

 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.WindowModel;
-
 import com.google.common.net.InetAddresses;
 
+import javax.annotation.Nonnull;
+import javax.inject.Inject;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import javax.annotation.Nonnull;
-import javax.inject.Inject;
-
 /**
  * Performs DNS lookups for nicknames, hostnames or IPs.
  */
-public class DNSCommand extends Command {
+public class DNSCommand extends BaseCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("dns",

exec/src/main/java/com/dmdirc/addons/exec/ExecCommand.java

 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 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.WindowModel;
 import com.dmdirc.util.CommandUtils;
 import com.dmdirc.util.LogUtils;
 import com.dmdirc.util.io.StreamUtils;
-
 import com.google.common.io.CharStreams;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nonnull;
+import javax.inject.Inject;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.List;
 
-import javax.annotation.Nonnull;
-import javax.inject.Inject;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * A command which allows users execute scripts.
  */
-public class ExecCommand extends Command {
+public class ExecCommand extends BaseCommand {
 
     private static final Logger LOG = LoggerFactory.getLogger(ExecCommand.class);
     /** A command info object for this command. */

freedesktop_notifications/src/main/java/com/dmdirc/addons/freedesktop_notifications/FDNotifyCommand.java

 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 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.WindowModel;
 /**
  * The FDNotify Command shows a nice popup on using the FreeDesktop VisualNotifications.
  */
-public final class FDNotifyCommand extends Command {
+public final class FDNotifyCommand extends BaseCommand {
 
     /** A command info object for this command. */
     public static final BaseCommandInfo INFO = new BaseCommandInfo("fdnotify",

logging/src/main/java/com/dmdirc/addons/logging/LoggingCommand.java

 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 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;
 /**
  * The logging command retrieves information from a dcop application.
  */
-public class LoggingCommand extends Command implements IntelligentCommand {
+public class LoggingCommand extends BaseCommand implements IntelligentCommand {
 
     /** Command name. */
     private static final String LOGGING = "logging";

nma/src/main/java/com/dmdirc/addons/nma/NotifyMyAndroidCommand.java

 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 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.WindowModel;
 import com.dmdirc.plugins.PluginDomain;
-
-import java.io.IOException;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
-
-import org.slf4j.LoggerFactory;
+import java.io.IOException;
 
 /**
  * Command to raise notifications with NotifyMyAndroid.
  */
-public class NotifyMyAndroidCommand extends Command {
+public class NotifyMyAndroidCommand extends BaseCommand {
 
     private static final org.slf4j.Logger LOG = LoggerFactory.
             getLogger(NotifyMyAndroidCommand.class);

notifications/src/main/java/com/dmdirc/addons/notifications/NotificationCommand.java

 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;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
-import java.util.Collection;
-
 import javax.annotation.Nonnull;
+import java.util.Collection;
 
 /**
  * Notification command, delegating notification to one of the registered notification commands as
  * preferred by the end user.
  */
-public class NotificationCommand extends Command implements
-        IntelligentCommand {
+public class NotificationCommand extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo(

nowplaying/src/main/java/com/dmdirc/addons/nowplaying/NowPlayingCommand.java

 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.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
+
+import javax.annotation.Nonnull;
+import javax.inject.Inject;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import javax.inject.Inject;
 
 /**
  * The now playing command retrieves the currently playing song from a variety of media players.
  */
-public class NowPlayingCommand extends Command implements IntelligentCommand {
+public class NowPlayingCommand extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("nowplaying",

osd/src/main/java/com/dmdirc/addons/osd/OsdCommand.java

 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 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;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.messages.StyledMessageUtils;
+
 import javax.annotation.Nonnull;
 
 /**
  * The osd command shows an on screen message.
  */
-public class OsdCommand extends Command implements IntelligentCommand {
+public class OsdCommand extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final BaseCommandInfo INFO = new BaseCommandInfo("osd",

osx_integration/src/main/java/com/dmdirc/addons/osx_integration/DockBounceCommand.java

 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 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.WindowModel;
 /**
  * A command to bounce the icon in the OSX dock.
  */
-public class DockBounceCommand extends Command {
+public class DockBounceCommand extends BaseCommand {
 
     /**
      * Information about this command.

parserdebug/src/main/java/com/dmdirc/addons/parserdebug/ParserDebugCommand.java

 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 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;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.parser.interfaces.Parser;
 
-import java.util.Optional;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
+import java.util.Optional;
 
 /**
  * The ParserDebug Command allows controlling of which parsers spam debug info.
  */
 @CommandOptions(allowOffline = false)
-public final class ParserDebugCommand extends Command {
+public final class ParserDebugCommand extends BaseCommand {
 
     /** A command info object for this command. */
     public static final BaseCommandInfo INFO = new BaseCommandInfo(

redirect/src/main/java/com/dmdirc/addons/redirect/RedirectCommand.java

 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 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.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
  * The redirect command allows the user to redirect the output from another command that would
  * normally echo results locally to a query or channel window instead.
  */
-public class RedirectCommand extends Command implements IntelligentCommand {
+public class RedirectCommand extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final BaseCommandInfo INFO = new BaseCommandInfo("redirect",

scriptplugin/src/main/java/com/dmdirc/addons/scriptplugin/ScriptCommand.java

 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;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.input.AdditionalTabTargets;
+
+import javax.annotation.Nonnull;
+import javax.inject.Inject;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Map;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import javax.inject.Inject;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
 
 /**
  * The Script Command allows controlling of the script plugin.
  */
-public class ScriptCommand extends Command implements IntelligentCommand {
+public class ScriptCommand extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("script",

systray/src/main/java/com/dmdirc/addons/systray/PopupCommand.java

 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 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.WindowModel;
 /**
  * The /popup command allows the user to show a popup message from the system tray icon.
  */
-public class PopupCommand extends Command {
+public class PopupCommand extends BaseCommand {
 
     /** A command info object for this command. */
     public static final BaseCommandInfo INFO = new BaseCommandInfo("popup",

time/src/main/java/com/dmdirc/addons/time/TimerCommand.java

 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;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.annotation.Nonnull;
+import javax.inject.Inject;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.annotation.Nonnull;
-import javax.inject.Inject;
-
 /**
  * The timer command allows users to schedule commands to occur after a certain interval, or to
  * repeatedly occur with a specified delay.
  */
-public class TimerCommand extends Command implements IntelligentCommand {
+public class TimerCommand extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("timer",

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/commands/ChannelSettings.java

 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;
  * Opens the channel settings window for the channel.
  */
 @CommandOptions(allowOffline = false)
-public class ChannelSettings extends Command implements IntelligentCommand {
+public class ChannelSettings extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("channelsettings",

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/commands/Input.java

 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;
  *
  * @since 0.6.4
  */
-public class Input extends Command implements IntelligentCommand {
+public class Input extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("input",

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/commands/PopInCommand.java

 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.WindowModel;
 /**
  * Command to pop in windows.
  */
-public class PopInCommand extends Command {
+public class PopInCommand extends BaseCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("popin",

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/commands/PopOutCommand.java

 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.WindowModel;
 /**
  * Command to pop out windows.
  */
-public class PopOutCommand extends Command {
+public class PopOutCommand extends BaseCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("popout",

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/commands/ServerSettings.java

 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;
  * Opens the server settings window for the server.
  */
 @CommandOptions(allowOffline = false)
-public class ServerSettings extends Command implements IntelligentCommand {
+public class ServerSettings extends BaseCommand implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("serversettings",

windowflashing/src/main/java/com/dmdirc/addons/windowflashing/FlashWindow.java

 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 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.WindowModel;
 /**
  * Command to flash an inactive window under Windows.
  */
-public class FlashWindow extends Command {
+public class FlashWindow extends BaseCommand {
 
     /** A command info object for this command. */
     public static final BaseCommandInfo INFO = new BaseCommandInfo(