Merge pull request #448 from csmith/master

Use events for raw data in/out.

debug/res/META-INF/format.yml

@@ -0,0 +1,5 @@
+---
+RawDataInEvent:
+  format: "<< {{line}}"
+RawDataOutEvent:
+  format: ">> {{line}}"

debug/src/com/dmdirc/addons/debug/RawDataInEvent.java

@@ -0,0 +1,48 @@
+/*
+ * 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.debug;
+
+import com.dmdirc.events.BaseDisplayableEvent;
+import com.dmdirc.interfaces.WindowModel;
+
+/**
+ * Event raised when a raw data in line is displayed.
+ */
+public class RawDataInEvent extends BaseDisplayableEvent {
+
+    private final String line;
+
+    public RawDataInEvent(final long timestamp, final WindowModel source, final String line) {
+        super(timestamp, source);
+        this.line = line;
+    }
+
+    public RawDataInEvent(final WindowModel source, final String line) {
+        super(source);
+        this.line = line;
+    }
+
+    public String getLine() {
+        return line;
+    }
+}

debug/src/com/dmdirc/addons/debug/RawDataOutEvent.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.addons.debug;
+
+import com.dmdirc.events.BaseDisplayableEvent;
+import com.dmdirc.interfaces.WindowModel;
+
+/**
+ * Event raised when a raw data out line is displayed.
+ */
+public class RawDataOutEvent extends BaseDisplayableEvent {
+
+    private final String line;
+
+    public RawDataOutEvent(final long timestamp, final WindowModel source, final String line) {
+        super(timestamp, source);
+        this.line = line;
+    }
+
+    public RawDataOutEvent(final WindowModel source, final String line) {
+        super(source);
+        this.line = line;
+    }
+
+    public String getLine() {
+        return line;
+    }
+
+}

debug/src/com/dmdirc/addons/debug/RawWindow.java

@@ -89,12 +89,12 @@ public class RawWindow extends FrameContainer {
 
     @Handler
     private void handleDataIn(final DataInEvent event) {
-        addLine("rawIn", event.getDate(), event.getData());
+        getEventBus().publishAsync(new RawDataInEvent(this, event.getData()));
     }
 
     @Handler
     private void handleDataOut(final DataOutEvent event) {
-        addLine("rawOut", event.getDate(), event.getData());
+        getEventBus().publishAsync(new RawDataOutEvent(this, event.getData()));
     }
 
 }

redirect/src/com/dmdirc/addons/redirect/FakeWriteableFrameContainer.java

@@ -61,12 +61,6 @@ public class FakeWriteableFrameContainer extends FrameContainer {
         target.sendLine(line);
     }
 
-    @Override
-    @Deprecated
-    public void addLine(final String type, final Date timestamp, final Object... args) {
-        addLine(type, args);
-    }
-
     @Override
     @Deprecated
     public void addLine(final String type, final Object... args) {