Merge pull request #450 from csmith/master

Use events for some more plugin outputs.

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

@@ -34,10 +34,7 @@ import com.google.common.annotations.VisibleForTesting;
 
 import java.io.IOException;
 import java.nio.file.Path;
-import java.text.ParsePosition;
-import java.text.SimpleDateFormat;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -84,12 +81,8 @@ public class HistoryWindow extends FrameContainer {
         try (final ReverseFileReader reader = new ReverseFileReader(logFile)) {
             final List<String> lines = reader.getLines(Math.min(limit, numLines));
             Collections.reverse(lines);
-            lines.forEach(l -> {
-                final ParsePosition pos = new ParsePosition(0);
-                final Date date = new SimpleDateFormat("[dd/MM/yyyy HH:mm:ss]").parse(l, pos);
-                final String text = l.substring(pos.getIndex()+1);
-                addLine(text, date);
-            });
+            lines.forEach(l ->
+                    getEventBus().publishAsync(new HistoricalLineRestoredEvent(this, l)));
         } catch (IOException | SecurityException ex) {
             LOG.warn(USER_ERROR, "Unable to read log file.", ex);
         }

logging/test/com/dmdirc/addons/logging/HistoryWindowTest.java

@@ -24,34 +24,36 @@ package com.dmdirc.addons.logging;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.ConfigBinder;
-import com.dmdirc.events.DisplayPropertyMap;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.messages.BackBuffer;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.ui.messages.IRCDocument;
 
 import java.nio.file.Paths;
-import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import net.engio.mbassy.listener.Handler;
+import net.engio.mbassy.listener.Listener;
+import net.engio.mbassy.listener.References;
+
 import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class HistoryWindowTest {
 
-    @Mock private IRCDocument document;
     @Mock private BackBuffer backBuffer;
     @Mock private AggregateConfigProvider config;
     @Mock private ConfigBinder configBinder;
@@ -64,7 +66,6 @@ public class HistoryWindowTest {
     @Before
     public void setUp() throws Exception {
         when(backBufferFactory.getBackBuffer(any())).thenReturn(backBuffer);
-        when(backBuffer.getDocument()).thenReturn(document);
         when(config.getBinder()).thenReturn(configBinder);
         when(frameContainer.getConfigManager()).thenReturn(config);
         when(frameContainer.getConnection()).thenReturn(Optional.of(connection));
@@ -80,20 +81,28 @@ public class HistoryWindowTest {
 
     @Test
     public void testOutputLoggingBackBuffer() throws Exception {
+        final LineListener listener = new LineListener();
+        instance.getEventBus().subscribe(listener);
         instance.outputLoggingBackBuffer(4);
-        final InOrder inOrder = inOrder(document);
-        inOrder.verify(document).addText(eq(new SimpleDateFormat("[dd/MM/yyyy HH:mm:ss]")
-                .parse("[21/12/2015 12:58:02]").getTime()), eq
-                (DisplayPropertyMap.EMPTY), eq("RAAR"));
-        inOrder.verify(document).addText(eq(new SimpleDateFormat("[dd/MM/yyyy HH:mm:ss]")
-                .parse("[21/12/2015 12:59:03]").getTime()), eq
-                (DisplayPropertyMap.EMPTY), eq("RAAAR"));
-        inOrder.verify(document).addText(eq(new SimpleDateFormat("[dd/MM/yyyy HH:mm:ss]")
-                .parse("[21/12/2015 13:00:04]").getTime()), eq
-                (DisplayPropertyMap.EMPTY), eq("RAAAAR"));
-        inOrder.verify(document).addText(eq(new SimpleDateFormat("[dd/MM/yyyy HH:mm:ss]")
-                .parse("[21/12/2015 13:01:05]").getTime()), eq
-                (DisplayPropertyMap.EMPTY), eq("RAAAAAR"));
-        inOrder.verifyNoMoreInteractions();
+
+        assertTrue(listener.latch.await(5, TimeUnit.SECONDS));
+        assertEquals("[21/12/2015 12:58:02] RAAR", listener.values.get(0).getLine());
+        assertEquals("[21/12/2015 12:59:03] RAAAR", listener.values.get(1).getLine());
+        assertEquals("[21/12/2015 13:00:04] RAAAAR", listener.values.get(2).getLine());
+        assertEquals("[21/12/2015 13:01:05] RAAAAAR", listener.values.get(3).getLine());
+    }
+
+    @Listener(references = References.Strong)
+    private static class LineListener {
+
+        public final List<HistoricalLineRestoredEvent> values = new ArrayList<>();
+        public final CountDownLatch latch = new CountDownLatch(4);
+
+        @Handler
+        private void handleLineRestored(final HistoricalLineRestoredEvent event) {
+            values.add(event);
+            latch.countDown();
+        }
+
     }
 }

parserdebug/src/com/dmdirc/addons/parserdebug/DebugWindow.java

@@ -24,13 +24,13 @@ package com.dmdirc.addons.parserdebug;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.events.CommandOutputEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.messages.BackBufferFactory;
 
 import java.util.Arrays;
-import java.util.Date;
 import java.util.Optional;
 
 /**
@@ -74,8 +74,9 @@ public class DebugWindow extends FrameContainer {
      * Set the parser to null to stop us holding onto parsers when the server connection is closed.
      */
     public void unsetParser() {
-        addLine("======================", new Date());
-        addLine("Unset parser: " + parser, new Date());
+        getEventBus().publishAsync(new CommandOutputEvent(this,
+                "======================\n" +
+                "Unset parser: " + parser));
         parser = null;
     }
 

parserdebug/src/com/dmdirc/addons/parserdebug/ParserDebugManager.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.parserdebug;
 
 import com.dmdirc.DMDircMBassador;
+import com.dmdirc.events.CommandOutputEvent;
 import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.events.DebugInfoEvent;
@@ -30,7 +31,6 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.BackBufferFactory;
 
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -96,9 +96,10 @@ public class ParserDebugManager {
                 connection, eventBus, backBufferFactory);
         windowManager.addWindow(connection.getWindowModel(), window);
         registeredParsers.put(parser, window);
-        window.addLine("======================", new Date());
-        window.addLine("Started Monitoring: " + parser, new Date());
-        window.addLine("======================", new Date());
+        window.getEventBus().publishAsync(new CommandOutputEvent(window,
+                "======================\n" +
+                "Started Monitoring: " + parser + '\n' +
+                "======================"));
     }
 
     /**
@@ -110,9 +111,10 @@ public class ParserDebugManager {
     public void removeParser(final Parser parser, final boolean close) {
         parser.getCallbackManager().unsubscribe(this);
         final DebugWindow window = registeredParsers.get(parser);
-        window.addLine("======================", new Date());
-        window.addLine("No Longer Monitoring: " + parser + " (User Requested)", new Date());
-        window.addLine("======================", new Date());
+        window.getEventBus().publishAsync(new CommandOutputEvent(window,
+                "======================\n" +
+                "No Longer Monitoring: " + parser + " (User Requested)\n" +
+                "======================"));
         if (close) {
             window.close();
         }
@@ -142,7 +144,8 @@ public class ParserDebugManager {
     public void onDebugInfo(final DebugInfoEvent event) {
         final DebugWindow window = registeredParsers.get(event.getParser());
         if (window != null) {
-            window.addLine(String.format("[%d] %s%n", event.getLevel(), event.getData()), new Date());
+            window.getEventBus().publishAsync(new CommandOutputEvent(window,
+                    String.format("[%d] %s%n", event.getLevel(), event.getData())));
         }
     }