Move loading of core commands out of CommandManager

Change-Id: Id8a9fde29d189e1c3cd025a3b9f30f2b575a7280
Depends-On: I2838ac60f809408480d985123fde9427e1e5f0e4
Reviewed-on: http://gerrit.dmdirc.com/2309
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/Main.java

@@ -25,6 +25,7 @@ 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.ConfigManager;
 import com.dmdirc.config.IdentityManager;
@@ -127,7 +128,7 @@ public final class Main {
 
         clp.applySettings();
 
-        CommandManager.getCommandManager().initCommands();
+        new CommandLoader().loadCommands(CommandManager.getCommandManager());
 
         for (String service : new String[]{"ui", "tabcompletion", "parser"}) {
             ensureExists(pm, service);

src/com/dmdirc/commandparser/CommandLoader.java

@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2006-2012 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.BasicServerFactory;
+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.interfaces.CommandController;
+
+/**
+ * Facilitates loading of core commands into a {@link CommandManager}.
+ */
+public class CommandLoader {
+
+    /**
+     * 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(), 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(), 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(), AliasCommand.INFO);
+        manager.registerCommand(new AllServers(), AllServers.INFO);
+        manager.registerCommand(new Clear(), Clear.INFO);
+        manager.registerCommand(new Echo(), Echo.INFO);
+        manager.registerCommand(new Exit(), Exit.INFO);
+        manager.registerCommand(new Help(), Help.INFO);
+        manager.registerCommand(new Ifplugin(), Ifplugin.INFO);
+        manager.registerCommand(new NewServer(new BasicServerFactory()), NewServer.INFO);
+        manager.registerCommand(new Notify(), Notify.INFO);
+        manager.registerCommand(new LoadPlugin(), LoadPlugin.INFO);
+        manager.registerCommand(new UnloadPlugin(), UnloadPlugin.INFO);
+        manager.registerCommand(new OpenWindow(), OpenWindow.INFO);
+        manager.registerCommand(new ReloadActions(), ReloadActions.INFO);
+        manager.registerCommand(new ReloadIdentities(), ReloadIdentities.INFO);
+        manager.registerCommand(new ReloadPlugin(), ReloadPlugin.INFO);
+        manager.registerCommand(new SaveConfig(), SaveConfig.INFO);
+        manager.registerCommand(new Set(), Set.INFO);
+    }
+
+}

src/com/dmdirc/commandparser/CommandManager.java

@@ -22,54 +22,10 @@
 
 package com.dmdirc.commandparser;
 
-import com.dmdirc.BasicServerFactory;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.commandparser.commands.Command;
-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.commandparser.parsers.CommandParser;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.config.ConfigManager;
@@ -243,69 +199,6 @@ public class CommandManager implements CommandController {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void initCommands() {
-        // Chat commands
-        registerCommand(new Me(), Me.INFO);
-
-        // Channel commands
-        registerCommand(new Ban(), Ban.INFO);
-        registerCommand(new Cycle(), Cycle.INFO);
-        registerCommand(new Invite(), Invite.INFO);
-        registerCommand(new KickReason(), KickReason.INFO);
-        registerCommand(new Mode(), Mode.INFO);
-        registerCommand(new Names(), Names.INFO);
-        registerCommand(new Part(), Part.INFO);
-        registerCommand(new SetNickColour(), SetNickColour.INFO);
-        registerCommand(new ShowTopic(), ShowTopic.INFO);
-
-        // Server commands
-        registerCommand(new AllChannels(), AllChannels.INFO);
-        registerCommand(new Away(), Away.INFO);
-        registerCommand(new Back(), Back.INFO);
-        registerCommand(new ChangeServer(), ChangeServer.INFO);
-        registerCommand(new Ctcp(), Ctcp.INFO);
-        registerCommand(new Disconnect(), Disconnect.INFO);
-        registerCommand(new Ignore(), Ignore.INFO);
-        registerCommand(new JoinChannelCommand(), JoinChannelCommand.INFO);
-        registerCommand(new Message(), Message.INFO);
-        registerCommand(new Nick(), Nick.INFO);
-        registerCommand(new Notice(), Notice.INFO);
-        registerCommand(new OpenQuery(), OpenQuery.INFO);
-        registerCommand(new Raw(), Raw.INFO);
-        registerCommand(new Reconnect(), Reconnect.INFO);
-        registerCommand(new Umode(), Umode.INFO);
-
-        registerCommand(new RawServerCommand("lusers"));
-        registerCommand(new RawServerCommand("map"));
-        registerCommand(new RawServerCommand("motd"));
-        registerCommand(new RawServerCommand("oper"));
-        registerCommand(new RawServerCommand("whois"));
-        registerCommand(new RawServerCommand("who"));
-
-        // Query commands
-
-        // Global commands
-        registerCommand(new AliasCommand(), AliasCommand.INFO);
-        registerCommand(new AllServers(), AllServers.INFO);
-        registerCommand(new Clear(), Clear.INFO);
-        registerCommand(new Echo(), Echo.INFO);
-        registerCommand(new Exit(), Exit.INFO);
-        registerCommand(new Help(), Help.INFO);
-        registerCommand(new Ifplugin(), Ifplugin.INFO);
-        registerCommand(new NewServer(new BasicServerFactory()), NewServer.INFO);
-        registerCommand(new Notify(), Notify.INFO);
-        registerCommand(new LoadPlugin(), LoadPlugin.INFO);
-        registerCommand(new UnloadPlugin(), UnloadPlugin.INFO);
-        registerCommand(new OpenWindow(), OpenWindow.INFO);
-        registerCommand(new ReloadActions(), ReloadActions.INFO);
-        registerCommand(new ReloadIdentities(), ReloadIdentities.INFO);
-        registerCommand(new ReloadPlugin(), ReloadPlugin.INFO);
-        registerCommand(new SaveConfig(), SaveConfig.INFO);
-        registerCommand(new Set(), Set.INFO);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void loadCommands(final CommandParser parser,

src/com/dmdirc/interfaces/CommandController.java

@@ -85,11 +85,6 @@ public interface CommandController {
      */
     char getSilenceChar();
 
-    /**
-     * Instansiates the default commands.
-     */
-    void initCommands();
-
     /**
      * Determines if the specified command is a valid channel command.
      *

test/com/dmdirc/commandparser/commands/HelpTest.java

@@ -22,6 +22,7 @@
 package com.dmdirc.commandparser.commands;
 
 import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.CommandLoader;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.config.IdentityManager;
@@ -62,7 +63,7 @@ public class HelpTest {
         final List<Object[]> res = new LinkedList<Object[]>();
 
         IdentityManager.getIdentityManager().initialise();
-        CommandManager.getCommandManager().initCommands();
+        new CommandLoader().loadCommands(CommandManager.getCommandManager());
 
         for (CommandType type : CommandType.values()) {
             for (CommandInfo command : CommandManager.getCommandManager().getCommands(type).keySet()) {

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

@@ -36,7 +36,7 @@ public class CommandParserTest {
     @BeforeClass
     public static void setUpClass() throws Exception {
         IdentityManager.getIdentityManager().initialise();
-        CommandManager.getCommandManager().initCommands();
+        CommandManager.getCommandManager().registerCommand(new Echo(), Echo.INFO);
     }
 
     @Test