Merge pull request #447 from csmith/master

Switch some more plugins to use new events.

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

@@ -26,6 +26,7 @@ import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.events.CommandOutputEvent;
 import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
@@ -67,8 +68,8 @@ public class Benchmark extends DebugCommand {
             final long start = System.nanoTime();
 
             for (int j = 0; j < 5000; j++) {
-                origin.addLine(FORMAT_OUTPUT,
-                        "This is a benchmark. Lorem ipsum doler...");
+                origin.getEventBus().publishAsync(new CommandOutputEvent(origin,
+                        "This is a benchmark. Lorem ipsum doler..."));
             }
 
             final long end = System.nanoTime();
@@ -77,8 +78,8 @@ public class Benchmark extends DebugCommand {
         }
 
         for (int i = 0; i < results.length; i++) {
-            origin.addLine(FORMAT_OUTPUT, "Iteration " + i + ": " + results[i]
-                    + " nanoseconds.");
+            origin.getEventBus().publishAsync(new CommandOutputEvent(origin,
+                    "Iteration " + i + ": " + results[i] + " nanoseconds."));
         }
     }
 

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

@@ -30,7 +30,9 @@ import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.ClientLineAddedEvent;
+import com.dmdirc.events.CommandOutputEvent;
 import com.dmdirc.events.DMDircEvent;
+import com.dmdirc.events.DisplayableEvent;
 import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -128,7 +130,9 @@ public class EventBusViewer extends DebugCommand {
         @Handler
         public void handleEvent(final DMDircEvent event) {
             if (event instanceof ClientLineAddedEvent
-                    && ((ClientLineAddedEvent) event).getFrameContainer() == target) {
+                    && ((ClientLineAddedEvent) event).getFrameContainer() == target
+                    || event instanceof CommandOutputEvent
+                    && ((DisplayableEvent) event).getSource() == target) {
                 // Don't add a line every time we add a line to our output window.
                 // Things will explode otherwise.
                 return;
@@ -154,7 +158,7 @@ public class EventBusViewer extends DebugCommand {
                 }
             }
 
-            target.addLine(FORMAT_OUTPUT, output.toString());
+            target.getEventBus().publishAsync(new CommandOutputEvent(target, output.toString()));
         }
 
     }

tabcompletion_bash/res/META-INF/format.yml

@@ -0,0 +1,4 @@
+---
+BashDisambiguationEvent:
+  format: "Multiple possibilities: {{matches}}."
+  colour: 14

tabcompletion_bash/src/com/dmdirc/addons/tabcompletion_bash/BashDisambiguationEvent.java

@@ -0,0 +1,50 @@
+/*
+ * 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.addons.tabcompletion_bash;
+
+import com.dmdirc.events.BaseDisplayableEvent;
+import com.dmdirc.interfaces.WindowModel;
+
+/**
+ * Event raised when multiple potential results match a bash-style completion attempt.
+ */
+public class BashDisambiguationEvent extends BaseDisplayableEvent {
+
+    private final String matches;
+
+    public BashDisambiguationEvent(final long timestamp, final WindowModel source,
+            final String matches) {
+        super(timestamp, source);
+        this.matches = matches;
+    }
+
+    public BashDisambiguationEvent(final WindowModel source, final String matches) {
+        super(source);
+        this.matches = matches;
+    }
+
+    public String getMatches() {
+        return matches;
+    }
+
+}

tabcompletion_bash/src/com/dmdirc/addons/tabcompletion_bash/BashStyle.java

@@ -88,8 +88,8 @@ public class BashStyle implements TabCompletionStyle {
 
             final String sub = getBestSubstring(res);
             if (sub.equalsIgnoreCase(word) && tabCount >= 2) {
-                window.addLine("tabCompletion", res.toString());
-
+                window.getEventBus().publishAsync(
+                        new BashDisambiguationEvent(window, res.toString()));
                 return null;
             } else {
                 return new TabCompletionResult(