Switch some more output to events.

res/com/dmdirc/ui/messages/format.yml

@@ -111,6 +111,8 @@ QuerySelfMessageEvent:
 CommandErrorEvent:
   format: "{{message}}"
   colour: 7
+CommandOutputEvent:
+  format: "{{message}}"
 
 ################## TODO ############################################################################
 #  channelUserAway=14-- %1$s%2$s is now away.

src/com/dmdirc/Channel.java

@@ -29,6 +29,7 @@ import com.dmdirc.events.ChannelClosedEvent;
 import com.dmdirc.events.ChannelSelfActionEvent;
 import com.dmdirc.events.ChannelSelfJoinEvent;
 import com.dmdirc.events.ChannelSelfMessageEvent;
+import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.events.NickListClientAddedEvent;
 import com.dmdirc.events.NickListClientRemovedEvent;
@@ -195,7 +196,8 @@ public class Channel extends FrameContainer implements GroupChat {
 
         if (connection.getParser().get().getMaxLength("PRIVMSG", getChannelInfo().getName())
                 <= action.length()) {
-            addLine("actionTooLong", action.length());
+            getEventBus().publishAsync(new CommandErrorEvent(this,
+                    "Warning: action too long to be sent"));
         } else {
             final GroupChatUser me = getUser(connection.getLocalUser().get()).get();
             getEventBus().publishAsync(new ChannelSelfActionEvent(this, me, action));

src/com/dmdirc/Query.java

@@ -25,6 +25,7 @@ package com.dmdirc;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.QueryCommandParser;
 import com.dmdirc.events.AppErrorEvent;
+import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.events.QueryActionEvent;
 import com.dmdirc.events.QueryClosedEvent;
 import com.dmdirc.events.QueryMessageEvent;
@@ -154,7 +155,8 @@ public class Query extends FrameContainer implements PrivateActionListener,
             getEventBus().publishAsync(
                     new QuerySelfActionEvent(this, connection.getLocalUser().get(), action));
         } else {
-            addLine("actionTooLong", action.length());
+            getEventBus().publishAsync(
+                    new CommandErrorEvent(this, "Warning: action too long to be sent"));
         }
     }
 

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

@@ -34,6 +34,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.flags.CommandFlag;
 import com.dmdirc.commandparser.commands.flags.CommandFlagHandler;
 import com.dmdirc.commandparser.commands.flags.CommandFlagResult;
+import com.dmdirc.events.CommandOutputEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.ui.WindowManager;
@@ -119,10 +120,12 @@ public class Echo extends Command implements IntelligentCommand {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR,
                         "Unable to find target window");
             } else if (!args.isSilent()) {
-                frame.addLine(FORMAT_OUTPUT, time, results.getArgumentsAsString());
+                frame.getEventBus().publishAsync(new CommandOutputEvent(frame, time.getTime(),
+                        results.getArgumentsAsString()));
             }
-        } else if (origin != null && !args.isSilent()) {
-            origin.addLine(FORMAT_OUTPUT, time, results.getArgumentsAsString());
+        } else if (!args.isSilent()) {
+            origin.getEventBus().publishAsync(new CommandOutputEvent(origin, time.getTime(),
+                    results.getArgumentsAsString()));
         }
     }
 

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

@@ -31,6 +31,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.profiles.ProfileManager;
+import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionFactory;
@@ -94,8 +95,9 @@ public class NewServer extends Command implements IntelligentCommand {
                     profileManager.getDefault());
             server.connect();
         } catch (InvalidURIException ex) {
-            origin.addLine(FORMAT_ERROR, "Invalid URI: " + ex.getMessage()
-                    + (ex.getCause() == null ? "" : ": " + ex.getCause().getMessage()));
+            origin.getEventBus().publishAsync(new CommandErrorEvent(origin,
+                    "Invalid URI: " + ex.getMessage() +
+                            (ex.getCause() == null ? "" : ": " + ex.getCause().getMessage())));
         }
     }
 

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

@@ -30,6 +30,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
+import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.util.InvalidURIException;
@@ -78,8 +79,9 @@ public class ChangeServer extends Command {
             final URI address = uriParser.parseFromText(args.getArgumentsAsString());
             connection.connect(address, connection.getProfile());
         } catch (InvalidURIException ex) {
-            origin.addLine(FORMAT_ERROR, "Invalid URI: " + ex.getMessage()
-                    + (ex.getCause() == null ? "" : ": " + ex.getCause().getMessage()));
+            origin.getEventBus().publishAsync(
+                    new CommandErrorEvent(origin, "Invalid URI: " + ex.getMessage() +
+                            (ex.getCause() == null ? "" : ": " + ex.getCause().getMessage())));
         }
     }
 

src/com/dmdirc/commandparser/parsers/CommandParser.java

@@ -33,6 +33,7 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.PreviousCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.events.UnknownCommandEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
@@ -199,7 +200,8 @@ public abstract class CommandParser implements Serializable {
         if (someValid) {
             for (String channelName : parts) {
                 if (!server.getGroupChatManager().isValidChannelName(channelName)) {
-                    origin.addLine("commandError", "Invalid channel name: " + channelName);
+                    origin.getEventBus().publishAsync(new CommandErrorEvent(origin,
+                            "Invalid channel name: " + channelName));
                     continue;
                 }
 

src/com/dmdirc/commandparser/parsers/ServerCommandParser.java

@@ -31,6 +31,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
+import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -100,7 +101,8 @@ public class ServerCommandParser extends GlobalCommandParser {
                     && server.getState() != ServerState.CONNECTING)
                     || !server.getParser().isPresent())) {
                 if (!args.isSilent()) {
-                    origin.addLine("commandError", "You must be connected to use this command");
+                    origin.getEventBus().publishAsync(new CommandErrorEvent(origin,
+                            "You must be connected to use this command"));
                 }
             } else {
                 command.execute(origin, args, context);

src/com/dmdirc/events/CommandOutputEvent.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2006-2015 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.events;
+
+import com.dmdirc.FrameContainer;
+
+/**
+ * Event raised when a command outputs some generic text to the user.
+ */
+public class CommandOutputEvent extends BaseDisplayableEvent {
+
+    private final String message;
+
+    public CommandOutputEvent(final FrameContainer source, final long timestamp,
+            final String message) {
+        super(timestamp, source);
+        this.message = message;
+    }
+
+    public CommandOutputEvent(final FrameContainer source, final String message) {
+        super(source);
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+}