Made a load of server commands global

git-svn-id: http://svn.dmdirc.com/trunk@1266 00569f92-eb28-0410-84fd-f71c24880f

src/uk/org/ownage/dmdirc/commandparser/CommandManager.java

@@ -265,7 +265,6 @@ public final class CommandManager {
         
         // Server commands
         new AllChannels();
-        new AllServers();
         new Away();
         new Back();
         new Clear();
@@ -276,8 +275,6 @@ public final class CommandManager {
         new Help();
         new Ignore();
         new Join();
-        new LoadFormatter();
-        new LoadPlugin();
         new Message();
         new Motd();
         new Nick();
@@ -285,11 +282,6 @@ public final class CommandManager {
         new Query();
         new Raw();
         new Reconnect();
-        new ReloadActions();
-        new ReloadFormatter();
-        new ReloadPlugin();
-        new SaveFormatter();
-        new Set();
         new Whois();
         
         // Query commands
@@ -300,6 +292,14 @@ public final class CommandManager {
         new Exit();
         new ExitDefault();
         new NewServer();
+        new AllServers();
+        new LoadFormatter();
+        new LoadPlugin();
+        new ReloadActions();
+        new ReloadFormatter();
+        new ReloadPlugin();
+        new SaveFormatter();
+        new Set();
     }
     
     /**
@@ -498,7 +498,7 @@ public final class CommandManager {
         }
         
         return getCommandNames(globalCommands);
-    }    
+    }
     
     /**
      * Returns the names (including command char) of all registered channel

src/uk/org/ownage/dmdirc/commandparser/commands/server/AllServers.java → src/uk/org/ownage/dmdirc/commandparser/commands/global/AllServers.java

@@ -20,19 +20,19 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package uk.org.ownage.dmdirc.commandparser.commands.global;
 
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.ServerManager;
 import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
 
 /**
  * The AllServers command allows users to issue commands to all servers.
  * @author chris
  */
-public class AllServers extends ServerCommand {
+public class AllServers extends GlobalCommand {
     
     /** Creates a new instance of AllServers. */
     public AllServers() {
@@ -44,11 +44,9 @@ public class AllServers extends ServerCommand {
     /**
      * Executes this command.
      * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
-            final String... args) {
+    public void execute(final CommandWindow origin, final String... args) {
         final String command = implodeArgs(args);
         CommandWindow window;
         

src/uk/org/ownage/dmdirc/commandparser/commands/server/LoadFormatter.java → src/uk/org/ownage/dmdirc/commandparser/commands/global/LoadFormatter.java

@@ -20,19 +20,18 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package uk.org.ownage.dmdirc.commandparser.commands.global;
 
-import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
 import uk.org.ownage.dmdirc.ui.messages.Formatter;
 
 /**
  * Allows the user to load a message formatter from a file.
  * @author chris
  */
-public final class LoadFormatter extends ServerCommand {
+public final class LoadFormatter extends GlobalCommand {
     
     /**
      * Creates a new instance of LoadFormatter.
@@ -46,11 +45,9 @@ public final class LoadFormatter extends ServerCommand {
     /**
      * Executes this command.
      * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
-            final String... args) {
+    public void execute(final CommandWindow origin, final String... args) {
         if (Formatter.loadFile(args[0])) {
             origin.addLine("commandOutput", "Formatter loaded.");
         } else {

src/uk/org/ownage/dmdirc/commandparser/commands/server/LoadPlugin.java → src/uk/org/ownage/dmdirc/commandparser/commands/global/LoadPlugin.java

@@ -20,20 +20,18 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package uk.org.ownage.dmdirc.commandparser.commands.global;
 
-import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
 import uk.org.ownage.dmdirc.plugins.PluginManager;
-import uk.org.ownage.dmdirc.ui.messages.Formatter;
 
 /**
  * Allows the user to load a plugin.
  * @author chris
  */
-public final class LoadPlugin extends ServerCommand {
+public final class LoadPlugin extends GlobalCommand {
     
     /**
      * Creates a new instance of LoadPlugin.
@@ -47,11 +45,9 @@ public final class LoadPlugin extends ServerCommand {
     /**
      * Executes this command.
      * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
-            final String... args) {
+    public void execute(final CommandWindow origin, final String... args) {
         if (PluginManager.getPluginManager().addPlugin(args[0])) {
             PluginManager.getPluginManager().getPlugin(args[0]).setActive(true);
             origin.addLine("commandOutput", "Plugin loaded.");

src/uk/org/ownage/dmdirc/commandparser/commands/server/ReloadActions.java → src/uk/org/ownage/dmdirc/commandparser/commands/global/ReloadActions.java

@@ -20,19 +20,18 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package uk.org.ownage.dmdirc.commandparser.commands.global;
 
-import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.actions.ActionManager;
 import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
 
 /**
  * Allows the user to reload actions.
  * @author chris
  */
-public final class ReloadActions extends ServerCommand {
+public final class ReloadActions extends GlobalCommand {
     
     /**
      * Creates a new instance of ReloadActions.
@@ -46,11 +45,9 @@ public final class ReloadActions extends ServerCommand {
     /**
      * Executes this command.
      * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
-            final String... args) {
+    public void execute(final CommandWindow origin, final String... args) {
         ActionManager.loadActions();
         origin.addLine("commandOutput", "Actions reloaded.");
     }

src/uk/org/ownage/dmdirc/commandparser/commands/server/ReloadFormatter.java → src/uk/org/ownage/dmdirc/commandparser/commands/global/ReloadFormatter.java

@@ -20,19 +20,18 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package uk.org.ownage.dmdirc.commandparser.commands.global;
 
-import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
 import uk.org.ownage.dmdirc.ui.messages.Formatter;
 
 /**
  * Allows the user to reload the message formatter.
  * @author chris
  */
-public final class ReloadFormatter extends ServerCommand {
+public final class ReloadFormatter extends GlobalCommand {
     
     /**
      * Creates a new instance of ReloadFormatter.
@@ -46,11 +45,9 @@ public final class ReloadFormatter extends ServerCommand {
     /**
      * Executes this command.
      * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
-            final String... args) {
+    public void execute(final CommandWindow origin, final String... args) {
         Formatter.reload();
         origin.addLine("commandOutput", "Formatter reloaded.");
     }

src/uk/org/ownage/dmdirc/commandparser/commands/server/ReloadPlugin.java → src/uk/org/ownage/dmdirc/commandparser/commands/global/ReloadPlugin.java

@@ -20,21 +20,19 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package uk.org.ownage.dmdirc.commandparser.commands.global;
 
-import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
 import uk.org.ownage.dmdirc.plugins.PluginManager;
 import uk.org.ownage.dmdirc.plugins.Plugin;
-import uk.org.ownage.dmdirc.ui.messages.Formatter;
 
 /**
  * Allows the user to reload a plugin.
  * @author chris
  */
-public final class ReloadPlugin extends ServerCommand {
+public final class ReloadPlugin extends GlobalCommand {
     
     /**
      * Creates a new instance of ReloadPlugin.
@@ -48,11 +46,9 @@ public final class ReloadPlugin extends ServerCommand {
     /**
      * Executes this command.
      * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
-            final String... args) {
+    public void execute(final CommandWindow origin, final String... args) {
         Plugin plugin = PluginManager.getPluginManager().getPlugin(args[0]);
         if (plugin != null) {
             boolean isActive = plugin.isActive();

src/uk/org/ownage/dmdirc/commandparser/commands/server/SaveFormatter.java → src/uk/org/ownage/dmdirc/commandparser/commands/global/SaveFormatter.java

@@ -20,19 +20,18 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package uk.org.ownage.dmdirc.commandparser.commands.global;
 
-import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
 import uk.org.ownage.dmdirc.ui.messages.Formatter;
 
 /**
  * Allows the user to save the message formatter to a file.
  * @author chris
  */
-public final class SaveFormatter extends ServerCommand {
+public final class SaveFormatter extends GlobalCommand {
     
     /**
      * Creates a new instance of SaveFormatter.
@@ -46,11 +45,9 @@ public final class SaveFormatter extends ServerCommand {
     /**
      * Executes this command.
      * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
-            final String... args) {
+    public void execute(final CommandWindow origin, final String... args) {
         if (Formatter.saveAs(args[0])) {
             origin.addLine("commandOutput", "Formatter saved.");
         } else {

src/uk/org/ownage/dmdirc/commandparser/commands/server/Set.java → src/uk/org/ownage/dmdirc/commandparser/commands/global/Set.java

@@ -20,19 +20,18 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package uk.org.ownage.dmdirc.commandparser.commands.global;
 
 import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
 
 /**
  * The set command allows the user to inspect and change global config settings.
  * @author chris
  */
-public final class Set extends ServerCommand {
+public final class Set extends GlobalCommand {
     
     /**
      * Creates a new instance of Set.
@@ -46,11 +45,9 @@ public final class Set extends ServerCommand {
     /**
      * Executes this command.
      * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
-            final String... args) {
+    public void execute(final CommandWindow origin, final String... args) {
         switch (args.length) {
             case 0:
                 doDomainList(origin);