Commands now use constants for the two common formats (commandOutput/commandError)

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

src/com/dmdirc/addons/audio/AudioCommand.java

@@ -61,10 +61,10 @@ public final class AudioCommand extends GlobalCommand {
 			if (AudioPlayer.isValid(file)) {
 				new AudioPlayer(file).start();
 			} else {
-				sendLine(origin, isSilent, "commandError", "Invalid file type");
+				sendLine(origin, isSilent, FORMAT_ERROR, "Invalid file type");
 			}
 		} else {
-			sendLine(origin, isSilent, "commandError", "File does not exist");
+			sendLine(origin, isSilent, FORMAT_ERROR, "File does not exist");
 		}
 	}
 

src/com/dmdirc/addons/dcop/DcopCommand.java

@@ -55,7 +55,7 @@ public final class DcopCommand extends ServerCommand {
             final boolean isSilent, final String... args) {
         final List<String> res = DcopPlugin.getDcopResult("dcop " + implodeArgs(args));
         for (String line : res) {
-            sendLine(origin, isSilent, "commandOutput", line);
+            sendLine(origin, isSilent, FORMAT_OUTPUT, line);
         }
     }
     

src/com/dmdirc/addons/dns/DNSCommand.java

@@ -44,13 +44,13 @@ public final class DNSCommand extends GlobalCommand {
     /** {@inheritDoc} */
     public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
-        sendLine(origin, isSilent, "commandOutput", "Resolving: " + args[0]);
+        sendLine(origin, isSilent, FORMAT_OUTPUT, "Resolving: " + args[0]);
         new Timer("DNS Command Timer").schedule(new TimerTask() {
             public void run() {
                 if (args[0].matches("\\b(?:\\d{1,3}\\.){3}\\d{1,3}\\b")) {
-                    sendLine(origin, isSilent, "commandOutput", "Resolved: " + args[0] + ": " + DNSPlugin.getHostname(args[0]));
+                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Resolved: " + args[0] + ": " + DNSPlugin.getHostname(args[0]));
                 } else {
-                    sendLine(origin, isSilent, "commandOutput", "Resolved: " + args[0] + ": " + DNSPlugin.getIPs(args[0]));
+                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Resolved: " + args[0] + ": " + DNSPlugin.getIPs(args[0]));
                 }
             }
         }, 0);

src/com/dmdirc/addons/logging/LoggingCommand.java

@@ -60,7 +60,7 @@ public final class LoggingCommand extends ServerCommand implements IntelligentCo
 		final Plugin gotPlugin = PluginManager.getPluginManager().getPlugin("com.dmdirc.addons.logging.LoggingPlugin");
 		
 		if (gotPlugin == null || !(gotPlugin instanceof LoggingPlugin)) {
-			sendLine(origin, isSilent, "commandError", "Logging Plugin is not loaded.");
+			sendLine(origin, isSilent, FORMAT_ERROR, "Logging Plugin is not loaded.");
 			return;
 		}
 		
@@ -72,25 +72,25 @@ public final class LoggingCommand extends ServerCommand implements IntelligentCo
 			} else if (args[0].equalsIgnoreCase("reload")) {
 				boolean wasActive = plugin.isActive();
 				if (PluginManager.getPluginManager().reloadPlugin("com.dmdirc.addons.logging.LoggingPlugin")) {
-					sendLine(origin, isSilent, "commandOutput", "Plugin reloaded.");
+					sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin reloaded.");
 					PluginManager.getPluginManager().getPlugin("com.dmdirc.addons.logging.LoggingPlugin").setActive(wasActive);
 				} else {
-					sendLine(origin, isSilent, "commandError", "Plugin failed to reload.");
+					sendLine(origin, isSilent, FORMAT_ERROR, "Plugin failed to reload.");
 				}
 			} else if (args[0].equalsIgnoreCase("history")) {
 				if (!plugin.showHistory(origin)) {
-					sendLine(origin, isSilent, "commandError", "Unable to open history for this window.");
+					sendLine(origin, isSilent, FORMAT_ERROR, "Unable to open history for this window.");
     		}
 			} else if (args[0].equalsIgnoreCase("help")) {
-				sendLine(origin, isSilent, "commandOutput", getName() + " reload           - Reload the logging plugin.");
-				sendLine(origin, isSilent, "commandOutput", getName() + " history          - Open the history of this window, if available.");
-				sendLine(origin, isSilent, "commandOutput", getName() + " help             - Show this help.");
-				sendLine(origin, isSilent, "commandOutput", getName() + " config           - Show the logging plugin configuration.");
+				sendLine(origin, isSilent, FORMAT_OUTPUT, getName() + " reload           - Reload the logging plugin.");
+				sendLine(origin, isSilent, FORMAT_OUTPUT, getName() + " history          - Open the history of this window, if available.");
+				sendLine(origin, isSilent, FORMAT_OUTPUT, getName() + " help             - Show this help.");
+				sendLine(origin, isSilent, FORMAT_OUTPUT, getName() + " config           - Show the logging plugin configuration.");
 			} else {
-				sendLine(origin, isSilent, "commandError", "Unknown command '" + args[0] + "'. Use " + getName() + " help for a list of commands.");
+				sendLine(origin, isSilent, FORMAT_ERROR, "Unknown command '" + args[0] + "'. Use " + getName() + " help for a list of commands.");
 			}
 		} else {
-			sendLine(origin, isSilent, "commandError", "Use " + getName() + " help for a list of commands.");
+			sendLine(origin, isSilent, FORMAT_ERROR, "Use " + getName() + " help for a list of commands.");
 		}
 	}
 

