Merge pull request #446 from csmith/master

Make logging plugin use new events.

logging/res/META-INF/format.yml

@@ -0,0 +1,4 @@
+---
+HistoricalLineRestoredEvent:
+  format: "{{line}}"
+  timestamp: no

logging/src/com/dmdirc/addons/logging/HistoricalLineRestoredEvent.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.logging;
+
+import com.dmdirc.events.BaseDisplayableEvent;
+import com.dmdirc.interfaces.WindowModel;
+
+/**
+ * Event raised when a line from the log is restored into a window.
+ */
+public class HistoricalLineRestoredEvent extends BaseDisplayableEvent {
+
+    private final String line;
+
+    public HistoricalLineRestoredEvent(final long timestamp, final WindowModel source,
+            final String line) {
+        super(timestamp, source);
+        this.line = line;
+    }
+
+    public HistoricalLineRestoredEvent(final WindowModel source, final String line) {
+        super(source);
+        this.line = line;
+    }
+
+    public String getLine() {
+        return line;
+    }
+
+}

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

@@ -205,12 +205,12 @@ public class LoggingManager implements ConfigChangeListener {
 
         synchronized (openFiles) {
             final Collection<String> old = new ArrayList<>(openFiles.size());
-            for (Map.Entry<String, OpenFile> entry : openFiles.entrySet()) {
-                if (entry.getValue().lastUsedTime < oldestTime) {
-                    StreamUtils.close(entry.getValue().writer);
-                    old.add(entry.getKey());
-                }
-            }
+            openFiles.entrySet().stream()
+                    .filter(entry -> entry.getValue().lastUsedTime < oldestTime)
+                    .forEach(entry -> {
+                        StreamUtils.close(entry.getValue().writer);
+                        old.add(entry.getKey());
+                    });
 
             openFiles.keySet().removeAll(old);
         }
@@ -410,18 +410,19 @@ public class LoggingManager implements ConfigChangeListener {
 
         final Path testFile = Paths.get(filename);
         if (Files.exists(testFile)) {
-            try {
-                final ReverseFileReader file = new ReverseFileReader(testFile);
+            try (final ReverseFileReader file = new ReverseFileReader(testFile)) {
                 // Because the file includes a newline char at the end, an empty line
                 // is returned by getLines. To counter this, we call getLines(1) and do
                 // nothing with the output.
                 file.getLines(1);
                 final Stack<String> lines = file.getLines(backbufferLines);
                 while (!lines.empty()) {
-                    frame.addLine(getColouredString(colour, lines.pop()));
+                    frame.getEventBus().publishAsync(new HistoricalLineRestoredEvent(frame,
+                            getColouredString(colour, lines.pop())));
                 }
                 file.close();
-                frame.addLine(getColouredString(colour, "--- End of backbuffer\n"));
+                frame.getEventBus().publishAsync(new HistoricalLineRestoredEvent(frame,
+                        getColouredString(colour, "--- End of backbuffer\n")));
             } catch (IOException | SecurityException e) {
                 LOG.info(USER_ERROR, "Unable to show backbuffer (Filename: {}): {}", filename,
                         e.getMessage(), e);