Added some initial support for silent commands

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

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

@@ -60,20 +60,15 @@ public final class ChannelCommandParser extends CommandParser {
         CommandManager.loadChannelCommands(this);
     }
     
-    /**
-     * Executes the specified command with the given arguments.
-     * @param origin The window in which the command was typed
-     * @param command The command to be executed
-     * @param args The arguments to the command
-     */
+    /** {@inheritDoc} */
     protected void executeCommand(final CommandWindow origin,
-            final Command command, final String... args) {
+            final boolean isSilent, final Command command, final String... args) {
         if (command instanceof ChannelCommand) {
             ((ChannelCommand) command).execute(origin, server, channel, args);
         } else if (command instanceof ServerCommand) {
             ((ServerCommand) command).execute(origin, server, args);
         } else {
-            ((GlobalCommand) command).execute(origin, args);
+            ((GlobalCommand) command).execute(origin, isSilent, args);
         }
     }
     

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

@@ -99,6 +99,20 @@ public abstract class Command implements Comparable<Command> {
         return implodeArgs(0, args);
     } 
     
+    /**
+     * Sends a line, if appropriate, to the specified target.
+     * @param target The command window to send the line to
+     * @param isSilent Whether this command is being silenced or not
+     * @param type The type of message to send
+     * @param args The arguments of the message
+     */
+    protected final void sendLine(final CommandWindow target,
+            final boolean isSilent, final String type, final Object ... args) {
+        if (!isSilent && target != null) {
+            target.addLine(type, args);
+        }
+    }
+    
     /** {@inheritDoc} */
     public int compareTo(final Command o) {
         return getSignature().compareTo(o.getSignature());

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

@@ -116,9 +116,9 @@ public abstract class CommandParser {
             // have error handlers if there are too few arguments (e.g., msg/0 and
             // msg/1 would return errors, so msg only gets called with 2+ args).
             if (commands.containsKey(signature.toLowerCase())) {
-                executeCommand(origin, commands.get(signature.toLowerCase()), comargs);
+                executeCommand(origin, false, commands.get(signature.toLowerCase()), comargs);
             } else if (commands.containsKey(command.toLowerCase())) {
-                executeCommand(origin, commands.get(command.toLowerCase()), comargs);
+                executeCommand(origin, false, commands.get(command.toLowerCase()), comargs);
             } else {
                 handleInvalidCommand(origin, command, comargs);
             }
@@ -149,11 +149,12 @@ public abstract class CommandParser {
     /**
      * Executes the specified command with the given arguments.
      * @param origin The window in which the command was typed
+     * @param isSilent Whether the command is being silenced or not
      * @param command The command to be executed
      * @param args The arguments to the command
      */
     protected abstract void executeCommand(final CommandWindow origin,
-            final Command command, final String... args);
+            final boolean isSilent, final Command command, final String... args);
     
     /**
      * Called when the user attempted to issue a command (i.e., used the command

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

@@ -33,7 +33,8 @@ public abstract class GlobalCommand extends Command {
      * Executes this command. Note that for global commands, origin may be
      * null.
      * @param origin The window in which the command was typed
+     * @param isSilent Whetehr this command is silenced or not
      * @param args Arguments passed to this command
      */
-    public abstract void execute(CommandWindow origin, String ... args);
+    public abstract void execute(CommandWindow origin, boolean isSilent, String ... args);
 }

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

@@ -48,7 +48,7 @@ public final class GlobalCommandParser extends CommandParser {
      * Retrieves a singleton instance of the global command parser.
      * @return A GlobalCommandParser
      */
-    public static synchronized  GlobalCommandParser getGlobalCommandParser() {
+    public static synchronized GlobalCommandParser getGlobalCommandParser() {
         if (me == null) {
             me = new GlobalCommandParser();
         }
@@ -61,15 +61,10 @@ public final class GlobalCommandParser extends CommandParser {
         CommandManager.loadGlobalCommands(this);
     }
     
-    /**
-     * Executes the specified command with the given arguments.
-     * @param origin The window in which the command was typed
-     * @param command The command to be executed
-     * @param args The arguments to the command
-     */
+    /** {@inheritDoc} */
     protected void executeCommand(final CommandWindow origin,
-            final Command command, final String... args) {
-        ((GlobalCommand) command).execute(origin, args);
+            final boolean isSilent, final Command command, final String... args) {
+        ((GlobalCommand) command).execute(origin, isSilent, args);
     }
     
     /**

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

@@ -60,20 +60,15 @@ public final class QueryCommandParser extends CommandParser {
         CommandManager.loadQueryCommands(this);
     }
     
-    /**
-     * Executes the specified command with the given arguments.
-     * @param origin The window in which the command was typed
-     * @param command The command to be executed
-     * @param args The arguments to the command
-     */
+    /** {@inheritDoc} */
     protected void executeCommand(final CommandWindow origin,
-            final Command command, final String... args) {
+            final boolean isSilent, final Command command, final String... args) {
         if (command instanceof QueryCommand) {
             ((QueryCommand) command).execute(origin, server, query, args);
         } else if (command instanceof ServerCommand) {
             ((ServerCommand) command).execute(origin, server, args);
         } else {
-            ((GlobalCommand) command).execute(origin, args);
+            ((GlobalCommand) command).execute(origin, isSilent, args);
         }
     }
     

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

@@ -51,18 +51,13 @@ public final class ServerCommandParser extends CommandParser {
         CommandManager.loadServerCommands(this);
     }
     
-    /**
-     * Executes the specified command with the given arguments.
-     * @param origin The window in which the command was typed
-     * @param command The command to be executed
-     * @param args The arguments to the command
-     */
+    /** {@inheritDoc} */
     protected void executeCommand(final CommandWindow origin,
-            final Command command, final String... args) {
+            final boolean isSilent, final Command command, final String... args) {
         if (command instanceof ServerCommand) {
             ((ServerCommand) command).execute(origin, server, args);
         } else {
-            ((GlobalCommand) command).execute(origin, args);
+            ((GlobalCommand) command).execute(origin, isSilent, args);
         }
     }
     

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

@@ -41,12 +41,9 @@ public class AllServers extends GlobalCommand {
         CommandManager.registerCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param args The user supplied arguments
-     */
-    public void execute(final CommandWindow origin, final String... args) {
+    /** {@inheritDoc} */
+    public void execute(final CommandWindow origin, final boolean isSilent,
+            final String... args) {
         final String command = implodeArgs(args);
         CommandWindow window;
         

src/uk/org/ownage/dmdirc/commandparser/commands/global/Exit.java

@@ -44,8 +44,9 @@ public final class Exit extends GlobalCommand {
         CommandManager.registerCommand(this);
     }
     
-    /** {@inheritDoc}  */
-    public void execute(final CommandWindow origin, final String... args) {
+    /** {@inheritDoc} */
+    public void execute(final CommandWindow origin, final boolean isSilent,
+            final String... args) {
         Main.quit(implodeArgs(args));
     }
     

src/uk/org/ownage/dmdirc/commandparser/commands/global/ExitDefault.java

@@ -44,8 +44,9 @@ public final class ExitDefault extends GlobalCommand {
         CommandManager.registerCommand(this);
     }
     
-    /** {@inheritDoc}  */
-    public void execute(final CommandWindow origin, final String... args) {
+    /** {@inheritDoc} */
+    public void execute(final CommandWindow origin, final boolean isSilent,
+            final String... args) {
         String def;
         
         if (origin == null) {
@@ -54,7 +55,7 @@ public final class ExitDefault extends GlobalCommand {
             def = origin.getConfigManager().getOption("general", "closemessage");
         }
         
-        CommandManager.getGlobalCommand("exit").execute(origin, def);
+        CommandManager.getGlobalCommand("exit").execute(origin, isSilent, def);
     }
     
     

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

@@ -42,12 +42,9 @@ public final class LoadFormatter extends GlobalCommand {
         CommandManager.registerCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param args The user supplied arguments
-     */
-    public void execute(final CommandWindow origin, final String... args) {
+    /** {@inheritDoc} */
+    public void execute(final CommandWindow origin, final boolean isSilent,
+            final String... args) {
         if (Formatter.loadFile(args[0])) {
             origin.addLine("commandOutput", "Formatter loaded.");
         } else {

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

@@ -42,12 +42,9 @@ public final class LoadPlugin extends GlobalCommand {
         CommandManager.registerCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param args The user supplied arguments
-     */
-    public void execute(final CommandWindow origin, final String... args) {
+    /** {@inheritDoc} */
+    public void execute(final CommandWindow origin, final boolean isSilent,
+            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/global/NewServer.java

@@ -45,8 +45,9 @@ public final class NewServer extends GlobalCommand {
         CommandManager.registerCommand(this);
     }
     
-    /** {@inheritDoc}  */
-    public void execute(final CommandWindow origin, final String... args) {
+    /** {@inheritDoc} */
+    public void execute(final CommandWindow origin, final boolean isSilent,
+            final String... args) {
         if (args.length == 0) {
             origin.addLine("commandUsage", Config.getCommandChar(), "newserver",
                     "[--ssl] <host[:port]> [password]");

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

@@ -42,12 +42,9 @@ public final class ReloadActions extends GlobalCommand {
         CommandManager.registerCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param args The user supplied arguments
-     */
-    public void execute(final CommandWindow origin, final String... args) {
+    /** {@inheritDoc} */
+    public void execute(final CommandWindow origin, final boolean isSilent,
+            final String... args) {
         ActionManager.loadActions();
         origin.addLine("commandOutput", "Actions reloaded.");
     }

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

@@ -42,12 +42,9 @@ public final class ReloadFormatter extends GlobalCommand {
         CommandManager.registerCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param args The user supplied arguments
-     */
-    public void execute(final CommandWindow origin, final String... args) {
+    /** {@inheritDoc} */
+    public void execute(final CommandWindow origin, final boolean isSilent,
+            final String... args) {
         Formatter.reload();
         origin.addLine("commandOutput", "Formatter reloaded.");
     }

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

@@ -43,12 +43,9 @@ public final class ReloadPlugin extends GlobalCommand {
         CommandManager.registerCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param args The user supplied arguments
-     */
-    public void execute(final CommandWindow origin, final String... args) {
+    /** {@inheritDoc} */
+    public void execute(final CommandWindow origin, final boolean isSilent,
+            final String... args) {
         Plugin plugin = PluginManager.getPluginManager().getPlugin(args[0]);
         if (plugin != null) {
             boolean isActive = plugin.isActive();

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

@@ -42,12 +42,9 @@ public final class SaveFormatter extends GlobalCommand {
         CommandManager.registerCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param args The user supplied arguments
-     */
-    public void execute(final CommandWindow origin, final String... args) {
+    /** {@inheritDoc} */
+    public void execute(final CommandWindow origin, final boolean isSilent,
+            final String... args) {
         if (Formatter.saveAs(args[0])) {
             origin.addLine("commandOutput", "Formatter saved.");
         } else {

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

@@ -42,12 +42,9 @@ public final class Set extends GlobalCommand {
         CommandManager.registerCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param args The user supplied arguments
-     */
-    public void execute(final CommandWindow origin, final String... args) {
+    /** {@inheritDoc} */
+    public void execute(final CommandWindow origin, final boolean isSilent,
+            final String... args) {
         switch (args.length) {
             case 0:
                 doDomainList(origin);