src/com/dmdirc/addons/nowplaying/plugin/NowPlayingCommand.java

@@ -67,22 +67,22 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
                 final MediaSource source = parent.getSource(sourceName);
                 
                 if (source == null) {
-                    sendLine(origin, isSilent, "commandError", "Source not found.");
+                    sendLine(origin, isSilent, FORMAT_ERROR, "Source not found.");
                 } else {
                     if (source.isRunning()) {
                         target.sendAction("is playing " + source.getInformation());
                     } else {
-                        sendLine(origin, isSilent, "commandError", "Source is not running.");
+                        sendLine(origin, isSilent, FORMAT_ERROR, "Source is not running.");
                     }
                 }
             } else {
-                sendLine(origin, isSilent, "commandError", "You must specify a source when using --source.");
+                sendLine(origin, isSilent, FORMAT_ERROR, "You must specify a source when using --source.");
             }
         } else {
             if (parent.hasRunningSource()) {
                 target.sendAction("is playing " + parent.getBestSource().getInformation());
             } else {
-                sendLine(origin, isSilent, "commandError", "No running media sources available.");
+                sendLine(origin, isSilent, FORMAT_ERROR, "No running media sources available.");
             }
         }
     }
@@ -97,7 +97,7 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
         final List<MediaSource> sources = parent.getSources();
         
         if (sources.isEmpty()) {
-            sendLine(origin, isSilent, "commandError", "No media sources available.");
+            sendLine(origin, isSilent, FORMAT_ERROR, "No media sources available.");
         } else {
             String status;
             
@@ -111,7 +111,7 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
                 } else {
                     status = "not running";
                 }
-                sendLine(origin, isSilent, "commandOutput", source.getName() + ": " + status);
+                sendLine(origin, isSilent, FORMAT_OUTPUT, source.getName() + ": " + status);
             }
         }
     }

src/com/dmdirc/addons/timeplugin/TimerCommand.java

@@ -59,7 +59,7 @@ public final class TimerCommand extends GlobalCommand {
             }
             
             new TimedCommand(repetitions, interval, command, origin);
-            sendLine(origin, isSilent, "commandOutput", "Command scheduled.");
+            sendLine(origin, isSilent, FORMAT_OUTPUT, "Command scheduled.");
         }
     }
     

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

