Merge pull request #614 from csmith/tidying

Remove most deprecated methods in commands

res/com/dmdirc/ui/messages/format.yml

@@ -217,7 +217,6 @@ CommandOutputEvent:
 #  commandOutput=%1$s
 #  actionTooLong=Warning: action too long to be sent
 #  tabCompletion=14Multiple possibilities: %1$s
-#  commandUsage=7Usage: %1$s%2$s %3$s
 #  numeric_006=%4$s
 #  numeric_007=%4$s
 #  numeric_015=%4$s

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

@@ -50,9 +50,9 @@ public class AliasCommandHandler extends Command {
                 origin.getCommandParser().parseCommand(origin, getSubstituteCommand(line, args));
             }
         } else {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, alias.getName() + " requires at least "
+            showError(origin, args.isSilent(), alias.getName() + " requires at least "
                     + alias.getMinArguments() + " argument"
-                    + (alias.getMinArguments() == 1 ? "" : "s") + ".");
+                    + (alias.getMinArguments() == 1 ? "" : "s") + '.');
         }
     }
 
@@ -72,7 +72,7 @@ public class AliasCommandHandler extends Command {
 
         final String[] arguments = args.getArguments();
         for (int i = 0; i < arguments.length; i++) {
-            replaceAll(builder, "$" + (i + 1) + "-", args.getArgumentsAsString(i));
+            replaceAll(builder, "$" + (i + 1) + '-', args.getArgumentsAsString(i));
             replaceAll(builder, "$" + (i + 1), arguments[i]);
         }
 

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

@@ -24,6 +24,8 @@ 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.Styliser;
@@ -36,10 +38,6 @@ import javax.annotation.Nullable;
  */
 public abstract class Command {
 
-    /** The format name used for command output. */
-    protected static final String FORMAT_OUTPUT = "commandOutput";
-    /** The format name used for command errors. */
-    protected static final String FORMAT_ERROR = "commandError";
     /** The controller this command is associated with. */
     private final CommandController controller;
 
@@ -59,6 +57,7 @@ public abstract class Command {
      * @param type     The type of message to send
      * @param args     The arguments of the message
      */
+    @Deprecated
     protected final void sendLine(@Nullable final WindowModel target,
             final boolean isSilent, final String type, final Object... args) {
         if (!isSilent && target != null) {
@@ -66,6 +65,34 @@ public abstract class Command {
         }
     }
 
+    /**
+     * 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.
      *
@@ -76,9 +103,10 @@ public abstract class Command {
      */
     protected final void showUsage(@Nullable final WindowModel target,
             final boolean isSilent, final String name, final String args) {
-        sendLine(target, isSilent, "commandUsage",
-                controller.getCommandChar(),
-                name, args);
+        if (!isSilent && target != null) {
+            target.getEventBus().publishAsync(new CommandErrorEvent(target,
+                    "Usage: " + controller.getCommandChar() + name + ' ' + args));
+        }
     }
 
     /**

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

@@ -66,8 +66,7 @@ public class Invite extends Command implements ExternalCommand {
     public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length < 1) {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR,
-                    "Insufficient arguments: must specify user");
+            showError(origin, args.isSilent(), "Insufficient arguments: must specify user");
         } else {
             final GroupChat groupChat = ((ChannelCommandContext) context).getGroupChat();
             groupChat.getConnection().flatMap(Connection::getParser)
@@ -79,8 +78,7 @@ public class Invite extends Command implements ExternalCommand {
     public void execute(final WindowModel origin, final Connection connection,
             final String channel, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length < 1) {
-            sendLine(origin, isSilent, FORMAT_ERROR,
-                    "Insufficient arguments: must specify user");
+            showError(origin, isSilent,  "Insufficient arguments: must specify user");
         } else {
             connection.getParser().get().sendInvite(channel, args.getArgumentsAsString());
         }

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

@@ -82,8 +82,7 @@ public class KickReason extends Command implements IntelligentCommand {
                     ? Optional.of(args.getArgumentsAsString(1))
                     : Optional.empty());
         } else {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR,
-                    "User not found: " + args.getArguments()[0]);
+            showError(origin, args.isSilent(), "User not found: " + args.getArguments()[0]);
         }
     }
 

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

@@ -84,8 +84,8 @@ public class SetNickColour extends Command implements IntelligentCommand {
                 .getUser(args.getArguments()[0]));
 
         if (!target.isPresent()) {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, "No such nickname ("
-                    + args.getArguments()[0] + ")!");
+            showError(origin, args.isSilent(),
+                    "No such nickname (" + args.getArguments()[0] + ")!");
         } else if (args.getArguments().length == 1) {
             // We're removing the colour
             target.get().removeDisplayProperty(DisplayProperty.FOREGROUND_COLOUR);
@@ -95,8 +95,8 @@ public class SetNickColour extends Command implements IntelligentCommand {
             final Colour newColour = colourManagerFactory.getColourManager(origin.getConfigManager())
                     .getColourFromString(args.getArguments()[1], null);
             if (newColour == null) {
-                sendLine(origin, args.isSilent(), FORMAT_ERROR, "Invalid colour specified ("
-                        + args.getArguments()[1] + ").");
+                showError(origin, args.isSilent(),
+                        "Invalid colour specified (" + args.getArguments()[1] + ").");
                 return;
             }
 

src/com/dmdirc/commandparser/commands/flags/CommandFlagHandler.java

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.flags;
 
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.WindowModel;
 
 import java.util.ArrayList;
@@ -131,13 +132,13 @@ public class CommandFlagHandler {
                     }
                 } else if (disabledBy.containsKey(name)) {
                     // Disabled by another flag
-                    sendLine(origin, arguments.isSilent(), "commandError",
+                    sendError(origin, arguments.isSilent(),
                             "Cannot use flag --" + name
                             + " in conjunction with --" + disabledBy.get(name).getName());
                     return null;
                 } else {
                     // Disabled because not yet enabled
-                    sendLine(origin, arguments.isSilent(), "commandError",
+                    sendError(origin, arguments.isSilent(),
                             "Cannot use flag --" + name
                             + " without " + getEnablers(flag));
                     return null;
@@ -181,8 +182,8 @@ public class CommandFlagHandler {
         final int lastArg = argCount + offset - 1;
 
         if (arguments.getArguments().length <= lastArg) {
-            sendLine(origin, arguments.isSilent(),
-                    "commandError", "Flag --" + flag.getName() + " expects "
+            sendError(origin, arguments.isSilent(),
+                    "Flag --" + flag.getName() + " expects "
                     + argCount + " argument"
                     + (argCount == 1 ? "" : "s"));
             return -1;
@@ -244,17 +245,16 @@ public class CommandFlagHandler {
     }
 
     /**
-     * Convenience method to send a line to the specified frame container.
+     * Convenience method to send a command error event.
      *
-     * @param origin      The container to send the line to
+     * @param origin      The container to send the event to
      * @param isSilent    Whether the command is silenced or not
-     * @param messageType The type of the line to be sent
-     * @param args        The arguments for the specified messageType
+     * @param message     The error message
      */
-    protected static void sendLine(final WindowModel origin, final boolean isSilent,
-            final String messageType, final Object... args) {
+    private static void sendError(final WindowModel origin, final boolean isSilent,
+            final String message) {
         if (origin != null && !isSilent) {
-            origin.addLine(messageType, args);
+            origin.getEventBus().publishAsync(new CommandErrorEvent(origin, message));
         }
     }
 

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

@@ -88,11 +88,9 @@ public class AliasCommand extends Command implements IntelligentCommand {
         if ("--remove".equalsIgnoreCase(args.getArguments()[0])) {
             final String name = removeCommandChar(args.getArguments()[1]);
             if (doRemove(name)) {
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Alias '"
-                        + name + "' removed.");
+                showOutput(origin, args.isSilent(), "Alias '" + name + "' removed.");
             } else {
-                sendLine(origin, args.isSilent(), FORMAT_ERROR, "Alias '"
-                        + name + "' not found.");
+                showError(origin, args.isSilent(), "Alias '" + name + "' not found.");
             }
 
             return;
@@ -101,8 +99,7 @@ public class AliasCommand extends Command implements IntelligentCommand {
         final String name = removeCommandChar(args.getArguments()[0]);
 
         if (aliasManager.getAlias(name).isPresent()) {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Alias '" + name
-                    + "' already exists.");
+            showError(origin, args.isSilent(), "Alias '" + name + "' already exists.");
             return;
         }
 
@@ -110,7 +107,7 @@ public class AliasCommand extends Command implements IntelligentCommand {
                 removeCommandChar(args.getArgumentsAsString(1)));
         aliasManager.addAlias(myAlias);
 
-        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Alias '" + name + "' created.");
+        showOutput(origin, args.isSilent(), "Alias '" + name + "' created.");
     }
 
     /**

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

@@ -97,14 +97,14 @@ public class Echo extends Command implements IntelligentCommand {
             try {
                 time = new Date(Long.parseLong(results.getArgumentsAsString(timeStampFlag)));
             } catch (NumberFormatException ex) {
-                sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unable to process timestamp");
+                showError(origin, args.isSilent(), "Unable to process timestamp");
                 return;
             }
         }
 
         if (results.hasFlag(targetFlag)) {
             WindowModel frame = null;
-            Optional<WindowModel> target = Optional.ofNullable(origin);
+            Optional<WindowModel> target = Optional.of(origin);
 
             while (frame == null && target.isPresent()) {
                 frame = windowManager.findCustomWindow(target.get(),
@@ -117,8 +117,7 @@ public class Echo extends Command implements IntelligentCommand {
             }
 
             if (frame == null) {
-                sendLine(origin, args.isSilent(), FORMAT_ERROR,
-                        "Unable to find target window");
+                showError(origin, args.isSilent(), "Unable to find target window");
             } else if (!args.isSilent()) {
                 frame.getEventBus().publishAsync(new CommandOutputEvent(frame, time.getTime(),
                         results.getArgumentsAsString()));

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

@@ -87,14 +87,14 @@ public class Help extends Command implements IntelligentCommand {
 
         Collections.sort(commands);
 
-        sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
+        showOutput(origin, isSilent, Styliser.CODE_FIXED
                 + "----------------------- Available commands -------");
 
         final StringBuilder builder = new StringBuilder();
 
         for (String command : commands) {
             if (builder.length() + command.length() + 1 > 50) {
-                sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED + builder.toString());
+                showOutput(origin, isSilent, Styliser.CODE_FIXED + builder.toString());
                 builder.delete(0, builder.length());
             } else if (builder.length() > 0) {
                 builder.append(' ');
@@ -104,10 +104,10 @@ public class Help extends Command implements IntelligentCommand {
         }
 
         if (builder.length() > 0) {
-            sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED + builder.toString());
+            showOutput(origin, isSilent, Styliser.CODE_FIXED + builder.toString());
         }
 
-        sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
+        showOutput(origin, isSilent, Styliser.CODE_FIXED
                 + "--------------------------------------------------");
     }
 
@@ -129,17 +129,17 @@ public class Help extends Command implements IntelligentCommand {
         }
 
         if (command == null) {
-            sendLine(origin, isSilent, FORMAT_ERROR, "Command '" + name + "' not found.");
+            showError(origin, isSilent, "Command '" + name + "' not found.");
         } else {
-            sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
+            showOutput(origin, isSilent, Styliser.CODE_FIXED
                     + "---------------------- Command information -------");
-            sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
+            showOutput(origin, isSilent, Styliser.CODE_FIXED
                     + " Name: " + name);
-            sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
+            showOutput(origin, isSilent, Styliser.CODE_FIXED
                     + " Type: " + command.getKey().getType());
-            sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
+            showOutput(origin, isSilent, Styliser.CODE_FIXED
                     + "Usage: " + command.getKey().getHelp());
-            sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
+            showOutput(origin, isSilent, Styliser.CODE_FIXED
                     + "--------------------------------------------------");
         }
     }

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

@@ -78,21 +78,17 @@ public class LoadPlugin extends Command implements IntelligentCommand {
         final PluginInfo plugin = pluginManager.getPluginInfo(args.getArgumentsAsString());
 
         if (plugin == null) {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR,
-                    "Plugin loading failed");
+            showError(origin, args.isSilent(), "Plugin loading failed");
         } else if (plugin.isLoaded()) {
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
-                    "Plugin already loaded.");
+            showError(origin, args.isSilent(), "Plugin already loaded.");
         } else {
             plugin.loadPlugin();
             if (plugin.isLoaded()) {
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
-                        "Plugin loaded.");
+                showOutput(origin, args.isSilent(), "Plugin loaded.");
                 pluginManager.updateAutoLoad(plugin);
             } else {
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
-                        "Loading plugin failed. ("
-                        + plugin.getLastError() + ")");
+                showOutput(origin, args.isSilent(),
+                        "Loading plugin failed. (" + plugin.getLastError() + ')');
             }
         }
     }

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

@@ -91,7 +91,7 @@ public class OpenWindow extends Command implements IntelligentCommand {
         if (args.getArguments().length > 0 && "--server".equals(args.getArguments()[0])) {
             final Optional<Connection> connection = origin.getConnection();
             if (!connection.isPresent()) {
-                sendLine(origin, args.isSilent(), FORMAT_ERROR,
+                showError(origin, args.isSilent(),
                         "This window doesn't have an associated server.");
                 return;
             }
@@ -130,8 +130,7 @@ public class OpenWindow extends Command implements IntelligentCommand {
                     windowManager.addWindow(parent, newWindow);
                 }
             } else {
-                sendLine(origin, args.isSilent(), FORMAT_ERROR,
-                        "A custom window by that name already exists.");
+                showError(origin, args.isSilent(), "A custom window by that name already exists.");
             }
         }
     }

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

@@ -66,8 +66,7 @@ public class ReloadIdentities extends Command implements IntelligentCommand {
     public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         identityController.loadUserIdentities();
-
-        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Identities reloaded.");
+        showOutput(origin, args.isSilent(), "Identities reloaded.");
     }
 
     @Override

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

@@ -74,12 +74,12 @@ public class ReloadPlugin extends Command implements IntelligentCommand {
 
         final PluginInfo plugin = pluginManager.getPluginInfoByName(args.getArguments()[0]);
         if (plugin == null) {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR,
+            showError(origin, args.isSilent(),
                     "Plugin Reloading failed - Plugin not loaded");
         } else if (pluginManager.reloadPlugin(plugin.getMetaData().getRelativeFilename())) {
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Plugin Reloaded.");
+            showOutput(origin, args.isSilent(), "Plugin Reloaded.");
         } else {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Plugin Reloading failed");
+            showError(origin, args.isSilent(), "Plugin Reloading failed");
         }
     }
 

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

@@ -66,8 +66,7 @@ public final class SaveConfig extends Command implements IntelligentCommand {
     public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         identityController.saveAll();
-
-        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Configuration file saved.");
+        showOutput(origin, args.isSilent(), "Configuration file saved.");
     }
 
     @Override

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

@@ -118,8 +118,7 @@ public class SetCommand extends Command implements IntelligentCommand {
 
         if (res.hasFlag(serverFlag)) {
             if (!connection.isPresent()) {
-                sendLine(origin, args.isSilent(), FORMAT_ERROR,
-                        "Cannot use --server in this context");
+                showError(origin, args.isSilent(), "Cannot use --server in this context");
                 return;
             }
 
@@ -129,8 +128,7 @@ public class SetCommand extends Command implements IntelligentCommand {
 
         if (res.hasFlag(channelFlag)) {
             if (!(context instanceof ChannelCommandContext)) {
-                sendLine(origin, args.isSilent(), FORMAT_ERROR,
-                        "Cannot use --channel in this context");
+                showError(origin, args.isSilent(),"Cannot use --channel in this context");
                 return;
             }
 
@@ -193,7 +191,7 @@ public class SetCommand extends Command implements IntelligentCommand {
             output.append(", ");
         }
 
-        sendLine(origin, isSilent, FORMAT_OUTPUT, output.substring(0, output.length() - 2));
+        showOutput(origin, isSilent, output.substring(0, output.length() - 2));
     }
 
     /**
@@ -221,10 +219,9 @@ public class SetCommand extends Command implements IntelligentCommand {
         }
 
         if (found) {
-            sendLine(origin, isSilent, FORMAT_OUTPUT, output.substring(0, output.length() - 2));
+            showOutput(origin, isSilent, output.substring(0, output.length() - 2));
         } else {
-            sendLine(origin, isSilent, FORMAT_ERROR,
-                    "There are no options in the domain '" + domain + "'.");
+            showError(origin, isSilent, "There are no options in the domain '" + domain + "'.");
         }
     }
 
@@ -241,10 +238,10 @@ public class SetCommand extends Command implements IntelligentCommand {
             final boolean isSilent, final ReadOnlyConfigProvider manager,
             final String domain, final String option) {
         if (manager.hasOptionString(domain, option)) {
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "The current value of "
+            showOutput(origin, isSilent, "The current value of "
                     + domain + '.' + option + " is: " + manager.getOption(domain, option));
         } else {
-            sendLine(origin, isSilent, FORMAT_ERROR, "Option not found: " + domain + '.' + option);
+            showError(origin, isSilent, "Option not found: " + domain + '.' + option);
         }
     }
 
@@ -263,8 +260,7 @@ public class SetCommand extends Command implements IntelligentCommand {
             final String domain, final String option, final String newvalue) {
         identity.setOption(domain, option, newvalue);
 
-        sendLine(origin, isSilent, FORMAT_OUTPUT, domain + '.' + option
-                + " has been set to: " + newvalue);
+        showOutput(origin, isSilent, domain + '.' + option + " has been set to: " + newvalue);
     }
 
     /**
@@ -301,7 +297,7 @@ public class SetCommand extends Command implements IntelligentCommand {
             final String option) {
         identity.unsetOption(domain, option);
 
-        sendLine(origin, isSilent, FORMAT_OUTPUT, domain + '.' + option + " has been unset.");
+        showOutput(origin, isSilent, domain + '.' + option + " has been unset.");
     }
 
     @Override

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

@@ -74,13 +74,13 @@ public class UnloadPlugin extends Command implements IntelligentCommand {
 
         final PluginInfo plugin = pluginManager.getPluginInfoByName(args.getArguments()[0]);
         if (plugin == null) {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR,
+            showError(origin, args.isSilent(),
                     "Plugin unloading failed - Plugin not loaded");
         } else if (pluginManager.delPlugin(plugin.getMetaData().getRelativeFilename())) {
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Plugin Unloaded.");
+            showOutput(origin, args.isSilent(), "Plugin Unloaded.");
             pluginManager.updateAutoLoad(plugin);
         } else {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Plugin Unloading failed");
+            showError(origin, args.isSilent(), "Plugin Unloading failed");
         }
     }
 

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

@@ -71,23 +71,22 @@ public class Ignore extends Command implements IntelligentCommand {
         final Connection connection = ((ServerCommandContext) context).getConnection();
 
         if (args.getArguments().length == 0) {
-            executeView(origin, connection, args.isSilent(), args, false);
+            executeView(origin, connection, args, false);
         } else if ("--remove".equalsIgnoreCase(args.getArguments()[0])) {
-            executeRemove(origin, connection, args.isSilent(), args);
+            executeRemove(origin, connection, args);
         } else if ("--regex".equalsIgnoreCase(args.getArguments()[0])) {
-            executeRegex(origin, connection, args.isSilent(), args);
+            executeRegex(origin, connection, args);
         } else {
-            executeAdd(origin, connection, args.isSilent(), args);
+            executeAdd(origin, connection, args);
         }
     }
 
     protected void executeView(final WindowModel origin, final Connection connection,
-            final boolean isSilent, final CommandArguments args, final boolean forceRegex) {
+            final CommandArguments args, final boolean forceRegex) {
         final IgnoreList ignoreList = connection.getIgnoreList();
 
         if (ignoreList.count() == 0) {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR,
-                    "No ignore list entries for this network.");
+            showError(origin, args.isSilent(), "No ignore list entries for this network.");
             return;
         }
 
@@ -96,7 +95,7 @@ public class Ignore extends Command implements IntelligentCommand {
             entries = ignoreList.getSimpleList();
         } else {
             if (!forceRegex) {
-                sendLine(origin, args.isSilent(), FORMAT_ERROR,
+                showError(origin, args.isSilent(),
                         "Unable to convert ignore list to simple format");
             }
             entries = ignoreList.getRegexList();
@@ -105,24 +104,24 @@ public class Ignore extends Command implements IntelligentCommand {
         int i = 0;
         for (String line : entries) {
             i++;
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, i + ". " + line);
+            showOutput(origin, args.isSilent(), i + ". " + line);
         }
     }
 
     protected void executeAdd(final WindowModel origin, final Connection connection,
-            final boolean isSilent, final CommandArguments args) {
+            final CommandArguments args) {
         final IgnoreList ignoreList = connection.getIgnoreList();
         final String target = args.getArgumentsAsString();
 
         ignoreList.addSimple(target);
         connection.saveIgnoreList();
-        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Added " + target + " to the ignore list.");
+        showOutput(origin, args.isSilent(), "Added " + target + " to the ignore list.");
     }
 
     protected void executeRegex(final WindowModel origin, final Connection connection,
-            final boolean isSilent, final CommandArguments args) {
+            final CommandArguments args) {
         if (args.getArguments().length == 1) {
-            executeView(origin, connection, args.isSilent(), args, true);
+            executeView(origin, connection, args, true);
             return;
         }
 
@@ -133,18 +132,17 @@ public class Ignore extends Command implements IntelligentCommand {
             //noinspection ResultOfMethodCallIgnored
             Pattern.compile(target);
         } catch (PatternSyntaxException ex) {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unable to compile regex: "
-                    + ex.getDescription());
+            showError(origin, args.isSilent(), "Unable to compile regex: " + ex.getDescription());
             return;
         }
 
         ignoreList.add(target);
         connection.saveIgnoreList();
-        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Added " + target + " to the ignore list.");
+        showOutput(origin, args.isSilent(), "Added " + target + " to the ignore list.");
     }
 
     protected void executeRemove(final WindowModel origin, final Connection connection,
-            final boolean isSilent, final CommandArguments args) {
+            final CommandArguments args) {
         if (args.getArguments().length == 1) {
             showUsage(origin, args.isSilent(), "ignore", "--remove <host>");
             return;
@@ -156,7 +154,7 @@ public class Ignore extends Command implements IntelligentCommand {
         if (ignoreList.canConvert() && ignoreList.getSimpleList().contains(host)) {
             ignoreList.remove(ignoreList.getSimpleList().indexOf(host));
             connection.saveIgnoreList();
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Removed " + host
+            showOutput(origin, args.isSilent(), "Removed " + host
                     + " from the ignore list.");
             return;
         }
@@ -164,13 +162,12 @@ public class Ignore extends Command implements IntelligentCommand {
         if (ignoreList.getRegexList().contains(host)) {
             ignoreList.remove(ignoreList.getRegexList().indexOf(host));
             connection.saveIgnoreList();
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Removed " + host
+            showOutput(origin, args.isSilent(), "Removed " + host
                     + " from the ignore list.");
             return;
         }
 
-        sendLine(origin, args.isSilent(), FORMAT_ERROR, "Ignore list doesn't contain '" + host
-                + "'.");
+        showError(origin, args.isSilent(), "Ignore list doesn't contain '" + host + "'.");
     }
 
     @Override

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

@@ -94,8 +94,7 @@ public class Message extends Command implements IntelligentCommand,
                     // This can happen if the server gets disconnected after
                     // the command manager has checked the @CommandOptions
                     // annotation. Yay for concurrency.
-                    sendLine(origin, args.isSilent(), FORMAT_ERROR,
-                            "You must be connected to use this command");
+                    showError(origin, args.isSilent(), "You must be connected to use this command");
                 }
             }
         }

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

@@ -75,7 +75,7 @@ public class OpenQuery extends Command implements IntelligentCommand,
 
         final Connection connection = ((ServerCommandContext) context).getConnection();
         if (connection.getParser().get().isValidChannelName(args.getArguments()[0])) {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, "You can't open a query "
+            showError(origin, args.isSilent(), "You can't open a query "
                     + "with a channel; maybe you meant " + Styliser.CODE_FIXED
                     + Styliser.CODE_BOLD
                     + getController().getCommandChar()

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

@@ -64,7 +64,7 @@ public class Umode extends Command {
             final CommandArguments args, final CommandContext context) {
         final Connection connection = ((ServerCommandContext) context).getConnection();
         if (connection.getState() != ServerState.CONNECTED) {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Not connected");
+            showError(origin, args.isSilent(), "Not connected");
             return;
         }
 

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

@@ -63,7 +63,7 @@ public class Whois extends Command {
             final CommandArguments args, final CommandContext context) {
         final Connection connection = ((ServerCommandContext) context).getConnection();
         if (connection.getState() != ServerState.CONNECTED) {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Not connected");
+            showError(origin, args.isSilent(), "Not connected");
             return;
         }
 

test/com/dmdirc/commandparser/aliases/AliasCommandHandlerTest.java

@@ -22,20 +22,25 @@
 
 package com.dmdirc.commandparser.aliases;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.WindowModel;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -47,6 +52,8 @@ public class AliasCommandHandlerTest {
     @Mock private CommandParser commandParser;
     @Mock private CommandContext context;
     @Mock private CommandInfo commandInfo;
+    @Mock private DMDircMBassador eventbus;
+    @Captor private ArgumentCaptor<CommandErrorEvent> errorEventCaptor;
 
     @Before
     public void setup() {
@@ -55,6 +62,7 @@ public class AliasCommandHandlerTest {
         when(commandController.getSilenceChar()).thenReturn('/');
         when(context.getSource()).thenReturn(container);
         when(context.getCommandInfo()).thenReturn(commandInfo);
+        when(container.getEventBus()).thenReturn(eventbus);
     }
 
     @Test
@@ -82,7 +90,9 @@ public class AliasCommandHandlerTest {
         final AliasCommandHandler handler = new AliasCommandHandler(commandController, alias);
         final CommandArguments arguments = new CommandArguments(commandController, "#test");
         handler.execute(container, arguments, context);
-        verify(container).addLine("commandError", "test requires at least 1 argument.");
+        verify(eventbus).publishAsync(errorEventCaptor.capture());
+        assertEquals("test requires at least 1 argument.",
+                errorEventCaptor.getValue().getMessage());
     }
 
     @Test
@@ -91,7 +101,9 @@ public class AliasCommandHandlerTest {
         final AliasCommandHandler handler = new AliasCommandHandler(commandController, alias);
         final CommandArguments arguments = new CommandArguments(commandController, "#test agadoo");
         handler.execute(container, arguments, context);
-        verify(container).addLine("commandError", "test requires at least 2 arguments.");
+        verify(eventbus).publishAsync(errorEventCaptor.capture());
+        assertEquals("test requires at least 2 arguments.",
+                errorEventCaptor.getValue().getMessage());
     }
 
     @Test

test/com/dmdirc/commandparser/commands/channel/BanTest.java

@@ -23,8 +23,10 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
+import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChatUser;
@@ -39,9 +41,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Mockito.anyChar;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.eq;
+import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -55,6 +55,7 @@ public class BanTest {
     @Mock private Channel channel;
     @Mock private CommandController controller;
     @Mock private WindowModel container;
+    @Mock private DMDircMBassador eventbus;
     private Ban command;
 
     @Before
@@ -67,6 +68,7 @@ public class BanTest {
         when(channel.getUser(user2)).thenReturn(Optional.empty());
         when(controller.getCommandChar()).thenReturn('/');
         when(controller.getSilenceChar()).thenReturn('.');
+        when(container.getEventBus()).thenReturn(eventbus);
         command = new Ban(controller);
     }
 
@@ -75,7 +77,7 @@ public class BanTest {
         command.execute(container, new CommandArguments(controller, "/ban"),
                 new ChannelCommandContext(null, Ban.INFO, channel));
 
-        verify(container).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
+        verify(eventbus).publishAsync(isA(CommandErrorEvent.class));
     }
 
     /** Tests that the ban command uses the correct hostname if given a user. */

test/com/dmdirc/commandparser/commands/channel/KickReasonTest.java

@@ -23,8 +23,10 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
+import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChatUser;
@@ -38,13 +40,13 @@ import java.util.Optional;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Mockito.anyChar;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.matches;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -58,8 +60,10 @@ public class KickReasonTest {
     @Mock private Channel channel;
     @Mock private CommandController controller;
     @Mock private WindowModel container;
+    @Mock private DMDircMBassador eventbus;
     @Mock private ChannelInfo channelInfo;
     @Mock private AggregateConfigProvider configProvider;
+    @Captor private ArgumentCaptor<CommandErrorEvent> errorEventCaptor;
     private KickReason command;
 
     @Before
@@ -75,6 +79,7 @@ public class KickReasonTest {
         when(channel.getUser(user2)).thenReturn(Optional.empty());
         when(controller.getCommandChar()).thenReturn('/');
         when(controller.getSilenceChar()).thenReturn('.');
+        when(container.getEventBus()).thenReturn(eventbus);
         command = new KickReason(controller);
     }
 
@@ -82,8 +87,7 @@ public class KickReasonTest {
     public void testUsage() {
         command.execute(container, new CommandArguments(controller, "/kick"),
                 new ChannelCommandContext(null, KickReason.INFO, channel));
-
-        verify(container).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
+        verify(eventbus).publishAsync(isA(CommandErrorEvent.class));
     }
 
     @Test
@@ -91,7 +95,8 @@ public class KickReasonTest {
         command.execute(container, new CommandArguments(controller, "/kick user1"),
                 new ChannelCommandContext(null, KickReason.INFO, channel));
 
-        verify(container).addLine(eq("commandError"), matches(".*user1"));
+        verify(eventbus).publishAsync(errorEventCaptor.capture());
+        assertTrue(errorEventCaptor.getValue().getMessage().matches(".*user1"));
     }
 
     @Test

test/com/dmdirc/commandparser/commands/channel/SetNickColourTest.java

@@ -22,8 +22,10 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
+import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
@@ -39,12 +41,14 @@ import java.util.Optional;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.anyChar;
-import static org.mockito.Mockito.anyString;
+import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -62,6 +66,8 @@ public class SetNickColourTest {
     @Mock private ColourManager colourManager;
     @Mock private CommandController controller;
     @Mock private WindowModel tiw;
+    @Mock private DMDircMBassador eventbus;
+    @Captor private ArgumentCaptor<CommandErrorEvent> errorEventCaptor;
     private SetNickColour command;
 
     @Before
@@ -76,14 +82,14 @@ public class SetNickColourTest {
         when(channel.getUser(user2)).thenReturn(Optional.empty());
         when(colourManagerFactory.getColourManager(any())).thenReturn(colourManager);
         when(colourManager.getColourFromString(eq("4"), any())).thenReturn(Colour.RED);
+        when(tiw.getEventBus()).thenReturn(eventbus);
     }
 
     @Test
     public void testUsageNoArgs() {
         command.execute(tiw, new CommandArguments(controller, "/foo"),
                 new ChannelCommandContext(null, SetNickColour.INFO, channel));
-
-        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
+        verify(eventbus).publishAsync(isA(CommandErrorEvent.class));
     }
 
     @Test
@@ -100,15 +106,16 @@ public class SetNickColourTest {
                 new ChannelCommandContext(null, SetNickColour.INFO, channel));
         verify(channel, never()).refreshClients();
         verify(groupChatUser, never()).removeDisplayProperty(DisplayProperty.FOREGROUND_COLOUR);
-        verify(tiw).addLine(eq("commandError"), eq("No such nickname (foo)!"));
+        verify(eventbus).publishAsync(errorEventCaptor.capture());
+        assertEquals("No such nickname (foo)!", errorEventCaptor.getValue().getMessage());
     }
 
     @Test
     public void testUsageInvalidColour() {
         command.execute(tiw, new CommandArguments(controller, "/foo moo omg"),
                 new ChannelCommandContext(null, SetNickColour.INFO, channel));
-
-        verify(tiw).addLine(eq("commandError"), eq("Invalid colour specified (omg)."));
+        verify(eventbus).publishAsync(errorEventCaptor.capture());
+        assertEquals("Invalid colour specified (omg).", errorEventCaptor.getValue().getMessage());
     }
 
     @Test

test/com/dmdirc/commandparser/commands/chat/MeTest.java

@@ -21,8 +21,10 @@
  */
 package com.dmdirc.commandparser.commands.chat;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
+import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.Chat;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.WindowModel;
@@ -33,9 +35,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Mockito.anyChar;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.eq;
+import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -44,12 +44,14 @@ public class MeTest {
 
     @Mock private Chat chat;
     @Mock private WindowModel frameContainer;
+    @Mock private DMDircMBassador eventbus;
     @Mock private CommandController controller;
     private Me command;
 
     @Before
     public void setUp() {
         when(chat.getWindowModel()).thenReturn(frameContainer);
+        when(frameContainer.getEventBus()).thenReturn(eventbus);
         command = new Me(controller);
     }
 
@@ -57,8 +59,7 @@ public class MeTest {
     public void testUsage() {
         command.execute(frameContainer, new CommandArguments(controller, "/foo"),
                 new ChatCommandContext(null, Me.INFO, chat));
-
-        verify(frameContainer).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
+        verify(eventbus).publishAsync(isA(CommandErrorEvent.class));
     }
 
     @Test

test/com/dmdirc/commandparser/commands/flags/CommandFlagHandlerTest.java

@@ -21,6 +21,7 @@
  */
 package com.dmdirc.commandparser.commands.flags;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.WindowModel;
@@ -72,9 +73,11 @@ public class CommandFlagHandlerTest {
     @Test
     public void testParse() {
         final WindowModel container = mock(WindowModel.class);
+        final DMDircMBassador eventBus = mock(DMDircMBassador.class);
         final CommandController controller = mock(CommandController.class);
         when(controller.getCommandChar()).thenReturn('/');
         when(controller.getSilenceChar()).thenReturn('.');
+        when(container.getEventBus()).thenReturn(eventBus);
 
         final Map<CommandFlag, Integer> results = handler.parse(container,
                 new CommandArguments(controller, input));

test/com/dmdirc/commandparser/commands/global/AliasCommandTest.java

@@ -21,10 +21,12 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.aliases.AliasFactory;
 import com.dmdirc.commandparser.aliases.AliasManager;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.TabCompleterUtils;
@@ -35,9 +37,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Matchers.anyChar;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -49,6 +49,7 @@ public class AliasCommandTest {
     @Mock private CommandController controller;
     @Mock private TabCompleterUtils tabCompleterUtils;
     @Mock private WindowModel tiw;
+    @Mock private DMDircMBassador eventbus;
     private AliasCommand command;
 
     @Before
@@ -56,6 +57,7 @@ public class AliasCommandTest {
         command = new AliasCommand(controller, aliasFactory, aliasManager, tabCompleterUtils);
         when(controller.getCommandChar()).thenReturn('/');
         when(controller.getSilenceChar()).thenReturn('.');
+        when(tiw.getEventBus()).thenReturn(eventbus);
     }
 
     @Test
@@ -63,7 +65,7 @@ public class AliasCommandTest {
         command.execute(tiw, new CommandArguments(controller, "/foo"),
                 new CommandContext(null, AliasCommand.INFO));
 
-        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
+        verify(eventbus).publishAsync(isA(CommandErrorEvent.class));
     }
 
     @Test
@@ -71,7 +73,7 @@ public class AliasCommandTest {
         command.execute(tiw, new CommandArguments(controller, "/foo --remove"),
                 new CommandContext(null, AliasCommand.INFO));
 
-        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
+        verify(eventbus).publishAsync(isA(CommandErrorEvent.class));
     }
 
 }

test/com/dmdirc/commandparser/commands/global/IfpluginTest.java

@@ -21,10 +21,12 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.GlobalWindow;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
+import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.plugins.PluginManager;
@@ -38,10 +40,9 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Matchers.anyChar;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class IfpluginTest {
@@ -52,10 +53,12 @@ public class IfpluginTest {
     @Mock private CommandController controller;
     @Mock private PluginManager pluginManager;
     @Mock private WindowModel tiw;
+    @Mock private DMDircMBassador eventbus;
     private Ifplugin command;
 
     @Before
     public void setUp() {
+        when(tiw.getEventBus()).thenReturn(eventbus);
         command = new Ifplugin(controller, pluginManager, gcpProvider, gwProvider,
                 tabCompleterUtils);
     }
@@ -64,16 +67,14 @@ public class IfpluginTest {
     public void testUsageNoArgs() {
         command.execute(tiw, new CommandArguments(controller, "/foo"),
                 new CommandContext(null, Ifplugin.INFO));
-
-        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
+        verify(eventbus).publishAsync(isA(CommandErrorEvent.class));
     }
 
     @Test
     public void testUsageOneArg() {
         command.execute(tiw, new CommandArguments(controller, "/foo bar"),
                 new CommandContext(null, Ifplugin.INFO));
-
-        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
+        verify(eventbus).publishAsync(isA(CommandErrorEvent.class));
     }
 
 }

test/com/dmdirc/commandparser/commands/global/NewServerTest.java

@@ -106,7 +106,7 @@ public class NewServerTest {
         command.execute(container, new CommandArguments(controller, "/foo"),
                 new CommandContext(null, NewServer.INFO));
 
-        verify(container).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
+        verify(eventBus).publishAsync(isA(CommandErrorEvent.class));
     }
 
     @Test

test/com/dmdirc/commandparser/commands/server/ChangeServerTest.java

@@ -41,8 +41,6 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Matchers.anyChar;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Matchers.isA;
 import static org.mockito.Matchers.same;
@@ -73,7 +71,7 @@ public class ChangeServerTest {
         command.execute(tiw, new CommandArguments(controller, "/server"),
                 new ServerCommandContext(null, ChangeServer.INFO, connection));
 
-        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
+        verify(eventBus).publishAsync(isA(CommandErrorEvent.class));
     }
 
     @Test