Inject all the commands.

Instead of manually tracking dependencies and creating them in
CommandLoader, just have a module to provide a set of commands
that we can load.

This makes it stupidly easy to add dependencies in commands.

Also rename the /set command from Set because that's just
confusing.

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

src/com/dmdirc/ClientModule.java

@@ -31,6 +31,7 @@ import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.commandline.CommandLineParser;
 import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.commands.CommandModule;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
@@ -38,7 +39,9 @@ import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.IdentityFactory;
 import com.dmdirc.interfaces.LifecycleController;
+import com.dmdirc.interfaces.ServerFactory;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.messages.MessageSinkManager;
@@ -70,7 +73,10 @@ import dagger.Provides;
 /**
  * Provides dependencies for the client.
  */
-@Module(injects = {Main.class, CommandLineParser.class}, includes = CommandLineOptionsModule.class)
+@Module(
+    injects = {Main.class, CommandLineParser.class},
+    includes = {CommandLineOptionsModule.class, CommandModule.class}
+)
 public class ClientModule {
 
     /**
@@ -394,6 +400,28 @@ public class ClientModule {
         return PreferencesManager.getPreferencesManager();
     }
 
+    /**
+     * Gets a server factory.
+     *
+     * @param serverManager The manager to use as a factory.
+     * @return A server factory.
+     */
+    @Provides
+    public ServerFactory getServerFactory(final ServerManager serverManager) {
+        return serverManager;
+    }
+
+    /**
+     * Gets an identity factory.
+     *
+     * @param identityManager  The manager to use as a factory.
+     * @return An identity factory.
+     */
+    @Provides
+    public IdentityFactory getIdentityFactory(final IdentityManager identityManager) {
+        return identityManager;
+    }
+
     /**
      * Called when the global config cannot be loaded due to an error. This
      * method informs the user of the problem and installs a new default config

src/com/dmdirc/Main.java

@@ -25,9 +25,9 @@ package com.dmdirc;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandline.CommandLineParser;
-import com.dmdirc.commandparser.CommandLoader;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.CommandController.CommandDetails;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.logger.DMDircExceptionHandler;
 import com.dmdirc.logger.ErrorLevel;
@@ -44,6 +44,7 @@ import java.awt.GraphicsEnvironment;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -83,8 +84,8 @@ public class Main {
     /** The command manager to use. */
     private final CommandManager commandManager;
 
-    /** The command loader to use. */
-    private final CommandLoader commandLoader;
+    /** The commands to load into the command manager. */
+    private final Set<CommandDetails> commands;
 
     /**
      * Creates a new instance of {@link Main}.
@@ -100,6 +101,7 @@ public class Main {
      * @param aliasWrapper Alias wrapper to provide to the actions manager.
      * @param corePluginExtractor Extractor to use for core plugins.
      * @param urlBuilder URL builder to use as a singleton.
+     * @param commands The commands to be loaded into the command manager.
      */
     @Inject
     public Main(
@@ -113,7 +115,7 @@ public class Main {
             final ThemeManager themeManager,
             final CorePluginExtractor corePluginExtractor,
             final URLBuilder urlBuilder,
-            final CommandLoader commandLoader) {
+            final Set<CommandDetails> commands) {
         this.identityManager = identityManager;
         this.serverManager = serverManager;
         this.actionManager = actionManager;
@@ -121,7 +123,7 @@ public class Main {
         this.pluginManager = pluginManager;
         this.corePluginExtractor = corePluginExtractor;
         this.commandManager = commandManager;
-        this.commandLoader = commandLoader;
+        this.commands = commands;
         URLBuilder.setInstance(urlBuilder);
     }
 
@@ -151,7 +153,9 @@ public class Main {
      * @param args The command line arguments
      */
     public void init() {
-        commandLoader.loadCommands(commandManager);
+        for (CommandDetails command : commands) {
+            commandManager.registerCommand(command.getCommand(), command.getInfo());
+        }
 
         loadUIs(pluginManager);
 

src/com/dmdirc/commandparser/CommandLoader.java

@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2006-2013 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.commandparser;
-
-import com.dmdirc.interfaces.LifecycleController;
-import com.dmdirc.ServerManager;
-import com.dmdirc.actions.wrappers.AliasWrapper;
-import com.dmdirc.commandparser.commands.channel.Ban;
-import com.dmdirc.commandparser.commands.channel.Cycle;
-import com.dmdirc.commandparser.commands.channel.Invite;
-import com.dmdirc.commandparser.commands.channel.KickReason;
-import com.dmdirc.commandparser.commands.channel.Mode;
-import com.dmdirc.commandparser.commands.channel.Names;
-import com.dmdirc.commandparser.commands.channel.Part;
-import com.dmdirc.commandparser.commands.channel.SetNickColour;
-import com.dmdirc.commandparser.commands.channel.ShowTopic;
-import com.dmdirc.commandparser.commands.chat.Me;
-import com.dmdirc.commandparser.commands.global.AliasCommand;
-import com.dmdirc.commandparser.commands.global.AllServers;
-import com.dmdirc.commandparser.commands.global.Clear;
-import com.dmdirc.commandparser.commands.global.Echo;
-import com.dmdirc.commandparser.commands.global.Exit;
-import com.dmdirc.commandparser.commands.global.Help;
-import com.dmdirc.commandparser.commands.global.Ifplugin;
-import com.dmdirc.commandparser.commands.global.LoadPlugin;
-import com.dmdirc.commandparser.commands.global.NewServer;
-import com.dmdirc.commandparser.commands.global.Notify;
-import com.dmdirc.commandparser.commands.global.OpenWindow;
-import com.dmdirc.commandparser.commands.global.ReloadActions;
-import com.dmdirc.commandparser.commands.global.ReloadIdentities;
-import com.dmdirc.commandparser.commands.global.ReloadPlugin;
-import com.dmdirc.commandparser.commands.global.SaveConfig;
-import com.dmdirc.commandparser.commands.global.Set;
-import com.dmdirc.commandparser.commands.global.UnloadPlugin;
-import com.dmdirc.commandparser.commands.server.AllChannels;
-import com.dmdirc.commandparser.commands.server.Away;
-import com.dmdirc.commandparser.commands.server.Back;
-import com.dmdirc.commandparser.commands.server.ChangeServer;
-import com.dmdirc.commandparser.commands.server.Ctcp;
-import com.dmdirc.commandparser.commands.server.Disconnect;
-import com.dmdirc.commandparser.commands.server.Ignore;
-import com.dmdirc.commandparser.commands.server.JoinChannelCommand;
-import com.dmdirc.commandparser.commands.server.Message;
-import com.dmdirc.commandparser.commands.server.Nick;
-import com.dmdirc.commandparser.commands.server.Notice;
-import com.dmdirc.commandparser.commands.server.OpenQuery;
-import com.dmdirc.commandparser.commands.server.Raw;
-import com.dmdirc.commandparser.commands.server.RawServerCommand;
-import com.dmdirc.commandparser.commands.server.Reconnect;
-import com.dmdirc.commandparser.commands.server.Umode;
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.ui.messages.ColourManager;
-
-import javax.inject.Inject;
-
-import dagger.Lazy;
-
-/**
- * Facilitates loading of core commands into a {@link CommandManager}.
- */
-public class CommandLoader {
-
-    /** Controller to give to commands that want to start/stop the app. */
-    private final Lazy<LifecycleController> lifecycleController;
-
-    /** Server manager to give to server-related commands. */
-    private final Lazy<ServerManager> serverManager;
-
-    /** Plugin manager to give to plugin-dependent commands. */
-    private final Lazy<PluginManager> pluginManager;
-
-    /** The identity manager to pass to config-related commands. */
-    private final Lazy<IdentityManager> identityManager;
-
-    /** The action controller to pass to action-aware commands. */
-    private final Lazy<ActionController> actionController;
-
-    /** The colour manager to pass to colourful commands. */
-    private final Lazy<ColourManager> colourManager;
-
-    /** The alias wrapper to pass to alias commands. */
-    private final Lazy<AliasWrapper> aliasWrapper;
-
-    /**
-     * Creates a new instance of {@link CommandLoader}.
-     *
-     * @param lifecycleController Controller to give to commands that want to start/stop the app.
-     * @param serverManager The server manager to pass to server-related commands.
-     * @param pluginManager The plugin manager to pass to plugin-dependent commands.
-     * @param identityManager The identity manager to pass to config-related commands.
-     * @param colourManager The colour manager to give to colourful commands.
-     * @param aliasWrapper The alias wrapper to pass to alias commands.
-     */
-    @Inject
-    public CommandLoader(
-            final Lazy<LifecycleController> lifecycleController,
-            final Lazy<ServerManager> serverManager,
-            final Lazy<PluginManager> pluginManager,
-            final Lazy<IdentityManager> identityManager,
-            final Lazy<ActionController> actionController,
-            final Lazy<ColourManager> colourManager,
-            final Lazy<AliasWrapper> aliasWrapper) {
-        this.lifecycleController = lifecycleController;
-        this.serverManager = serverManager;
-        this.pluginManager = pluginManager;
-        this.identityManager = identityManager;
-        this.actionController = actionController;
-        this.colourManager = colourManager;
-        this.aliasWrapper = aliasWrapper;
-    }
-
-    /**
-     * Loads all known core commands into the given manager.
-     *
-     * @param manager The manager to add commands to
-     */
-    public void loadCommands(final CommandController manager) {
-        // Chat commands
-        manager.registerCommand(new Me(), Me.INFO);
-
-        // Channel commands
-        manager.registerCommand(new Ban(), Ban.INFO);
-        manager.registerCommand(new Cycle(), Cycle.INFO);
-        manager.registerCommand(new Invite(), Invite.INFO);
-        manager.registerCommand(new KickReason(), KickReason.INFO);
-        manager.registerCommand(new Mode(), Mode.INFO);
-        manager.registerCommand(new Names(), Names.INFO);
-        manager.registerCommand(new Part(), Part.INFO);
-        manager.registerCommand(new SetNickColour(colourManager.get()), SetNickColour.INFO);
-        manager.registerCommand(new ShowTopic(), ShowTopic.INFO);
-
-        // Server commands
-        manager.registerCommand(new AllChannels(), AllChannels.INFO);
-        manager.registerCommand(new Away(), Away.INFO);
-        manager.registerCommand(new Back(), Back.INFO);
-        manager.registerCommand(new ChangeServer(), ChangeServer.INFO);
-        manager.registerCommand(new Ctcp(), Ctcp.INFO);
-        manager.registerCommand(new Disconnect(), Disconnect.INFO);
-        manager.registerCommand(new Ignore(), Ignore.INFO);
-        manager.registerCommand(new JoinChannelCommand(actionController.get()), JoinChannelCommand.INFO);
-        manager.registerCommand(new Message(), Message.INFO);
-        manager.registerCommand(new Nick(), Nick.INFO);
-        manager.registerCommand(new Notice(), Notice.INFO);
-        manager.registerCommand(new OpenQuery(), OpenQuery.INFO);
-        manager.registerCommand(new Raw(), Raw.INFO);
-        manager.registerCommand(new Reconnect(), Reconnect.INFO);
-        manager.registerCommand(new Umode(), Umode.INFO);
-
-        manager.registerCommand(new RawServerCommand("lusers"));
-        manager.registerCommand(new RawServerCommand("map"));
-        manager.registerCommand(new RawServerCommand("motd"));
-        manager.registerCommand(new RawServerCommand("oper"));
-        manager.registerCommand(new RawServerCommand("whois"));
-        manager.registerCommand(new RawServerCommand("who"));
-
-        // Query commands
-
-        // Global commands
-        manager.registerCommand(new AliasCommand(aliasWrapper.get()), AliasCommand.INFO);
-        manager.registerCommand(new AllServers(serverManager.get()), AllServers.INFO);
-        manager.registerCommand(new Clear(), Clear.INFO);
-        manager.registerCommand(new Echo(), Echo.INFO);
-        manager.registerCommand(new Exit(lifecycleController.get()), Exit.INFO);
-        manager.registerCommand(new Help(), Help.INFO);
-        manager.registerCommand(new Ifplugin(pluginManager.get()), Ifplugin.INFO);
-        manager.registerCommand(new NewServer(serverManager.get(), pluginManager.get(), identityManager.get()), NewServer.INFO);
-        manager.registerCommand(new Notify(colourManager.get()), Notify.INFO);
-        manager.registerCommand(new LoadPlugin(pluginManager.get()), LoadPlugin.INFO);
-        manager.registerCommand(new UnloadPlugin(pluginManager.get()), UnloadPlugin.INFO);
-        manager.registerCommand(new OpenWindow(), OpenWindow.INFO);
-        manager.registerCommand(new ReloadActions(), ReloadActions.INFO);
-        manager.registerCommand(new ReloadIdentities(identityManager.get()), ReloadIdentities.INFO);
-        manager.registerCommand(new ReloadPlugin(pluginManager.get()), ReloadPlugin.INFO);
-        manager.registerCommand(new SaveConfig(identityManager.get()), SaveConfig.INFO);
-        manager.registerCommand(new Set(identityManager.get(), identityManager.get()), Set.INFO);
-    }
-
-}

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

@@ -0,0 +1,578 @@
+/*
+ * Copyright (c) 2006-2013 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.commandparser.commands;
+
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.commands.channel.Ban;
+import com.dmdirc.commandparser.commands.channel.Cycle;
+import com.dmdirc.commandparser.commands.channel.Invite;
+import com.dmdirc.commandparser.commands.channel.KickReason;
+import com.dmdirc.commandparser.commands.channel.Mode;
+import com.dmdirc.commandparser.commands.channel.Names;
+import com.dmdirc.commandparser.commands.channel.Part;
+import com.dmdirc.commandparser.commands.channel.SetNickColour;
+import com.dmdirc.commandparser.commands.channel.ShowTopic;
+import com.dmdirc.commandparser.commands.chat.Me;
+import com.dmdirc.commandparser.commands.global.AliasCommand;
+import com.dmdirc.commandparser.commands.global.AllServers;
+import com.dmdirc.commandparser.commands.global.Clear;
+import com.dmdirc.commandparser.commands.global.Echo;
+import com.dmdirc.commandparser.commands.global.Exit;
+import com.dmdirc.commandparser.commands.global.Help;
+import com.dmdirc.commandparser.commands.global.Ifplugin;
+import com.dmdirc.commandparser.commands.global.LoadPlugin;
+import com.dmdirc.commandparser.commands.global.NewServer;
+import com.dmdirc.commandparser.commands.global.Notify;
+import com.dmdirc.commandparser.commands.global.OpenWindow;
+import com.dmdirc.commandparser.commands.global.ReloadActions;
+import com.dmdirc.commandparser.commands.global.ReloadIdentities;
+import com.dmdirc.commandparser.commands.global.ReloadPlugin;
+import com.dmdirc.commandparser.commands.global.SaveConfig;
+import com.dmdirc.commandparser.commands.global.SetCommand;
+import com.dmdirc.commandparser.commands.global.UnloadPlugin;
+import com.dmdirc.commandparser.commands.server.AllChannels;
+import com.dmdirc.commandparser.commands.server.Away;
+import com.dmdirc.commandparser.commands.server.Back;
+import com.dmdirc.commandparser.commands.server.ChangeServer;
+import com.dmdirc.commandparser.commands.server.Ctcp;
+import com.dmdirc.commandparser.commands.server.Disconnect;
+import com.dmdirc.commandparser.commands.server.Ignore;
+import com.dmdirc.commandparser.commands.server.JoinChannelCommand;
+import com.dmdirc.commandparser.commands.server.Message;
+import com.dmdirc.commandparser.commands.server.Nick;
+import com.dmdirc.commandparser.commands.server.Notice;
+import com.dmdirc.commandparser.commands.server.OpenQuery;
+import com.dmdirc.commandparser.commands.server.Raw;
+import com.dmdirc.commandparser.commands.server.RawServerCommand;
+import com.dmdirc.commandparser.commands.server.Reconnect;
+import com.dmdirc.commandparser.commands.server.Umode;
+import com.dmdirc.interfaces.CommandController.CommandDetails;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Provides commands for injection into the command manager.
+ */
+@Module(library = true, complete = false)
+public class CommandModule {
+
+    /**
+     * Provides the /me command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Me command) {
+        return new SimpleCommandDetails(command, Me.INFO);
+    }
+
+    /**
+     * Provides the /ban command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Ban command) {
+        return new SimpleCommandDetails(command, Ban.INFO);
+    }
+
+    /**
+     * Provides the /cycle command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Cycle command) {
+        return new SimpleCommandDetails(command, Cycle.INFO);
+    }
+
+    /**
+     * Provides the /invite command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Invite command) {
+        return new SimpleCommandDetails(command, Invite.INFO);
+    }
+
+    /**
+     * Provides the /kick command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final KickReason command) {
+        return new SimpleCommandDetails(command, KickReason.INFO);
+    }
+
+    /**
+     * Provides the /mode command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Mode command) {
+        return new SimpleCommandDetails(command, Mode.INFO);
+    }
+
+    /**
+     * Provides the /names command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Names command) {
+        return new SimpleCommandDetails(command, Names.INFO);
+    }
+
+    /**
+     * Provides the /part command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Part command) {
+        return new SimpleCommandDetails(command, Part.INFO);
+    }
+
+    /**
+     * Provides the /setnickcolour command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final SetNickColour command) {
+        return new SimpleCommandDetails(command, SetNickColour.INFO);
+    }
+
+    /**
+     * Provides the /topic command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final ShowTopic command) {
+        return new SimpleCommandDetails(command, ShowTopic.INFO);
+    }
+
+    /**
+     * Provides the /allchannels command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final AllChannels command) {
+        return new SimpleCommandDetails(command, AllChannels.INFO);
+    }
+
+    /**
+     * Provides the /away command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Away command) {
+        return new SimpleCommandDetails(command, Away.INFO);
+    }
+
+    /**
+     * Provides the /back command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Back command) {
+        return new SimpleCommandDetails(command, Back.INFO);
+    }
+
+    /**
+     * Provides the /server command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final ChangeServer command) {
+        return new SimpleCommandDetails(command, ChangeServer.INFO);
+    }
+
+    /**
+     * Provides the /ctcp command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Ctcp command) {
+        return new SimpleCommandDetails(command, Ctcp.INFO);
+    }
+
+    /**
+     * Provides the /disconnect command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Disconnect command) {
+        return new SimpleCommandDetails(command, Disconnect.INFO);
+    }
+
+    /**
+     * Provides the /ignore command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Ignore command) {
+        return new SimpleCommandDetails(command, Ignore.INFO);
+    }
+
+    /**
+     * Provides the /join command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final JoinChannelCommand command) {
+        return new SimpleCommandDetails(command, JoinChannelCommand.INFO);
+    }
+
+    /**
+     * Provides the /msg command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Message command) {
+        return new SimpleCommandDetails(command, Message.INFO);
+    }
+
+    /**
+     * Provides the /nick command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Nick command) {
+        return new SimpleCommandDetails(command, Nick.INFO);
+    }
+
+    /**
+     * Provides the /notice command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Notice command) {
+        return new SimpleCommandDetails(command, Notice.INFO);
+    }
+
+    /**
+     * Provides the /query command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final OpenQuery command) {
+        return new SimpleCommandDetails(command, OpenQuery.INFO);
+    }
+
+    /**
+     * Provides the /raw command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Raw command) {
+        return new SimpleCommandDetails(command, Raw.INFO);
+    }
+
+    /**
+     * Provides the /reconnect command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Reconnect command) {
+        return new SimpleCommandDetails(command, Reconnect.INFO);
+    }
+
+    /**
+     * Provides the /umode command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Umode command) {
+        return new SimpleCommandDetails(command, Umode.INFO);
+    }
+
+    /**
+     * Provides a set of raw commands.
+     *
+     * @return A set of the commands' details.
+     */
+    @Provides(type = Provides.Type.SET_VALUES)
+    public Set<CommandDetails> getRawCommands() {
+        final Set<CommandDetails> results = new HashSet<>();
+        for (String name : new String[] { "lusers", "map", "motd", "oper", "whois", "who" }) {
+            final RawServerCommand rawCommand = new RawServerCommand(name);
+            results.add(new SimpleCommandDetails(rawCommand, rawCommand));
+        }
+        return results;
+    }
+
+    /**
+     * Provides the /alias command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final AliasCommand command) {
+        return new SimpleCommandDetails(command, AliasCommand.INFO);
+    }
+
+    /**
+     * Provides the /allservers command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final AllServers command) {
+        return new SimpleCommandDetails(command, AllServers.INFO);
+    }
+
+    /**
+     * Provides the /clear command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Clear command) {
+        return new SimpleCommandDetails(command, Clear.INFO);
+    }
+
+    /**
+     * Provides the /echo command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Echo command) {
+        return new SimpleCommandDetails(command, Echo.INFO);
+    }
+
+    /**
+     * Provides the /exit command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Exit command) {
+        return new SimpleCommandDetails(command, Exit.INFO);
+    }
+
+    /**
+     * Provides the /Help command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Help command) {
+        return new SimpleCommandDetails(command, Help.INFO);
+    }
+
+    /**
+     * Provides the /ifplugin command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Ifplugin command) {
+        return new SimpleCommandDetails(command, Ifplugin.INFO);
+    }
+
+    /**
+     * Provides the /newserver command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final NewServer command) {
+        return new SimpleCommandDetails(command, NewServer.INFO);
+    }
+
+    /**
+     * Provides the /notify command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final Notify command) {
+        return new SimpleCommandDetails(command, Notify.INFO);
+    }
+
+    /**
+     * Provides the /loadplugin command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final LoadPlugin command) {
+        return new SimpleCommandDetails(command, LoadPlugin.INFO);
+    }
+
+    /**
+     * Provides the /unloadplugin command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final UnloadPlugin command) {
+        return new SimpleCommandDetails(command, UnloadPlugin.INFO);
+    }
+
+    /**
+     * Provides the /openwindow command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final OpenWindow command) {
+        return new SimpleCommandDetails(command, OpenWindow.INFO);
+    }
+
+    /**
+     * Provides the /reloadactions command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final ReloadActions command) {
+        return new SimpleCommandDetails(command, ReloadActions.INFO);
+    }
+
+    /**
+     * Provides the /reloadidentities command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final ReloadIdentities command) {
+        return new SimpleCommandDetails(command, ReloadIdentities.INFO);
+    }
+
+    /**
+     * Provides the /reloadplugin command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final ReloadPlugin command) {
+        return new SimpleCommandDetails(command, ReloadPlugin.INFO);
+    }
+
+    /**
+     * Provides the /saveconfig command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final SaveConfig command) {
+        return new SimpleCommandDetails(command, SaveConfig.INFO);
+    }
+
+    /**
+     * Provides the /set command.
+     *
+     * @param command The instantiated command.
+     * @return The command's details.
+     */
+    @Provides(type = Provides.Type.SET)
+    public CommandDetails getCommand(final SetCommand command) {
+        return new SimpleCommandDetails(command, SetCommand.INFO);
+    }
+
+    /**
+     * Simple implementation of {@link CommandDetails}.
+     */
+    @Getter
+    @RequiredArgsConstructor
+    private static class SimpleCommandDetails implements CommandDetails {
+
+        /** The command. */
+        private final Command command;
+
+        /** The command's info. */
+        private final CommandInfo info;
+
+    }
+
+}

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

@@ -37,6 +37,7 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import javax.inject.Inject;
 import lombok.NoArgsConstructor;
 
 /**
@@ -55,6 +56,7 @@ public class Ban extends Command implements IntelligentCommand {
      *
      * @param controller The controller to use for command information.
      */
+    @Inject
     public Ban(final CommandController controller) {
         super(controller);
     }

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

@@ -33,6 +33,8 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 
+import javax.inject.Inject;
+
 /**
  * The cycle command allows users to rapidly part and rejoin a channel.
  */
@@ -44,6 +46,11 @@ public class Cycle extends Command {
             "cycle [message] - parts and rejoins the channel",
             CommandType.TYPE_CHANNEL);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Cycle() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -36,6 +36,8 @@ import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 
+import javax.inject.Inject;
+
 /**
  * The invite command allows the user to invite others to a channel.
  *
@@ -49,6 +51,11 @@ public class Invite extends Command implements ExternalCommand {
             "invite <user> - invites user to a channel",
             CommandType.TYPE_CHANNEL);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Invite() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -38,6 +38,7 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import javax.inject.Inject;
 import lombok.NoArgsConstructor;
 
 /**
@@ -58,6 +59,7 @@ public class KickReason extends Command implements IntelligentCommand {
      *
      * @param controller The controller to use for command information.
      */
+    @Inject
     public KickReason(final CommandController controller) {
         super(controller);
     }

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

@@ -39,6 +39,8 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import javax.inject.Inject;
+
 /**
  * The mode command allows the user to inspect and change channel modes.
  */
@@ -51,6 +53,11 @@ public class Mode extends Command implements IntelligentCommand,
             "mode [changes] - displays or changes the current channel modes",
             CommandType.TYPE_CHANNEL);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Mode() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -37,6 +37,8 @@ import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.inject.Inject;
+
 /**
  * Sends a names request.
  */
@@ -49,6 +51,11 @@ public class Names extends Command implements IntelligentCommand,
             "names - Requests a list of users that are in the channel",
             CommandType.TYPE_CHANNEL);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Names() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -33,6 +33,8 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 
+import javax.inject.Inject;
+
 /**
  * The part command parts the current channel with a specified part message.
  */
@@ -44,6 +46,11 @@ public class Part extends Command {
             "part [reason] - parts the channel",
             CommandType.TYPE_CHANNEL);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Part() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -40,6 +40,8 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.ColourManager;
 
+import javax.inject.Inject;
+
 /**
  * Allows the user to set a nickname on the channel to use a custom colour.
  */
@@ -69,6 +71,7 @@ public class SetNickColour extends Command implements IntelligentCommand {
      * @param controller The command controller that owns this command.
      * @param colourManager The colour manager to use to convert colours.
      */
+    @Inject
     public SetNickColour(final CommandController controller, final ColourManager colourManager) {
         super(controller);
         this.colourManager = colourManager;

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

@@ -36,6 +36,8 @@ import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 
+import javax.inject.Inject;
+
 /**
  * The show topic command shows the user the current topic.
  */
@@ -47,6 +49,11 @@ public class ShowTopic extends Command implements ExternalCommand {
             "topic - displays the current topic\ntopic <newtopic> - sets the channel topic",
             CommandType.TYPE_CHANNEL);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public ShowTopic() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -35,6 +35,8 @@ import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.util.validators.ValidationResponse;
 
+import javax.inject.Inject;
+
 /**
  * The me command sends a CTCP action to the current channel.
  */
@@ -45,6 +47,11 @@ public class Me extends Command implements ValidatingCommand {
             "me <action> - sends the specified action",
             CommandType.TYPE_CHAT);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Me() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -38,6 +38,8 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 
+import javax.inject.Inject;
+
 /**
  * The alias command allows users to create aliases on-the-fly.
  */
@@ -66,6 +68,7 @@ public class AliasCommand extends Command implements IntelligentCommand {
      * @param controller The controller that owns this command.
      * @param aliasWrapper The wrapper to use to modify aliases.
      */
+    @Inject
     public AliasCommand(final CommandController controller, final AliasWrapper aliasWrapper) {
         super(controller);
         this.aliasWrapper = aliasWrapper;

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

@@ -35,6 +35,8 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 
+import javax.inject.Inject;
+
 /**
  * The AllServers command allows users to issue commands to all servers.
  */
@@ -53,6 +55,7 @@ public class AllServers extends Command implements IntelligentCommand {
      *
      * @param serverManager The server manager to use to iterate servers.
      */
+    @Inject
     public AllServers(final ServerManager serverManager) {
         this.serverManager = serverManager;
     }

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

@@ -32,6 +32,8 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.inject.Inject;
+
 /**
  * The clear command clears the main text area of the current window.
  */
@@ -42,6 +44,11 @@ public class Clear extends Command implements IntelligentCommand {
             "clear - clears the current window's text area",
             CommandType.TYPE_GLOBAL);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Clear() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -43,6 +43,8 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import javax.inject.Inject;
+
 /**
  * The echo commands simply echos text to the current window.
  */
@@ -75,6 +77,7 @@ public class Echo extends Command implements IntelligentCommand {
      *
      * @param controller Command controller
      */
+    @Inject
     public Echo(final CommandController controller) {
         super(controller);
 

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

@@ -31,6 +31,8 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 
+import javax.inject.Inject;
+
 /**
  * The exit command allows the user to quit DMDirc with a custom quit message.
  * When the client quits, it disconnects all servers (with the quit message
@@ -51,6 +53,7 @@ public class Exit extends Command {
      *
      * @param controller The controller to use to quit the app.
      */
+    @Inject
     public Exit(final LifecycleController controller) {
         this.controller = controller;
     }

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

@@ -40,6 +40,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 /**
  * The help command shows the user a list of available commands, along with
  * their arguments, and a description. It is context-aware, so channel commands
@@ -52,6 +54,11 @@ public class Help extends Command implements IntelligentCommand {
             "help [command] - shows client command help",
             CommandType.TYPE_GLOBAL);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Help() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -38,6 +38,8 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 
+import javax.inject.Inject;
+
 /**
  * The if plugin command allows the user to execute commands based on whether
  * or not a plugin is loaded.
@@ -58,6 +60,7 @@ public class Ifplugin extends Command implements IntelligentCommand {
      *
      * @param pluginManager The plugin manager to use to query plugins.
      */
+    @Inject
     public Ifplugin(final PluginManager pluginManager) {
         this.pluginManager = pluginManager;
     }

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

@@ -35,6 +35,8 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.PluginMetaData;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.inject.Inject;
+
 /**
  * Allows the user to load a plugin.
  */
@@ -53,6 +55,7 @@ public class LoadPlugin extends Command implements IntelligentCommand {
      *
      * @param pluginManager The plugin manager to load plugins with.
      */
+    @Inject
     public LoadPlugin(final PluginManager pluginManager) {
         this.pluginManager = pluginManager;
     }

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

@@ -44,6 +44,8 @@ import java.net.URISyntaxException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.inject.Inject;
+
 /**
  * The new server command allows users to open a new server window.
  */
@@ -71,6 +73,7 @@ public class NewServer extends Command implements IntelligentCommand {
      * @param pluginManager The plugin manager to use to query available services.
      * @param identityController Identity controller to use to find profiles.
      */
+    @Inject
     public NewServer(
             final ServerFactory serverFactory,
             final PluginManager pluginManager,

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

@@ -34,6 +34,8 @@ import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.messages.ColourManager;
 
+import javax.inject.Inject;
+
 /**
  * The notify command allows the user to set the notification colour for a
  * window.
@@ -53,6 +55,7 @@ public class Notify extends Command implements IntelligentCommand {
      *
      * @param colourManager The colour manager to use to convert colours.
      */
+    @Inject
     public Notify(final ColourManager colourManager) {
         this.colourManager = colourManager;
     }

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

@@ -34,6 +34,8 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.inject.Inject;
+
 /**
  * Opens a new window.
  */
@@ -45,6 +47,11 @@ public class OpenWindow extends Command implements IntelligentCommand {
             + "- opens a window with the specified name and title",
             CommandType.TYPE_GLOBAL);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public OpenWindow() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -33,6 +33,8 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.inject.Inject;
+
 /**
  * Allows the user to reload actions.
  */
@@ -43,6 +45,11 @@ public final class ReloadActions extends Command implements IntelligentCommand {
             "reloadactions - reloads actions from disk",
             CommandType.TYPE_GLOBAL);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public ReloadActions() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -33,6 +33,8 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.inject.Inject;
+
 /**
  * Allows the user to reload identities.
  */
@@ -51,6 +53,7 @@ public class ReloadIdentities extends Command implements IntelligentCommand {
      *
      * @param identityController The controller to reload identities on.
      */
+    @Inject
     public ReloadIdentities(final IdentityController identityController) {
         this.identityController = identityController;
     }

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

@@ -34,6 +34,8 @@ import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.inject.Inject;
+
 /**
  * Allows the user to reload a plugin.
  */
@@ -52,6 +54,7 @@ public class ReloadPlugin extends Command implements IntelligentCommand {
      *
      * @param pluginManager The plugin manager to reload plugins with.
      */
+    @Inject
     public ReloadPlugin(final PluginManager pluginManager) {
         this.pluginManager = pluginManager;
     }

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

@@ -33,6 +33,8 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.inject.Inject;
+
 /**
  * Allows the user to save the config file.
  */
@@ -51,6 +53,7 @@ public final class SaveConfig extends Command implements IntelligentCommand {
      *
      * @param identityController The controller to save identities on.
      */
+    @Inject
     public SaveConfig(final IdentityController identityController) {
         this.identityController = identityController;
     }

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

@@ -43,10 +43,12 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.List;
 
+import javax.inject.Inject;
+
 /**
  * The set command allows the user to inspect and change global config settings.
  */
-public class Set extends Command implements IntelligentCommand {
+public class SetCommand extends Command implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("set",
@@ -77,7 +79,8 @@ public class Set extends Command implements IntelligentCommand {
      * @param identityController The controller to use to set settings.
      * @param identityFactory The factory to use to create new identities.
      */
-    public Set(
+    @Inject
+    public SetCommand(
             final IdentityController identityController,
             final IdentityFactory identityFactory) {
         super();

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

@@ -34,6 +34,8 @@ import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.inject.Inject;
+
 /**
  * Allows the user to unload a plugin.
  */
@@ -52,6 +54,7 @@ public class UnloadPlugin extends Command implements IntelligentCommand {
      *
      * @param pluginManager The plugin manager to unload plugins with.
      */
+    @Inject
     public UnloadPlugin(final PluginManager pluginManager) {
         this.pluginManager = pluginManager;
     }

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

@@ -35,6 +35,8 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 
+import javax.inject.Inject;
+
 /**
  * The AllChannels command allows the user to issue a command to all channels
  * on a server.
@@ -46,6 +48,11 @@ public class AllChannels extends Command implements IntelligentCommand {
            "allchannels <command> - executes the command as though it had"
             + " been entered on all channels", CommandType.TYPE_SERVER);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public AllChannels() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -33,6 +33,8 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 
+import javax.inject.Inject;
+
 /**
  * The away command allows the user to set their away message.
  */
@@ -43,6 +45,11 @@ public class Away extends Command {
     public static final CommandInfo INFO = new BaseCommandInfo("away",
            "away <reason> - marks you as away", CommandType.TYPE_SERVER);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Away() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -35,6 +35,8 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.inject.Inject;
+
 /**
  * The back command allows the user to unset their away status.
  */
@@ -45,6 +47,11 @@ public class Back extends Command implements IntelligentCommand {
     public static final CommandInfo INFO = new BaseCommandInfo("back",
            "back - unsets your away status", CommandType.TYPE_SERVER);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Back() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -36,6 +36,8 @@ import com.dmdirc.commandparser.commands.global.NewServer;
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import javax.inject.Inject;
+
 /**
  * The /server command allows the user to connect to a new server.
  */
@@ -46,6 +48,11 @@ public class ChangeServer extends Command {
             "server <host[:[+]port]> [password] - connect to a different server",
             CommandType.TYPE_SERVER);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public ChangeServer() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -36,6 +36,8 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import javax.inject.Inject;
+
 /**
  * Allows the user to send CTCP messages.
  */
@@ -47,6 +49,11 @@ public class Ctcp extends Command implements IntelligentCommand {
             "ctcp <target> <type> [arguments] - sends a CTCP message",
             CommandType.TYPE_SERVER);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Ctcp() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -32,6 +32,8 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 
+import javax.inject.Inject;
+
 /**
  * The disconnect command disconnects from the current server.
  */
@@ -42,6 +44,11 @@ public class Disconnect extends Command {
             "disconnect [reason] - disconnect from this server",
             CommandType.TYPE_SERVER);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Disconnect() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -40,6 +40,8 @@ import java.util.List;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
+import javax.inject.Inject;
+
 /**
  * Allows the user to add/view/delete ignores.
  */
@@ -50,6 +52,11 @@ public class Ignore extends Command implements IntelligentCommand {
             "ignore [--remove|--regex] [host] - manages the network's ignore list",
             CommandType.TYPE_SERVER);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Ignore() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -44,6 +44,8 @@ import com.dmdirc.util.collections.MapList;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+
 /**
  * Allows the user to join channels.
  *
@@ -65,6 +67,7 @@ public class JoinChannelCommand extends Command implements
      *
      * @param controller The action controller to register listeners with.
      */
+    @Inject
     public JoinChannelCommand(final ActionController controller) {
         super();
 

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

@@ -39,6 +39,8 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import javax.inject.Inject;
+
 /**
  * Allows the user to send privmsgs.
  */
@@ -51,6 +53,11 @@ public class Message extends Command implements IntelligentCommand,
             "msg <target> <message> - sends a private message",
             CommandType.TYPE_SERVER);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Message() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -36,6 +36,8 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import javax.inject.Inject;
+
 /**
  * Allows the user to change nickname.
  */
@@ -47,6 +49,11 @@ public class Nick extends Command implements IntelligentCommand {
             "nick <new nickname> - attempts to change your nickname to the one specified",
             CommandType.TYPE_SERVER);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Nick() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -36,6 +36,8 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import javax.inject.Inject;
+
 /**
  * Allows the user to send notices.
  */
@@ -47,6 +49,11 @@ public class Notice extends Command implements IntelligentCommand {
             "notice <target> <message> - sends a notice",
             CommandType.TYPE_SERVER);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Notice() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -39,6 +39,8 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.Styliser;
 
+import javax.inject.Inject;
+
 /**
  * Allows the user to open a query dialog with another user.
  */
@@ -50,6 +52,11 @@ public class OpenQuery extends Command implements IntelligentCommand,
             "query <user> [message] - opens a query with the specified user",
             CommandType.TYPE_SERVER);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public OpenQuery() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -33,6 +33,8 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 
+import javax.inject.Inject;
+
 /**
  * The raw command allows the user to send a raw line of text directly to the
  * irc server.
@@ -45,6 +47,11 @@ public class Raw extends Command {
             "raw <text> - sends the specified text directly to the server",
             CommandType.TYPE_SERVER);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Raw() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -32,6 +32,8 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 
+import javax.inject.Inject;
+
 /**
  * The reconnect command reconnects to the current server.
  */
@@ -42,6 +44,11 @@ public class Reconnect extends Command {
             "reconnect [reason] - reconnect to this server",
             CommandType.TYPE_SERVER);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Reconnect() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -34,6 +34,8 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 
+import javax.inject.Inject;
+
 /**
  * Allows the user to change user modes.
  */
@@ -45,6 +47,11 @@ public class Umode extends Command {
             "umode [modes] - sets or displays your user modes",
             CommandType.TYPE_SERVER);
 
+    /** Creates a new instance of this command. */
+    @Inject
+    public Umode() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/interfaces/CommandController.java

@@ -35,6 +35,27 @@ import java.util.Map;
  */
 public interface CommandController {
 
+    /**
+     * Describes a command and its associated {@link CommandInfo} object.
+     */
+    interface CommandDetails {
+
+        /**
+         * Gets the command.
+         *
+         * @return The command.
+         */
+        Command getCommand();
+
+        /**
+         * Gets the command's information.
+         *
+         * @return The command information.
+         */
+        CommandInfo getInfo();
+
+    }
+
     /**
      * Retrieves the command identified by the specified name, regardless of
      * type.

test/com/dmdirc/TestMain.java

@@ -3,10 +3,10 @@ package com.dmdirc;
 import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.commandline.CommandLineParser;
-import com.dmdirc.commandparser.CommandLoader;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.CommandController.CommandDetails;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.util.URLBuilder;
@@ -41,7 +41,7 @@ public class TestMain extends Main {
             final CorePluginExtractor corePluginExtractor) {
         super(identityManager, serverManager, actionManager, commandLineParser,
                 pluginManager, commandManager, null, null, corePluginExtractor,
-                mock(URLBuilder.class), mock(CommandLoader.class));
+                mock(URLBuilder.class), Collections.<CommandDetails>emptySet());
         this.identityManager = identityManager;
         this.pluginManager = pluginManager;
         this.commandManager = commandManager;