@@ -30,6 +30,12 @@ import com.dmdirc.ui.interfaces.InputWindow;
  * @author chris
  */
 public abstract class Command implements Comparable<Command> {
+    
+    /** The format name used for command output. */
+    protected static final String FORMAT_OUTPUT = "commandOutput";
+    
+    /** The format name used for command errors. */
+    protected static final String FORMAT_ERROR = "commandError";
             
     /**
      * Returns the signature of this command. For polyadic commands, the signature

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

@@ -57,7 +57,7 @@ public final class KickReason extends ChannelCommand {
         final ChannelClientInfo victim = channel.getChannelInfo().getUser(args[0]);
         
         if (victim == null) {
-            sendLine(origin, isSilent, "commandError", "User not found: " + args[0]);
+            sendLine(origin, isSilent, FORMAT_ERROR, "User not found: " + args[0]);
         } else {
             victim.kick(implodeArgs(1, args));
         }

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

@@ -81,7 +81,7 @@ public final class SetNickColour extends ChannelCommand {
         offset++;
         
         if (target == null) {
-            sendLine(origin, isSilent, "commandError", "No such nickname (" + args[offset - 1] + ")!");
+            sendLine(origin, isSilent, FORMAT_ERROR, "No such nickname (" + args[offset - 1] + ")!");
         } else if (args.length <= offset) {
             // We're removing the colour
             if (nicklist) {
@@ -95,7 +95,7 @@ public final class SetNickColour extends ChannelCommand {
             // We're setting the colour
             final Color newColour = ColourManager.parseColour(args[offset], null);
             if (newColour == null) {
-                sendLine(origin, isSilent, "commandError", "Invalid colour specified.");
+                sendLine(origin, isSilent, FORMAT_ERROR, "Invalid colour specified.");
                 return;
             }
             if (nicklist) {

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

@@ -76,7 +76,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
         } else if ("forceupdate".equals(args[0])) {
             doForceUpdate();
         } else {
-            sendLine(origin, isSilent, "commandError", "Unknown debug action.");
+            sendLine(origin, isSilent, FORMAT_ERROR, "Unknown debug action.");
         }
     }
     
@@ -124,7 +124,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
     private void doShowRaw(final InputWindow origin, final boolean isSilent) {
         if (origin == null || origin.getContainer() == null
                 || origin.getContainer().getServer() == null) {
-            sendLine(origin, isSilent, "commandError", "Cannot show raw window here.");
+            sendLine(origin, isSilent, FORMAT_ERROR, "Cannot show raw window here.");
         } else {
             origin.getContainer().getServer().addRaw();
         }
@@ -138,7 +138,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      */
     private void doConfigStats(final InputWindow origin, final boolean isSilent) {
         for (Map.Entry<String, Integer> entry : ConfigManager.getStats().entrySet()) {
-            sendLine(origin, isSilent, "commandOutput",
+            sendLine(origin, isSilent, FORMAT_OUTPUT,
                     entry.getKey() + " - " + entry.getValue());
         }
     }
@@ -150,11 +150,11 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param isSilent Whether this command has been silenced or not
      */
     private void doMemInfo(final InputWindow origin, final boolean isSilent) {
-        sendLine(origin, isSilent, "commandOutput", "Total Memory: "
+        sendLine(origin, isSilent, FORMAT_OUTPUT, "Total Memory: "
                 + Runtime.getRuntime().totalMemory());
-        sendLine(origin, isSilent, "commandOutput", "Free Memory: "
+        sendLine(origin, isSilent, FORMAT_OUTPUT, "Free Memory: "
                 + Runtime.getRuntime().freeMemory());
-        sendLine(origin, isSilent, "commandOutput", "Used Memory: "
+        sendLine(origin, isSilent, FORMAT_OUTPUT, "Used Memory: "
                 + (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()));
     }
     
@@ -166,7 +166,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      */
     private void doColourSpam(final InputWindow origin, final boolean isSilent) {
         for (int i = 0; i < 100; i++) {
-            sendLine(origin, isSilent, "commandOutput", ((char) 3) + "5Colour! "
+            sendLine(origin, isSilent, FORMAT_OUTPUT, ((char) 3) + "5Colour! "
                     + ((char) 3) + "6Colour! " + ((char) 3) + "7Colour! "
                     + ((char) 3) + "6Colour! " + ((char) 3) + "7Colour! "
                     + ((char) 3) + "6Colour! " + ((char) 3) + "7Colour! "
@@ -182,7 +182,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      */
     private void doGarbage(final InputWindow origin, final boolean isSilent) {
         System.gc();
-        sendLine(origin, isSilent, "commandOutput", "Invoked garbage collector.");
+        sendLine(origin, isSilent, FORMAT_OUTPUT, "Invoked garbage collector.");
     }
     
     /**
@@ -193,7 +193,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      */
     private void doConfigInfo(final InputWindow origin, final boolean isSilent) {
         for (Identity source : origin.getConfigManager().getSources()) {
-            sendLine(origin, isSilent, "commandOutput", source.getTarget() + " - " + source);
+            sendLine(origin, isSilent, FORMAT_OUTPUT, source.getTarget() + " - " + source);
         }
     }
     
@@ -205,7 +205,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      */
     private void doGlobalConfigInfo(final InputWindow origin, final boolean isSilent) {
         for (Identity source : IdentityManager.getGlobalConfig().getSources()) {
-            sendLine(origin, isSilent, "commandOutput", source.getTarget() + " - " + source);
+            sendLine(origin, isSilent, FORMAT_OUTPUT, source.getTarget() + " - " + source);
         }
     }
     

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

@@ -54,10 +54,10 @@ public final class Echo extends GlobalCommand {
         if (args.length > 0 && args[0].equalsIgnoreCase("--active")) {
             final Window frame = Main.getUI().getMainWindow().getActiveFrame();
             if (frame instanceof InputWindow) {
-                ((InputWindow) frame).addLine("commandOutput", implodeArgs(1, args));
+                ((InputWindow) frame).addLine(FORMAT_OUTPUT, implodeArgs(1, args));
             }
         } else {
-            sendLine(origin, isSilent, "commandOutput", implodeArgs(args));
+            sendLine(origin, isSilent, FORMAT_OUTPUT, implodeArgs(args));
         }
     }
     

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

@@ -60,27 +60,27 @@ public final class Help extends ServerCommand {
      */
     public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
-        sendLine(origin, isSilent, "commandOutput", "-- Global commands ----------------------------------");
+        sendLine(origin, isSilent, FORMAT_OUTPUT, "-- Global commands ----------------------------------");
         showCommands(CommandManager.getGlobalCommands(), origin, isSilent);
         
         if (origin instanceof ServerWindow || origin instanceof ChannelWindow
                 || origin instanceof QueryWindow) {
-            sendLine(origin, isSilent, "commandOutput", "-- Server commands ----------------------------------");
+            sendLine(origin, isSilent, FORMAT_OUTPUT, "-- Server commands ----------------------------------");
             showCommands(CommandManager.getServerCommands(), origin, isSilent);
         }
         
             if (origin instanceof ChannelWindow) {
-            sendLine(origin, isSilent, "commandOutput", "-- Channel commands ---------------------------------");
+            sendLine(origin, isSilent, FORMAT_OUTPUT, "-- Channel commands ---------------------------------");
             showCommands(CommandManager.getChannelCommands(), origin, isSilent);
         }
         
         if (origin instanceof QueryWindow) {
-            sendLine(origin, isSilent, "commandOutput", "-- Query commands -----------------------------------");
+            sendLine(origin, isSilent, FORMAT_OUTPUT, "-- Query commands -----------------------------------");
             showCommands(CommandManager.getQueryCommands(), origin, isSilent);
             
         }
         
-        sendLine(origin, isSilent, "commandOutput", "-----------------------------------------------------");
+        sendLine(origin, isSilent, FORMAT_OUTPUT, "-----------------------------------------------------");
     }
     
     /**
@@ -94,7 +94,7 @@ public final class Help extends ServerCommand {
         Collections.sort(commands);
         for (Command com : commands) {
             if (com.showInHelp()) {
-                sendLine(origin, isSilent, "commandOutput", com.getHelp());
+                sendLine(origin, isSilent, FORMAT_OUTPUT, com.getHelp());
             }
         }
     }

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

@@ -46,9 +46,9 @@ public final class LoadFormatter extends GlobalCommand {
     public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         if (Formatter.loadFile(args[0])) {
-            sendLine(origin, isSilent, "commandOutput", "Formatter loaded.");
+            sendLine(origin, isSilent, FORMAT_OUTPUT, "Formatter loaded.");
         } else {
-            sendLine(origin, isSilent, "commandError", "Formatter load failed.");
+            sendLine(origin, isSilent, FORMAT_ERROR, "Formatter load failed.");
         }
     }
     

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

@@ -53,9 +53,9 @@ public final class LoadPlugin extends GlobalCommand implements IntelligentComman
             final String... args) {
         if (PluginManager.getPluginManager().addPlugin(args[0])) {
             PluginManager.getPluginManager().getPlugin(args[0]).setActive(true);
-            sendLine(origin, isSilent, "commandOutput", "Plugin loaded.");
+            sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin loaded.");
         } else {
-            sendLine(origin, isSilent, "commandError", "Plugin Loading failed");
+            sendLine(origin, isSilent, FORMAT_ERROR, "Plugin Loading failed");
         }
     }
     

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

@@ -70,7 +70,7 @@ public final class NewServer extends GlobalCommand {
             try {
                 port = Integer.parseInt(parts[1]);
             } catch (NumberFormatException ex) {
-                origin.addLine("commandError", "Invalid port specified");
+                origin.addLine(FORMAT_ERROR, "Invalid port specified");
                 return;
             }
         } else {

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

@@ -46,7 +46,7 @@ public final class ReloadActions extends GlobalCommand {
     public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         ActionManager.loadActions();
-        sendLine(origin, isSilent, "commandOutput", "Actions reloaded.");
+        sendLine(origin, isSilent, FORMAT_OUTPUT, "Actions reloaded.");
     }
     
     

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

@@ -46,7 +46,7 @@ public final class ReloadFormatter extends GlobalCommand {
     public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         Formatter.reload();
-        sendLine(origin, isSilent, "commandOutput", "Formatter reloaded.");
+        sendLine(origin, isSilent, FORMAT_OUTPUT, "Formatter reloaded.");
     }
     
     

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

@@ -51,15 +51,15 @@ public final class ReloadPlugin extends GlobalCommand implements IntelligentComm
             final String... args) {
         Plugin plugin = PluginManager.getPluginManager().getPlugin(args[0]);
         if (plugin == null) {
-            sendLine(origin, isSilent, "commandError", "Plugin Reloading failed - Plugin not loaded");
+            sendLine(origin, isSilent, FORMAT_ERROR, "Plugin Reloading failed - Plugin not loaded");
         } else {
             final boolean isActive = plugin.isActive();
             plugin = null;
             if (PluginManager.getPluginManager().reloadPlugin(args[0])) {
-                sendLine(origin, isSilent, "commandOutput", "Plugin Reloaded.");
+                sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin Reloaded.");
                 PluginManager.getPluginManager().getPlugin(args[0]).setActive(isActive);
             } else {
-                sendLine(origin, isSilent, "commandError", "Plugin Reloading failed");
+                sendLine(origin, isSilent, FORMAT_ERROR, "Plugin Reloading failed");
             }
             
         }

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

@@ -48,7 +48,7 @@ public final class SaveConfig extends GlobalCommand {
             final String... args) {
         IdentityManager.save();
         
-        sendLine(origin, isSilent, "commandOutput", "Configuration file saved.");
+        sendLine(origin, isSilent, FORMAT_OUTPUT, "Configuration file saved.");
     }
     
     

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

@@ -46,9 +46,9 @@ public final class SaveFormatter extends GlobalCommand {
     public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         if (Formatter.saveAs(args[0])) {
-            sendLine(origin, isSilent, "commandOutput", "Formatter saved.");
+            sendLine(origin, isSilent, FORMAT_OUTPUT, "Formatter saved.");
         } else {
-            sendLine(origin, isSilent, "commandError", "Formatter save failed.");
+            sendLine(origin, isSilent, FORMAT_ERROR, "Formatter save failed.");
         }
     }
     

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

@@ -87,7 +87,7 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
             output.append(", ");
         }
         
-        sendLine(origin, isSilent, "commandOutput", output.substring(0, output.length() - 2));
+        sendLine(origin, isSilent, FORMAT_OUTPUT, output.substring(0, output.length() - 2));
     }
     
     /**
@@ -114,9 +114,9 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
         }
         
         if (found) {
-            sendLine(origin, isSilent, "commandOutput", output.substring(0, output.length() - 2));
+            sendLine(origin, isSilent, FORMAT_OUTPUT, output.substring(0, output.length() - 2));
         } else {
-            sendLine(origin, isSilent, "commandError", 
+            sendLine(origin, isSilent, FORMAT_ERROR, 
                     "There are no options in the domain '" + domain + "'.");
         }
     }
@@ -132,10 +132,10 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
     private void doShowOption(final InputWindow origin,
             final boolean isSilent, final String domain, final String option) {
         if (IdentityManager.getGlobalConfig().hasOption(domain, option)) {
-            sendLine(origin, isSilent, "commandOutput", "The current value of " + domain + "." + option
+            sendLine(origin, isSilent, FORMAT_OUTPUT, "The current value of " + domain + "." + option
                     + " is: " + IdentityManager.getGlobalConfig().getOption(domain, option));
         } else {
-            sendLine(origin, isSilent, "commandError", "Option not found: " + domain + "." + option);
+            sendLine(origin, isSilent, FORMAT_ERROR, "Option not found: " + domain + "." + option);
         }
     }
     
@@ -153,7 +153,7 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
             final String newvalue) {
         IdentityManager.getConfigIdentity().setOption(domain, option, newvalue);
         
-        sendLine(origin, isSilent, "commandOutput", domain + "." + option + " has been set to: " + newvalue);
+        sendLine(origin, isSilent, FORMAT_OUTPUT, domain + "." + option + " has been set to: " + newvalue);
     }
     
     /**
@@ -168,7 +168,7 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
             final boolean isSilent, final String domain, final String option) {
         IdentityManager.getConfigIdentity().unsetOption(domain, option);
         
-        sendLine(origin, isSilent, "commandOutput", domain + "." + option + " has been unset.");
+        sendLine(origin, isSilent, FORMAT_OUTPUT, domain + "." + option + " has been unset.");
     }
     
     /** {@inheritDoc} */

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

@@ -69,7 +69,7 @@ public final class ChangeServer extends ServerCommand {
             try {
                 port = Integer.parseInt(parts[1]);
             } catch (NumberFormatException ex) {
-                sendLine(origin, isSilent, "commandError", "Invalid port specified");
+                sendLine(origin, isSilent, FORMAT_ERROR, "Invalid port specified");
                 return;
             }
         } else {

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

@@ -62,22 +62,22 @@ public final class Ignore extends ServerCommand {
                 final String list = identity.getOption("network", "ignorelist");
                 
                 if (!list.isEmpty()) {
-                    sendLine(origin, isSilent, "commandOutput", "Ignore list:");
+                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Ignore list:");
                     
                     int i = 0;
                     for (String line : list.split("\n")) {
                         if (!line.isEmpty()) {
                             i++;
-                            sendLine(origin, isSilent, "commandOutput", i + ". " + line);
+                            sendLine(origin, isSilent, FORMAT_OUTPUT, i + ". " + line);
                         }
                     }
                     
                 } else {
-                    sendLine(origin, isSilent, "commandError", "No ignore list entries for this network.");
+                    sendLine(origin, isSilent, FORMAT_ERROR, "No ignore list entries for this network.");
                 }
                 
             } else {
-                sendLine(origin, isSilent, "commandError", "No ignore list entries for this network.");
+                sendLine(origin, isSilent, FORMAT_ERROR, "No ignore list entries for this network.");
             }
             
         } else if (args[0].toLowerCase().equals("add") && args.length > 1) {
@@ -92,7 +92,7 @@ public final class Ignore extends ServerCommand {
             
             identity.setOption("network", "ignorelist", list);
             
-            sendLine(origin, isSilent, "commandOutput", "Added " + host + " to the ignore list.");
+            sendLine(origin, isSilent, FORMAT_OUTPUT, "Added " + host + " to the ignore list.");
             
         } else if (args[0].toLowerCase().equals("remove") && args.length > 1) {
             
@@ -119,9 +119,9 @@ public final class Ignore extends ServerCommand {
             
             if (found) {
                 identity.setOption("network", "ignorelist", newlist.toString());
-                sendLine(origin, isSilent, "commandOutput", "Removed " + host + " from the ignore list.");
+                sendLine(origin, isSilent, FORMAT_OUTPUT, "Removed " + host + " from the ignore list.");
             } else {
-                sendLine(origin, isSilent, "commandError", "Host '" + host + "' not found.");
+                sendLine(origin, isSilent, FORMAT_ERROR, "Host '" + host + "' not found.");
             }
             
         } else {