Merge pull request #443 from csmith/core-updates

Plugin support for core changes.

activewindow/build.gradle

@@ -1,3 +0,0 @@
-dependencies {
-  compile plugin('ui_swing')
-}

activewindow/plugin.config

@@ -1,32 +0,0 @@
-# This is a DMDirc configuration file.
-
-# This section indicates which sections below take key/value
-# pairs, rather than a simple list. It should be placed above
-# any sections that take key/values.
-keysections:
-  metadata
-  updates
-  version
-  requires
-
-metadata:
-  author=Greboid <greg@dmdirc.com>
-  mainclass=com.dmdirc.addons.activewindow.ActiveWindowPlugin
-  description=Provides an active window command to the swing UI
-  name=activewindow
-  nicename=Active Window
-
-updates:
-  id=66
-
-requires:
-  parent=ui_swing
-
-version:
-  friendly=1.0
-
-provides:
-  active command
-
-required-services:
-  swing ui

activewindow/src/com/dmdirc/addons/activewindow/ActiveCommand.java

@@ -1,85 +0,0 @@
-/*
- * 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.activewindow;
-
-import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
-import com.dmdirc.commandparser.BaseCommandInfo;
-import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
-import com.dmdirc.commandparser.commands.IntelligentCommand;
-import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.input.TabCompleterUtils;
-
-import javax.annotation.Nonnull;
-import javax.inject.Inject;
-
-/**
- * Executes another command as if it were executed in the active window.
- */
-public class ActiveCommand extends Command implements IntelligentCommand {
-
-    /** A command info object for this command. */
-    public static final CommandInfo INFO = new BaseCommandInfo("active",
-            "active <command> - executes the command as though it had been "
-            + "executed in the active window", CommandType.TYPE_GLOBAL);
-    /** Active frame manager. */
-    private final ActiveFrameManager activeFrameManager;
-    /** Tab-completer utilities. */
-    private final TabCompleterUtils tabUtils;
-
-    /**
-     * Creates a new active command.
-     *
-     * @param controller          The controller to use for command information.
-     * @param activeFrameManager The active window manager
-     */
-    @Inject
-    public ActiveCommand(
-            final CommandController controller,
-            final ActiveFrameManager activeFrameManager,
-            final TabCompleterUtils tabUtils) {
-        super(controller);
-
-        this.activeFrameManager = activeFrameManager;
-        this.tabUtils = tabUtils;
-    }
-
-    @Override
-    public void execute(@Nonnull final WindowModel origin,
-            final CommandArguments args, final CommandContext context) {
-        activeFrameManager.getActiveFrame().ifPresent(f -> f.getContainer().getCommandParser()
-                .parseCommand(f.getContainer(), args.getArgumentsAsString()));
-    }
-
-    @Override
-    public AdditionalTabTargets getSuggestions(final int arg,
-            final IntelligentCommandContext context) {
-        return tabUtils.getIntelligentResults(arg, context, 0);
-    }
-
-}

activewindow/src/com/dmdirc/addons/activewindow/ActiveWindowManager.java

@@ -1,67 +0,0 @@
-/*
- * 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.activewindow;
-
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
-
-import javax.inject.Inject;
-
-/**
- * Manages the active window sink.
- */
-public class ActiveWindowManager {
-
-    /** The message sink to register and unregister. */
-    private final ActiveWindowMessageSink sink;
-    /** The manager to add and remove the sink from. */
-    private final MessageSinkManager sinkManager;
-
-    /**
-     * Creates a new instance of {@link ActiveWindowManager}.
-     *
-     * @param sinkManager The manager to add and remove sinks from.
-     * @param sink        The sink to be added and removed.
-     */
-    @Inject
-    public ActiveWindowManager(
-            final MessageSinkManager sinkManager,
-            final ActiveWindowMessageSink sink) {
-        this.sink = sink;
-        this.sinkManager = sinkManager;
-    }
-
-    /**
-     * Registers the sink with the manager.
-     */
-    public void register() {
-        sinkManager.addSink(sink);
-    }
-
-    /**
-     * Unregisters the sink from the manager.
-     */
-    public void unregister() {
-        sinkManager.removeSink(sink);
-    }
-
-}

activewindow/src/com/dmdirc/addons/activewindow/ActiveWindowMessageSink.java

