Merge pull request #452 from csmith/master

Migrate debug plugin to showOutput/showError.

debug/src/com/dmdirc/addons/debug/Debug.java

@@ -102,17 +102,27 @@ public class Debug extends Command implements IntelligentCommand {
     }
 
     /**
-     * Sends a line, if appropriate, to the specified target.
+     * Shows output, if appropriate, in 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
+     * @param message  The message to be sent
      */
-    @Deprecated
-    public void proxySendLine(final WindowModel target,
-            final boolean isSilent, final String type, final Object... args) {
-        sendLine(target, isSilent, type, args);
+    public void proxyShowOutput(final WindowModel target,
+            final boolean isSilent, final String message) {
+        showOutput(target, isSilent, message);
+    }
+
+    /**
+     * Shows an error, if appropriate, in the specified target.
+     *
+     * @param target   The command window to send the line to
+     * @param isSilent Whether this command is being silenced or not
+     * @param message  The message to be sent
+     */
+    public void proxyShowError(final WindowModel target,
+            final boolean isSilent, final String message) {
+        showError(target, isSilent, message);
     }
 
     /**

debug/src/com/dmdirc/addons/debug/DebugCommand.java

@@ -86,16 +86,25 @@ public abstract class DebugCommand {
             final CommandArguments args, final CommandContext context);
 
     /**
-     * Sends a line, if appropriate, to the specified target.
+     * Shows output, if appropriate, in 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
+     * @param message  The message to be sent
      */
-    public void sendLine(final WindowModel target,
-            final boolean isSilent, final String type, final Object... args) {
-        commandProvider.get().proxySendLine(target, isSilent, type, args);
+    public void showOutput(final WindowModel target, final boolean isSilent, final String message) {
+        commandProvider.get().proxyShowOutput(target, isSilent, message);
+    }
+
+    /**
+     * Shows an error, if appropriate, in the specified target.
+     *
+     * @param target   The command window to send the line to
+     * @param isSilent Whether this command is being silenced or not
+     * @param message  The message to be sent
+     */
+    public void showError(final WindowModel target, final boolean isSilent, final String message) {
+        commandProvider.get().proxyShowError(target, isSilent, message);
     }
 
     /**

debug/src/com/dmdirc/addons/debug/commands/ColourSpam.java

@@ -61,7 +61,7 @@ public class ColourSpam extends DebugCommand {
     public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         for (int i = 0; i < 100; i++) {
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+            showOutput(origin, args.isSilent(),
                     ((char) 3) + "5Colour! "
                     + ((char) 3) + "6Colour! " + ((char) 3) + "7Colour! "
                     + ((char) 3) + "6Colour! " + ((char) 3) + "7Colour! "

debug/src/com/dmdirc/addons/debug/commands/ConfigInfo.java

@@ -62,7 +62,7 @@ public class ConfigInfo extends DebugCommand {
     public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         for (ConfigProvider source : origin.getConfigManager().getSources()) {
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, source.getTarget()
+            showOutput(origin, args.isSilent(), source.getTarget()
                     + " - " + source + "(" + source.getTarget().getOrder()
                     + ")");
         }

debug/src/com/dmdirc/addons/debug/commands/ForceUpdate.java

@@ -93,9 +93,9 @@ public class ForceUpdate extends DebugCommand {
         if (globalConfig.getOptionBool("updater", "enable")) {
             UpdateChecker.checkNow(updateManager, identityController, "Forced update checker");
         } else {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Update checking is "
+            showError(origin, args.isSilent(), "Update checking is "
                     + "currently disabled.  You can enable it by typing:");
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, Styliser.CODE_FIXED
+            showError(origin, args.isSilent(), Styliser.CODE_FIXED
                     + "    /set updater enable true");
         }
     }

debug/src/com/dmdirc/addons/debug/commands/GlobalConfigInfo.java

@@ -72,7 +72,7 @@ public class GlobalConfigInfo extends DebugCommand {
     public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         for (ConfigProvider source : globalConfig.getSources()) {
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, source.getTarget()
+            showOutput(origin, args.isSilent(), source.getTarget()
                     + " - " + source + "(" + source.getTarget().getOrder()
                     + ")");
         }

debug/src/com/dmdirc/addons/debug/commands/Identities.java

@@ -88,7 +88,7 @@ public class Identities extends DebugCommand {
                 String.valueOf(source.getTarget().getOrder())};
         }
 
-        sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+        showOutput(origin, args.isSilent(),
                 doTable(new String[]{"Name", "Target", "Data", "Priority"}, data));
     }
 

debug/src/com/dmdirc/addons/debug/commands/MemInfo.java

@@ -60,11 +60,11 @@ public class MemInfo extends DebugCommand {
     @Override
     public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
-        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Total Memory: "
+        showOutput(origin, args.isSilent(), "Total Memory: "
                 + Runtime.getRuntime().totalMemory());
-        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Free Memory: "
+        showOutput(origin, args.isSilent(), "Free Memory: "
                 + Runtime.getRuntime().freeMemory());
-        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Used Memory: "
+        showOutput(origin, args.isSilent(), "Used Memory: "
                 + (Runtime.getRuntime().totalMemory()
                 - Runtime.getRuntime().freeMemory()));
     }

debug/src/com/dmdirc/addons/debug/commands/Notify.java

@@ -65,10 +65,10 @@ public class Notify extends DebugCommand {
             final CommandArguments args, final CommandContext context) {
         final Optional<Colour> colour = origin.getUnreadStatusManager().getNotificationColour();
         if (colour.isPresent()) {
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+            showOutput(origin, args.isSilent(),
                     "Current notification colour is: " + colour.get());
         } else {
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+            showOutput(origin, args.isSilent(),
                     "No current notification colour");
         }
     }

debug/src/com/dmdirc/addons/debug/commands/RunGC.java

@@ -61,8 +61,7 @@ public class RunGC extends DebugCommand {
     public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         System.gc();
-        sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
-                "Invoked garbage collector.");
+        showOutput(origin, args.isSilent(), "Invoked garbage collector.");
     }
 
 }

debug/src/com/dmdirc/addons/debug/commands/ServerInfo.java

@@ -66,23 +66,22 @@ public class ServerInfo extends DebugCommand {
         final Optional<Connection> optionalConnection = origin.getConnection();
         if (optionalConnection.isPresent()) {
             final Connection connection = optionalConnection.get();
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Server name: "
+            showOutput(origin, args.isSilent(), "Server name: "
                     + connection.getAddress());
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Actual name: "
+            showOutput(origin, args.isSilent(), "Actual name: "
                     + connection.getParser().get().getServerName());
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Network: "
+            showOutput(origin, args.isSilent(), "Network: "
                     + connection.getNetwork());
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "IRCd: "
+            showOutput(origin, args.isSilent(), "IRCd: "
                     + connection.getParser().get().getServerSoftware() + " - "
                     + connection.getParser().get().getServerSoftwareType());
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Modes: "
+            showOutput(origin, args.isSilent(), "Modes: "
                     + connection.getParser().get().getBooleanChannelModes() + ' '
                     + connection.getParser().get().getListChannelModes() + ' '
                     + connection.getParser().get().getParameterChannelModes() + ' '
                     + connection.getParser().get().getDoubleParameterChannelModes());
         } else {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR,
-                    "This window isn't connected to a server");
+            showError(origin, args.isSilent(), "This window isn't connected to a server");
         }
     }
 

debug/src/com/dmdirc/addons/debug/commands/ServerState.java

@@ -65,11 +65,10 @@ public class ServerState extends DebugCommand {
             final CommandArguments args, final CommandContext context) {
         final Optional<Connection> optionalConnection = origin.getConnection();
         if (optionalConnection.isPresent()) {
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+            showOutput(origin, args.isSilent(),
                     optionalConnection.get().getStatus().getTransitionHistory());
         } else {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR,
-                    "This window isn't connected to a server");
+            showError(origin, args.isSilent(), "This window isn't connected to a server");
         }
     }
 

debug/src/com/dmdirc/addons/debug/commands/Services.java

@@ -72,14 +72,13 @@ public class Services extends DebugCommand implements IntelligentCommand {
     @Override
     public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
-        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Available Services:");
+        showOutput(origin, args.isSilent(), "Available Services:");
         for (Service service : serviceManager.getAllServices()) {
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "    "
-                    + service.toString());
+            showOutput(origin, args.isSilent(), "    " + service);
             if (args.getArguments().length > 0
-                    && args.getArguments()[0].equals("full")) {
+                    && "full".equals(args.getArguments()[0])) {
                 for (ServiceProvider provider : service.getProviders()) {
-                    sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                    showOutput(origin, args.isSilent(),
                             "            " + provider.getProviderName()
                             + " [Active: " + provider.isActive() + "]");
                 }

debug/src/com/dmdirc/addons/debug/commands/ShowRaw.java

@@ -69,8 +69,7 @@ public class ShowRaw extends DebugCommand {
         if (connection.isPresent()) {
             windowFactory.getRawWindow(connection.get());
         } else {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR,
-                    "Cannot show raw window here.");
+            showError(origin, args.isSilent(), "Cannot show raw window here.");
         }
     }
 

debug/src/com/dmdirc/addons/debug/commands/Threads.java

@@ -65,12 +65,10 @@ public class Threads extends DebugCommand {
             final CommandArguments args, final CommandContext context) {
         for (Entry<Thread, StackTraceElement[]> thread
                 : Thread.getAllStackTraces().entrySet()) {
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, Styliser.CODE_BOLD
-                    + thread.getKey().getName());
+            showOutput(origin, args.isSilent(), Styliser.CODE_BOLD + thread.getKey().getName());
 
             for (StackTraceElement element : thread.getValue()) {
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
-                        Styliser.CODE_FIXED + "    " + element.toString());
+                showOutput(origin, args.isSilent(), Styliser.CODE_FIXED + "    " + element);
             }
         }
     }

debug/src/com/dmdirc/addons/debug/commands/Time.java

@@ -83,7 +83,7 @@ public class Time extends DebugCommand implements IntelligentCommand {
             final long start = System.currentTimeMillis();
             origin.getCommandParser().parseCommand(origin, args.getArgumentsAsString(0));
             final long end = System.currentTimeMillis();
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+            showOutput(origin, args.isSilent(),
                     "Command executed in " + (end - start) + " milliseconds.");
         }
     }