Add unknown command event.

Depends-On: I06ee87cf6f7795eb3ee07828fb43f4381a465ac3
Change-Id: Ibcfc059d943a64494842eab68428ea8351206a09
Reviewed-on: http://gerrit.dmdirc.com/3488
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/Channel.java

@@ -117,7 +117,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener, Grou
         super(newServer, "channel-inactive", newChannelInfo.getName(),
                 Styliser.stipControlCodes(newChannelInfo.getName()),
                 configMigrator.getConfigProvider(),
-                new ChannelCommandParser(newServer, commandController),
+                new ChannelCommandParser(newServer, commandController, eventBus),
                 tabCompleterFactory.getTabCompleter(newServer.getTabCompleter(),
                         configMigrator.getConfigProvider(), CommandType.TYPE_CHANNEL,
                         CommandType.TYPE_CHAT),

src/com/dmdirc/Query.java

@@ -96,7 +96,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
         super(newServer, "query", newServer.parseHostmask(newHost)[0],
                 newServer.parseHostmask(newHost)[0],
                 newServer.getConfigManager(),
-                new QueryCommandParser(newServer, commandController),
+                new QueryCommandParser(newServer, commandController, newServer.getEventBus()),
                 tabCompleterFactory.getTabCompleter(newServer.getTabCompleter(),
                         newServer.getConfigManager(),
                         CommandType.TYPE_QUERY, CommandType.TYPE_CHAT),

src/com/dmdirc/Raw.java

@@ -64,7 +64,8 @@ public class Raw extends FrameContainer implements DataInListener, DataOutListen
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder) {
         super(newServer, "raw", "Raw", "(Raw log)", newServer.getConfigManager(), urlBuilder,
-                new ServerCommandParser(newServer.getConfigManager(), commandController),
+                new ServerCommandParser(newServer.getConfigManager(), commandController, newServer.
+                        getEventBus()),
                 newServer.getTabCompleter(),
                 messageSinkManager,
                 newServer.getEventBus(),

src/com/dmdirc/ServerManager.java

@@ -34,6 +34,7 @@ import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.WindowManager;
 
+import com.google.common.eventbus.EventBus;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import java.net.URI;
@@ -69,6 +70,8 @@ public class ServerManager implements ServerFactory {
     private final WindowManager windowManager;
     /** Concrete server factory to use. */
     private final ServerFactoryImpl serverFactoryImpl;
+    /** Event bus for servers. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of ServerManager.
@@ -78,6 +81,7 @@ public class ServerManager implements ServerFactory {
      * @param commandController  A provider of {@link CommandController}s to pass to servers.
      * @param windowManager      Window manager to add new servers to.
      * @param serverFactory      The factory to use to create servers.
+     * @param eventBus           The event bus to pass to servers.
      */
     @Inject
     public ServerManager(
@@ -85,12 +89,14 @@ public class ServerManager implements ServerFactory {
             final IdentityFactory identityFactory,
             final Provider<CommandController> commandController,
             final WindowManager windowManager,
-            final ServerFactoryImpl serverFactory) {
+            final ServerFactoryImpl serverFactory,
+            final EventBus eventBus) {
         this.identityController = identityController;
         this.identityFactory = identityFactory;
         this.commandController = commandController;
         this.windowManager = windowManager;
         this.serverFactoryImpl = serverFactory;
+        this.eventBus = eventBus;
     }
 
     @Override
@@ -100,7 +106,8 @@ public class ServerManager implements ServerFactory {
 
         final Server server = serverFactoryImpl.getServer(
                 configProvider,
-                new ServerCommandParser(configProvider.getConfigProvider(), commandController.get()),
+                new ServerCommandParser(configProvider.getConfigProvider(), commandController.get(),
+                        eventBus),
                 Executors.newScheduledThreadPool(1,
                         new ThreadFactoryBuilder().setNameFormat("server-timer-%d").build()),
                 uri,

src/com/dmdirc/actions/CoreActionType.java

@@ -83,6 +83,7 @@ public enum CoreActionType implements ActionType {
     @Deprecated
     CLIENT_PREFS_CLOSED(ClientEvents.CLIENT_EVENT, "Preferences dialog opened"),
     /** Unknown command. */
+    @Deprecated
     UNKNOWN_COMMAND(ClientEvents.UNKNOWN_COMMAND, "Unknown command entered"),
     /** Server numeric received. */
     @Deprecated

src/com/dmdirc/commandparser/parsers/ChannelCommandParser.java

@@ -33,6 +33,8 @@ import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 
+import com.google.common.eventbus.EventBus;
+
 import javax.annotation.Nonnull;
 
 /**
@@ -52,9 +54,11 @@ public class ChannelCommandParser extends ChatCommandParser {
      *
      * @param server            The server this parser's query belongs to
      * @param commandController The controller to load commands from.
+     * @param eventBus          Event bus to post events on
      */
-    public ChannelCommandParser(final Server server, final CommandController commandController) {
-        super(server, commandController);
+    public ChannelCommandParser(final Server server, final CommandController commandController,
+            final EventBus eventBus) {
+        super(server, commandController, eventBus);
     }
 
     @Override

src/com/dmdirc/commandparser/parsers/ChatCommandParser.java

@@ -33,6 +33,8 @@ import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 
+import com.google.common.eventbus.EventBus;
+
 import javax.annotation.Nonnull;
 
 /**
@@ -52,9 +54,11 @@ public class ChatCommandParser extends ServerCommandParser {
      *
      * @param server            The server which owns this parser's container
      * @param commandController The controller to load commands from.
+     * @param eventBus          Event but to post events on
      */
-    public ChatCommandParser(final Server server, final CommandController commandController) {
-        super(server.getConfigManager(), commandController);
+    public ChatCommandParser(final Server server, final CommandController commandController,
+            final EventBus eventBus) {
+        super(server.getConfigManager(), commandController, eventBus);
         super.setOwner(server);
     }
 

src/com/dmdirc/commandparser/parsers/CommandParser.java

@@ -24,8 +24,6 @@ package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandInfoPair;
@@ -35,11 +33,16 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.PreviousCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.events.DisplayableEvent;
+import com.dmdirc.events.EventUtils;
+import com.dmdirc.events.UnknownCommandEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.collections.RollingList;
 
+import com.google.common.eventbus.EventBus;
+
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
@@ -63,15 +66,20 @@ public abstract class CommandParser implements Serializable {
     private final RollingList<PreviousCommand> history;
     /** Command manager to use. */
     protected final CommandController commandManager;
+    /** Event bus to post events to. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of CommandParser.
      *
      * @param configManager  Config manager to read settings
      * @param commandManager Command manager to load plugins from
+     * @param eventBus       The event bus to post events to.
      */
     protected CommandParser(final AggregateConfigProvider configManager,
-            final CommandController commandManager) {
+            final CommandController commandManager,
+            final EventBus eventBus) {
+        this.eventBus = eventBus;
         commands = new HashMap<>();
         history = new RollingList<>(configManager.getOptionInt("general", "commandhistory"));
         this.commandManager = commandManager;
@@ -327,17 +335,13 @@ public abstract class CommandParser implements Serializable {
     protected void handleInvalidCommand(final FrameContainer origin,
             final CommandArguments args) {
         if (origin == null) {
-            ActionManager.getActionManager().triggerEvent(
-                    CoreActionType.UNKNOWN_COMMAND, null, null,
-                    args.getCommandName(), args.getArguments());
+            eventBus.post(new UnknownCommandEvent(null, args.getCommandName(), args.getArguments()));
         } else {
-            final StringBuffer buff = new StringBuffer("unknownCommand");
-
-            ActionManager.getActionManager().triggerEvent(
-                    CoreActionType.UNKNOWN_COMMAND, buff, origin,
-                    args.getCommandName(), args.getArguments());
+            final DisplayableEvent event = new UnknownCommandEvent(origin, args.getCommandName(),
+                    args.getArguments());
+            final String format = EventUtils.postDisplayable(eventBus, event, "unknownCommand");
 
-            origin.addLine(buff, args.getCommandName());
+            origin.addLine(format, args.getCommandName());
         }
     }
 

src/com/dmdirc/commandparser/parsers/GlobalCommandParser.java

@@ -34,6 +34,8 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
+import com.google.common.eventbus.EventBus;
+
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -52,12 +54,14 @@ public class GlobalCommandParser extends CommandParser {
      *
      * @param configManager  Config manager to read settings from
      * @param commandManager Command manager to load commands from
+     * @param eventBus       eventBus
      */
     @Inject
     public GlobalCommandParser(
             @ClientModule.GlobalConfig final AggregateConfigProvider configManager,
-            final CommandController commandManager) {
-        super(configManager, commandManager);
+            final CommandController commandManager,
+            final EventBus eventBus) {
+        super(configManager, commandManager, eventBus);
     }
 
     @Override

src/com/dmdirc/commandparser/parsers/QueryCommandParser.java

@@ -33,6 +33,8 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.QueryCommandContext;
 import com.dmdirc.interfaces.CommandController;
 
+import com.google.common.eventbus.EventBus;
+
 import javax.annotation.Nonnull;
 
 /**
@@ -53,9 +55,11 @@ public class QueryCommandParser extends ChatCommandParser {
      *
      * @param server            The server this parser's query belongs to
      * @param commandController The controller to load commands from.
+     * @param eventBus          Event bus to post events on
      */
-    public QueryCommandParser(final Server server, final CommandController commandController) {
-        super(server, commandController);
+    public QueryCommandParser(final Server server, final CommandController commandController,
+            final EventBus eventBus) {
+        super(server, commandController, eventBus);
     }
 
     @Override

src/com/dmdirc/commandparser/parsers/ServerCommandParser.java

@@ -34,6 +34,8 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
+import com.google.common.eventbus.EventBus;
+
 import javax.annotation.Nonnull;
 
 /**
@@ -49,11 +51,13 @@ public class ServerCommandParser extends GlobalCommandParser {
      *
      * @param configManager     Config manager to read settings from
      * @param commandController The controller to load commands from.
+     * @param eventBus          Event bus to post events on
      */
     public ServerCommandParser(
             final AggregateConfigProvider configManager,
-            final CommandController commandController) {
-        super(configManager, commandController);
+            final CommandController commandController,
+            final EventBus eventBus) {
+        super(configManager, commandController, eventBus);
     }
     /**
      * The server instance that this parser is attached to.

src/com/dmdirc/events/UnknownCommandEvent.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2006-2014 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.events;
+
+import com.dmdirc.FrameContainer;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.annotation.Nullable;
+
+/**
+ * Fired when an unknown command is used.
+ */
+public class UnknownCommandEvent extends DMDircEvent implements DisplayableEvent {
+
+    /** The display format to use for this event. */
+    private final AtomicReference<String> displayFormatRef = new AtomicReference<>("");
+    @Nullable private final FrameContainer source;
+    private final String command;
+    private final String[] arguments;
+
+    public UnknownCommandEvent(final long timestamp, @Nullable final FrameContainer source,
+            final String command, final String[] arguments) {
+        super(timestamp);
+        this.source = source;
+        this.command = command;
+        this.arguments = arguments;
+    }
+
+    public UnknownCommandEvent(@Nullable final FrameContainer source, final String command,
+            final String[] arguments) {
+        this.source = source;
+        this.command = command;
+        this.arguments = arguments;
+    }
+
+    public FrameContainer getSource() {
+        return source;
+    }
+
+    public String getCommand() {
+        return command;
+    }
+
+    public String[] getArguments() {
+        return arguments;
+    }
+
+    @Override
+    public String getDisplayFormat() {
+        return displayFormatRef.get();
+    }
+
+    @Override
+    public void setDisplayFormat(String format) {
+        this.displayFormatRef.set(format);
+    }
+
+}

test/com/dmdirc/ServerManagerTest.java

@@ -32,6 +32,8 @@ import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.WindowManager;
 
+import com.google.common.eventbus.EventBus;
+
 import java.net.URI;
 import java.util.Arrays;
 import java.util.concurrent.ScheduledExecutorService;
@@ -68,6 +70,7 @@ public class ServerManagerTest {
     @Mock private WindowManager windowManager;
     @Mock private ServerFactoryImpl serverFactoryImpl;
     @Mock private Server server;
+    @Mock private EventBus eventBus;
 
     @Captor private ArgumentCaptor<URI> uriCaptor;
 
@@ -76,7 +79,7 @@ public class ServerManagerTest {
     @Before
     public void setUp() throws Exception {
         serverManager = new ServerManager(identityController, identityFactory,
-                commandControllerProvider, windowManager, serverFactoryImpl);
+                commandControllerProvider, windowManager, serverFactoryImpl, eventBus);
 
         when(commandControllerProvider.get()).thenReturn(commandController);
 

test/com/dmdirc/commandparser/parsers/CommandParserTest.java

@@ -31,6 +31,8 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
+import com.google.common.eventbus.EventBus;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -56,6 +58,7 @@ public class CommandParserTest {
     @Mock private FrameContainer container;
     @Mock private Channel channel;
     @Mock private Connection connection;
+    @Mock private EventBus eventBus;
     private TestCommandParser commandParser;
     private TestCommandParser channelCommandParser;
 
@@ -76,11 +79,11 @@ public class CommandParserTest {
         when(connection.hasChannel("#channel1")).thenReturn(true);
         when(connection.getChannel("#channel1")).thenReturn(channel);
 
-        commandParser = new TestCommandParser(configProvider, commandController);
+        commandParser = new TestCommandParser(configProvider, commandController, eventBus);
         commandParser.registerCommand(command, commandInfo);
         commandParser.registerCommand(channelCommand, channelCommandInfo);
 
-        channelCommandParser = new TestCommandParser(configProvider, commandController);
+        channelCommandParser = new TestCommandParser(configProvider, commandController, eventBus);
         channelCommandParser.registerCommand(channelCommand, channelCommandInfo);
 
         when(channel.getCommandParser()).thenReturn(channelCommandParser);

test/com/dmdirc/harness/TestCommandParser.java

@@ -31,6 +31,8 @@ import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
+import com.google.common.eventbus.EventBus;
+
 public class TestCommandParser extends CommandParser {
 
     private static final long serialVersionUID = 7073002401375438532L;
@@ -46,8 +48,8 @@ public class TestCommandParser extends CommandParser {
     public String invalidCommand;
 
     public TestCommandParser(final AggregateConfigProvider configManager,
-            final CommandController commandManager) {
-        super(configManager, commandManager);
+            final CommandController commandManager, final EventBus eventBus) {
+        super(configManager, commandManager, eventBus);
     }
 
     @Override

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -47,7 +47,7 @@ public class TestWritableFrameContainer extends FrameContainer {
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder, final EventBus eventBus) {
         super(null, "raw", "Raw", "(Raw)", cm, urlBuilder,
-                new GlobalCommandParser(cm, commandManager),
+                new GlobalCommandParser(cm, commandManager, eventBus),
                 new TabCompleter(mock(CommandController.class), cm),
                 messageSinkManager,
                 eventBus,