@@ -1,68 +0,0 @@
-/*
- * 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.activewindow;
-
-import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
-import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.ui.messages.sink.MessageSink;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
-
-import java.util.Date;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
-
-/**
- * A message sink which passes messages onto the active swing window.
- */
-public class ActiveWindowMessageSink implements MessageSink {
-
-    /** The pattern to use to match this sink. */
-    private static final Pattern PATTERN = Pattern.compile("active");
-    /** Active frame manager. */
-    private final ActiveFrameManager activeFrameManager;
-
-    /**
-     * Creates a new ActiveWindowMessageSink for the specified mainframe.
-     *
-     * @param activeFrameManager Active frame manager.
-     */
-    @Inject
-    public ActiveWindowMessageSink(final ActiveFrameManager activeFrameManager) {
-        this.activeFrameManager = activeFrameManager;
-    }
-
-    @Override
-    public Pattern getPattern() {
-        return PATTERN;
-    }
-
-    @Override
-    public void handleMessage(final MessageSinkManager dispatcher,
-            final WindowModel source, final String[] patternMatches,
-            final Date date, final String messageType, final Object... args) {
-        activeFrameManager.getActiveFrame()
-                .ifPresent(f -> f.getContainer().addLine(messageType, date, args));
-    }
-
-}

activewindow/src/com/dmdirc/addons/activewindow/ActiveWindowModule.java

@@ -1,34 +0,0 @@
-/*
- * 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.activewindow;
-
-import com.dmdirc.addons.ui_swing.injection.SwingModule;
-
-import dagger.Module;
-
-/**
- * DI module for the active window plugin.
- */
-@Module(injects = {ActiveWindowManager.class, ActiveCommand.class}, addsTo = SwingModule.class)
-public class ActiveWindowModule {
-}

activewindow/src/com/dmdirc/addons/activewindow/ActiveWindowPlugin.java

@@ -1,58 +0,0 @@
-/*
- * 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.activewindow;
-
-import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.implementations.BaseCommandPlugin;
-
-import dagger.ObjectGraph;
-
-/** Plugin to provide an active window command to the Swing UI. */
-public class ActiveWindowPlugin extends BaseCommandPlugin {
-
-    /** Manager to use for the active window sink. */
-    private ActiveWindowManager activeWindowManager;
-
-    @Override
-    public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
-        super.load(pluginInfo, graph);
-
-        setObjectGraph(graph.plus(new ActiveWindowModule()));
-        registerCommand(ActiveCommand.class, ActiveCommand.INFO);
-
-        activeWindowManager = getObjectGraph().get(ActiveWindowManager.class);
-    }
-
-    @Override
-    public void onLoad() {
-        super.onLoad();
-        activeWindowManager.register();
-    }
-
-    @Override
-    public void onUnload() {
-        super.onUnload();
-        activeWindowManager.unregister();
-    }
-
-}

activewindow/src/com/dmdirc/addons/activewindow/package-info.java

@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-
-/**
- * Provides an active window command to the swing UI.
- */
-package com.dmdirc.addons.activewindow;

activewindow/test/com/dmdirc/addons/activewindow/ActiveCommandTest.java

