Add a CommandErrorEvent and format.

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

@@ -106,6 +106,12 @@ QueryMessageEvent:
 QuerySelfMessageEvent:
   format: "<{{user.nickname}}> {{message}}"
 
+################## Miscellaneous events ############################################################
+
+CommandErrorEvent:
+  format: "{{message}}"
+  colour: 7
+
 ################## TODO ############################################################################
 #  channelUserAway=14-- %1$s%2$s is now away.
 #  channelUserBack=14-- %1$s%2$s is now back.
@@ -149,7 +155,6 @@ QuerySelfMessageEvent:
 #  rawIn=<< %1$s
 #  rawOut=>> %1$s
 #  commandOutput=%1$s
-#  commandError=7%1$s
 #  actionTooLong=Warning: action too long to be sent
 #  tabCompletion=14Multiple possibilities: %1$s
 #  serverError=4ERROR: %1$s

src/com/dmdirc/GlobalWindow.java

@@ -25,6 +25,7 @@ package com.dmdirc;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
+import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
@@ -71,7 +72,8 @@ public class GlobalWindow extends FrameContainer {
 
     @Override
     public void sendLine(final String line) {
-        addLine("commandError", "You may only enter commands in the global window.");
+        getEventBus().publishAsync(
+                new CommandErrorEvent(this, "You may only enter commands in the global window."));
     }
 
     @Override

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

@@ -30,6 +30,7 @@ import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -106,10 +107,11 @@ public class GlobalCommandParser extends CommandParser {
     protected void handleNonCommand(final FrameContainer origin, final String line) {
         if (origin == null) {
             eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM,
-                    new IllegalArgumentException("Invalid Global Command: " +  line),
-                    "Invalid Global Command: " +  line, ""));
+                    new IllegalArgumentException("Invalid Global Command: " + line),
+                    "Invalid Global Command: " + line, ""));
         } else {
-            origin.addLine("commandError", "Invalid global command: " + line);
+            origin.getEventBus().publishAsync(
+                    new CommandErrorEvent(origin, "Invalid global command: " + line));
         }
     }
 

src/com/dmdirc/events/BaseDisplayableEvent.java

@@ -0,0 +1,81 @@
+/*
+ * 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;
+
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * Base class for miscallenous displayable events.
+ */
+public abstract class BaseDisplayableEvent extends DMDircEvent implements DisplayableEvent {
+
+    /** The display format to use for this event. */
+    private final AtomicReference<String> displayFormatRef = new AtomicReference<>("");
+    /** The properties associated with this event. */
+    private final DisplayPropertyMap properties = new DisplayPropertyMap();
+    /** The frame container that caused this event. */
+    private final FrameContainer source;
+
+    public BaseDisplayableEvent(final long timestamp, final FrameContainer source) {
+        super(timestamp);
+        this.source = source;
+    }
+
+    public BaseDisplayableEvent(final FrameContainer source) {
+        this.source = source;
+    }
+
+    @Override
+    public String getDisplayFormat() {
+        return displayFormatRef.get();
+    }
+
+    @Override
+    public void setDisplayFormat(final String format) {
+        displayFormatRef.set(format);
+    }
+
+    @Override
+    public <T> void setDisplayProperty(final DisplayProperty<T> property, final T value) {
+        properties.put(property, value);
+    }
+
+    @Override
+    public <T> Optional<T> getDisplayProperty(final DisplayProperty<T> property) {
+        return properties.get(property);
+    }
+
+    @Override
+    public DisplayPropertyMap getDisplayProperties() {
+        return properties;
+    }
+
+    @Override
+    public FrameContainer getSource() {
+        return source;
+    }
+
+}

src/com/dmdirc/events/CommandErrorEvent.java

@@ -0,0 +1,43 @@
+/*
+ * 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 encounters an error and needs to provide feedback to the user.
+ */
+public class CommandErrorEvent extends BaseDisplayableEvent {
+
+    private final String message;
+
+    public CommandErrorEvent(final FrameContainer source, final String message) {
+        super(source);
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+}