Merge pull request #441 from csmith/core-updates

Support for core changes.

channelwho/test/com/dmdirc/addons/channelwho/ChannelWhoManagerTest.java

@@ -30,6 +30,8 @@ import com.dmdirc.interfaces.ConnectionManager;
 
 import com.google.common.collect.Lists;
 
+import java.net.URI;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -76,7 +78,8 @@ public class ChannelWhoManagerTest {
 
     @Test
     public void testServerConnectionEvent() throws Exception {
-        instance.handleServerConnectingEvent(new ServerConnectingEvent(connection2));
+        instance.handleServerConnectingEvent(
+                new ServerConnectingEvent(connection2, URI.create("irc://foo.bar")));
         verify(connectionHandlerFactory).get(connection);
     }
 

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

@@ -59,12 +59,6 @@ public class FakeWriteableFrameContainer extends FrameContainer {
         setCommandParser(target.getCommandParser());
     }
 
-    @Override
-    @Deprecated
-    public void addLine(final String line, final boolean timestamp) {
-        addLine(line);
-    }
-
     @Override
     public void sendLine(final String line) {
         target.sendLine(line);
@@ -80,16 +74,6 @@ public class FakeWriteableFrameContainer extends FrameContainer {
         sendLine(Formatter.formatMessage(getConfigManager(), type, args));
     }
 
-    @Override
-    public void addLine(final StringBuffer type, final Date timestamp, final Object... args) {
-        addLine(type, args);
-    }
-
-    @Override
-    public void addLine(final StringBuffer type, final Object... args) {
-        addLine(type.toString(), args);
-    }
-
     @Override
     public void addLine(final String line, final Date timestamp) {
         addLine(line);