@@ -1,89 +0,0 @@
-/*
- * 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.activewindow;
-
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
-import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.commands.IntelligentCommand.IntelligentCommandContext;
-import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.ui.input.TabCompleterUtils;
-
-import java.util.Optional;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ActiveCommandTest {
-
-    @Mock private IntelligentCommandContext intelligentCommandContext;
-    @Mock private CommandParser commandParser;
-    @Mock private CommandController commandController;
-    @Mock private ActiveFrameManager activeFrameManager;
-    @Mock private TabCompleterUtils tabCompleterUtils;
-    @Mock private WindowModel frameContainer;
-    @Mock private TextFrame textFrame;
-    @Mock private CommandArguments commandArguments;
-    @Mock private CommandContext commandContext;
-    private ActiveCommand activeCommand;
-
-    @Before
-    public void setUp() throws Exception {
-        when(textFrame.getContainer()).thenReturn(frameContainer);
-        when(frameContainer.getCommandParser()).thenReturn(commandParser);
-        when(commandArguments.getArgumentsAsString()).thenReturn("some arguments");
-        activeCommand = new ActiveCommand(commandController, activeFrameManager, tabCompleterUtils);
-    }
-
-    @Test
-    public void testExecute_NoActive() throws Exception {
-        when(activeFrameManager.getActiveFrame()).thenReturn(Optional.empty());
-        activeCommand.execute(frameContainer, commandArguments, commandContext);
-        verify(commandParser, never())
-                .parseCommand(frameContainer, commandArguments.getArgumentsAsString());
-    }
-
-    @Test
-    public void testExecute_Active() throws Exception {
-        when(activeFrameManager.getActiveFrame()).thenReturn(Optional.of(textFrame));
-        activeCommand.execute(frameContainer, commandArguments, commandContext);
-        verify(commandParser).parseCommand(frameContainer, commandArguments.getArgumentsAsString());
-    }
-
-    @Test
-    public void testGetSuggestions() throws Exception {
-        activeCommand.getSuggestions(1, intelligentCommandContext);
-        verify(tabCompleterUtils).getIntelligentResults(1, intelligentCommandContext, 0);
-    }
-}

activewindow/test/com/dmdirc/addons/activewindow/ActiveWindowManagerTest.java

@@ -1,58 +0,0 @@
-/*
- * 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.activewindow;
-
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import static org.mockito.Mockito.verify;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ActiveWindowManagerTest {
-
-    @Mock private MessageSinkManager messageSinkManager;
-    @Mock private ActiveWindowMessageSink activeWindowMessageSink;
-    private ActiveWindowManager activeWindowManager;
-
-    @Before
-    public void setUp() throws Exception {
-        activeWindowManager = new ActiveWindowManager(messageSinkManager, activeWindowMessageSink);
-    }
-
-    @Test
-    public void testRegister() throws Exception {
-        activeWindowManager.register();
-        verify(messageSinkManager).addSink(activeWindowMessageSink);
-    }
-
-    @Test
-    public void testUnregister() throws Exception {
-        activeWindowManager.unregister();
-        verify(messageSinkManager).removeSink(activeWindowMessageSink);
-    }
-}

activewindow/test/com/dmdirc/addons/activewindow/ActiveWindowMessageSinkTest.java

@@ -1,80 +0,0 @@
-/*
- * 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.activewindow;
-
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
-import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
-
-import java.util.Date;
-import java.util.Optional;
-import java.util.regex.Pattern;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import static junit.framework.TestCase.assertEquals;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ActiveWindowMessageSinkTest {
-
-    private static final Pattern PATTERN = Pattern.compile("active");
-    @Mock private ActiveFrameManager activeFrameManager;
-    @Mock private MessageSinkManager messageSinkManager;
-    @Mock private WindowModel frameContainer;
-    @Mock private TextFrame textFrame;
-    @Mock private Date date;
-    private ActiveWindowMessageSink sink;
-
-    @Before
-    public void setUp() throws Exception {
-        sink = new ActiveWindowMessageSink(activeFrameManager);
-        when(textFrame.getContainer()).thenReturn(frameContainer);
-    }
-
-    @Test
-    public void testGetPattern() throws Exception {
-        assertEquals(PATTERN.toString(), sink.getPattern().toString());
-    }
-
-    @Test
-    public void testHandleMessage_NoActive() throws Exception {
-        when(activeFrameManager.getActiveFrame()).thenReturn(Optional.empty());
-        sink.handleMessage(messageSinkManager, frameContainer, null, date, "type", "message");
-        verify(frameContainer, never()).addLine("type", date, "message");
-    }
-
-    @Test
-    public void testHandleMessage_Active() throws Exception {
-        when(activeFrameManager.getActiveFrame()).thenReturn(Optional.of(textFrame));
-        sink.handleMessage(messageSinkManager, frameContainer, null, date, "type", "message");
-        verify(frameContainer).addLine("type", date, "message");
-    }
-}

dcc/src/com/dmdirc/addons/dcc/ChatContainer.java

@@ -34,7 +34,6 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.EventUtils;
 
 import java.util.Arrays;
@@ -66,7 +65,6 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
      * @param nick                My Current Nickname
      * @param targetNick          Nickname of target
      * @param tabCompleterFactory The factory to use to create tab completers.
-     * @param messageSinkManager  The sink manager to use to dispatch messages.
      * @param eventBus            The bus to dispatch events on.
      */
     public ChatContainer(
@@ -79,11 +77,9 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
             final String nick,
             final String targetNick,
             final TabCompleterFactory tabCompleterFactory,
-            final MessageSinkManager messageSinkManager,
             final DMDircMBassador eventBus) {
         super(parent, title, "dcc-chat-inactive", configManager, backBufferFactory,
                 new DCCCommandParser(configManager, commandController, eventBus),
-                messageSinkManager,
                 tabCompleterFactory,
                 eventBus,
                 Arrays.asList(

dcc/src/com/dmdirc/addons/dcc/DCCCommand.java

@@ -49,7 +49,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 
 import java.awt.Window;
 import java.io.File;
@@ -74,8 +73,6 @@ public class DCCCommand extends Command implements IntelligentCommand {
     private final Window mainWindow;
     /** Window management. */
     private final WindowManager windowManager;
-    /** The sink manager to use to dispatch messages. */
-    private final MessageSinkManager messageSinkManager;
     /** The factory to use for tab completers. */
     private final TabCompleterFactory tabCompleterFactory;
     /** The bus to dispatch events on. */
@@ -90,7 +87,6 @@ public class DCCCommand extends Command implements IntelligentCommand {
             final CommandController controller,
             @MainWindow final Window mainWindow,
             final DCCManager plugin,
-            final MessageSinkManager messageSinkManager,
             final WindowManager windowManager,
             final TabCompleterFactory tabCompleterFactory,
             final DMDircMBassador eventBus,
@@ -98,7 +94,6 @@ public class DCCCommand extends Command implements IntelligentCommand {
         super(controller);
         this.mainWindow = mainWindow;
         myPlugin = plugin;
-        this.messageSinkManager = messageSinkManager;
         this.windowManager = windowManager;
         this.tabCompleterFactory = tabCompleterFactory;
         this.eventBus = eventBus;
@@ -170,11 +165,10 @@ public class DCCCommand extends Command implements IntelligentCommand {
                     myNickname,
                     target,
                     tabCompleterFactory,
-                    messageSinkManager,
                     eventBus);
             windowManager.addWindow(myPlugin.getContainer(), window);
             parser.sendCTCP(target, "DCC", "CHAT chat " + DCC.ipToLong(
-                    myPlugin.getListenIP(parser)) + " " + chat.getPort());
+                    myPlugin.getListenIP(parser)) + ' ' + chat.getPort());
             eventBus.publish(new DccChatRequestSentEvent(connection, target));
             sendLine(origin, isSilent, "DCCChatStarting", target, chat.getHost(), chat.getPort());
             window.addLine("DCCChatStarting", target, chat.getHost(), chat.getPort());

dcc/src/com/dmdirc/addons/dcc/DCCFrameContainer.java

@@ -30,7 +30,6 @@ import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 
 import java.util.Collection;
 import java.util.Optional;
@@ -53,7 +52,6 @@ public abstract class DCCFrameContainer extends FrameContainer {
      * @param icon                The icon to use
      * @param configManager       Config manager
      * @param parser              Command parser to use for this window
-     * @param messageSinkManager  The sink manager to use to dispatch messages.
      * @param tabCompleterFactory The factory to use to create tab completers.
      * @param eventBus            The bus to dispatch events on.
      * @param components          The UI components that this frame requires
@@ -65,13 +63,11 @@ public abstract class DCCFrameContainer extends FrameContainer {
             final AggregateConfigProvider configManager,
             final BackBufferFactory backBufferFactory,
             final CommandParser parser,
-            final MessageSinkManager messageSinkManager,
             final TabCompleterFactory tabCompleterFactory,
             final DMDircMBassador eventBus,
             final Collection<String> components) {
         super(parent, icon, title, title, configManager, backBufferFactory,
                 tabCompleterFactory.getTabCompleter(configManager),
-                messageSinkManager,
                 eventBus,
                 components);
         initBackBuffer();

dcc/src/com/dmdirc/addons/dcc/DCCManager.java

@@ -61,7 +61,6 @@ import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 
 import com.google.common.collect.Sets;
 
@@ -100,8 +99,6 @@ public class DCCManager {
     private PlaceholderContainer container;
     /** Config manager to read settings from. */
     private final AggregateConfigProvider config;
-    /** The sink manager to use to dispatch messages. */
-    private final MessageSinkManager messageSinkManager;
     /** Window Management. */
     private final WindowManager windowManager;
     /** The command controller to use. */
@@ -127,7 +124,6 @@ public class DCCManager {
             final IdentityController identityController,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final CommandController commandController,
-            final MessageSinkManager messageSinkManager,
             final WindowManager windowManager,
             final TabCompleterFactory tabCompleterFactory,
             final SwingWindowFactory windowFactory,
@@ -137,7 +133,6 @@ public class DCCManager {
             @Directory(DirectoryType.BASE) final String baseDirectory,
             final BackBufferFactory backBufferFactory) {
         this.mainWindow = mainWindow;
-        this.messageSinkManager = messageSinkManager;
         this.windowManager = windowManager;
         this.commandController = commandController;
         this.tabCompleterFactory = tabCompleterFactory;
@@ -476,7 +471,6 @@ public class DCCManager {
                 myNickname,
                 nickname,
                 tabCompleterFactory,
-                messageSinkManager,
                 eventBus);
         windowManager.addWindow(getContainer(), f);
         f.addLine("DCCChatStarting", nickname, chat.getHost(), chat.getPort());

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

@@ -32,7 +32,6 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 
 import java.util.Arrays;
 import java.util.Optional;
@@ -48,7 +47,6 @@ public class RawWindow extends FrameContainer {
 
     public RawWindow(
             final Connection connection,
-            final MessageSinkManager messageSinkManager,
             final TabCompleterFactory tabCompleterFactory,
             final BackBufferFactory backBufferFactory) {
         super(connection.getWindowModel(), "raw", "Raw", "(Raw log)",
@@ -57,7 +55,6 @@ public class RawWindow extends FrameContainer {
                 tabCompleterFactory.getTabCompleter(connection.getWindowModel().getTabCompleter(),
                         connection.getWindowModel().getConfigManager(),
                         CommandType.TYPE_QUERY, CommandType.TYPE_CHAT),
-                messageSinkManager,
                 connection.getWindowModel().getEventBus(),
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier()));

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

@@ -28,7 +28,6 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -41,24 +40,24 @@ public class RawWindowFactory {
 
     private final TabCompleterFactory tabCompleterFactory;
     private final CommandController commandController;
-    private final MessageSinkManager messageSinkManager;
     private final BackBufferFactory backBufferFactory;
     private final WindowManager windowManager;
 
     @Inject
-    public RawWindowFactory(final TabCompleterFactory tabCompleterFactory,
-            final CommandController commandController, final MessageSinkManager messageSinkManager,
-            final BackBufferFactory backBufferFactory, final WindowManager windowManager) {
+    public RawWindowFactory(
+            final TabCompleterFactory tabCompleterFactory,
+            final CommandController commandController,
+            final BackBufferFactory backBufferFactory,
+            final WindowManager windowManager) {
         this.tabCompleterFactory = tabCompleterFactory;
         this.commandController = commandController;
-        this.messageSinkManager = messageSinkManager;
         this.backBufferFactory = backBufferFactory;
         this.windowManager = windowManager;
     }
 
     public RawWindow getRawWindow(final Connection connection) {
         final RawWindow rawWindow = new RawWindow(connection,
-                messageSinkManager, tabCompleterFactory,  backBufferFactory);
+                tabCompleterFactory,  backBufferFactory);
         rawWindow.setCommandParser(new ServerCommandParser(
                 connection.getWindowModel().getConfigManager(),
                 commandController,

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

@@ -28,7 +28,6 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.Formatter;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 
 import java.util.Collections;
 import java.util.Date;
@@ -47,13 +46,11 @@ public class FakeWriteableFrameContainer extends FrameContainer {
      */
     public FakeWriteableFrameContainer(
             final WindowModel target,
-            final MessageSinkManager messageSinkManager,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory) {
         super(target, target.getIcon(), target.getName(), target.getTitle(),
                 target.getConfigManager(), backBufferFactory,
-                target.getTabCompleter(), messageSinkManager, eventBus,
-                Collections.<String>emptyList());
+                target.getTabCompleter(), eventBus, Collections.<String>emptyList());
         this.target = target;
         initBackBuffer();
         setCommandParser(target.getCommandParser());

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

@@ -36,7 +36,6 @@ import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -52,8 +51,6 @@ public class RedirectCommand extends Command implements IntelligentCommand {
             "redirect <command> - sends the output of the command to a "
             + "channel or query window",
             CommandType.TYPE_CHAT);
-    /** The sink manager to use to dispatch messages. */
-    private final MessageSinkManager messageSinkManager;
     /** The bus to dispatch events on. */
     private final DMDircMBassador eventBus;
     private final BackBufferFactory backBufferFactory;
@@ -66,12 +63,10 @@ public class RedirectCommand extends Command implements IntelligentCommand {
     @Inject
     public RedirectCommand(
             final CommandController controller,
-            final MessageSinkManager messageSinkManager,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory,
             final TabCompleterUtils tabCompleterUtils) {
         super(controller);
-        this.messageSinkManager = messageSinkManager;
         this.eventBus = eventBus;
         this.backBufferFactory = backBufferFactory;
         this.tabCompleterUtils = tabCompleterUtils;
@@ -83,7 +78,7 @@ public class RedirectCommand extends Command implements IntelligentCommand {
         final Chat target = ((ChatCommandContext) context).getChat();
         target.getWindowModel().getCommandParser().parseCommand(
                 new FakeWriteableFrameContainer(target.getWindowModel(),
-                        messageSinkManager, eventBus, backBufferFactory),
+                        eventBus, backBufferFactory),
                 args.getArgumentsAsString());
     }