Remove input methods from WindowModel.

Migrate all users to using the InputModel.

src/com/dmdirc/Channel.java

@@ -113,7 +113,8 @@ public class Channel extends FrameContainer implements GroupChat {
                 Styliser.stipControlCodes(newChannelInfo.getName()),
                 configMigrator.getConfigProvider(),
                 backBufferFactory,
-                tabCompleterFactory.getTabCompleter(connection.getWindowModel().getTabCompleter(),
+                tabCompleterFactory.getTabCompleter(
+                        connection.getWindowModel().getInputModel().get().getTabCompleter(),
                         configMigrator.getConfigProvider(), CommandType.TYPE_CHANNEL,
                         CommandType.TYPE_CHAT),
                 connection.getWindowModel().getEventBus(),
@@ -297,7 +298,8 @@ public class Channel extends FrameContainer implements GroupChat {
     public void addClient(final GroupChatUser client) {
         getEventBus().publishAsync(new NickListClientAddedEvent(this, client));
 
-        getTabCompleter().addEntry(TabCompletionType.CHANNEL_NICK, client.getNickname());
+        getInputModel().get().getTabCompleter().addEntry(
+                TabCompletionType.CHANNEL_NICK, client.getNickname());
     }
 
     /**
@@ -308,7 +310,8 @@ public class Channel extends FrameContainer implements GroupChat {
     public void removeClient(final GroupChatUser client) {
         getEventBus().publishAsync(new NickListClientRemovedEvent(this, client));
 
-        getTabCompleter().removeEntry(TabCompletionType.CHANNEL_NICK, client.getNickname());
+        getInputModel().get().getTabCompleter().removeEntry(
+                TabCompletionType.CHANNEL_NICK, client.getNickname());
 
         if (client.getUser().equals(connection.getLocalUser().orElse(null))) {
             resetWindow();
@@ -323,10 +326,11 @@ public class Channel extends FrameContainer implements GroupChat {
     public void setClients(final Collection<GroupChatUser> clients) {
         getEventBus().publishAsync(new NickListClientsChangedEvent(this, clients));
 
-        getTabCompleter().clear(TabCompletionType.CHANNEL_NICK);
+        getInputModel().get().getTabCompleter().clear(TabCompletionType.CHANNEL_NICK);
 
-        getTabCompleter().addEntries(TabCompletionType.CHANNEL_NICK,
-            clients.stream().map(GroupChatUser::getNickname).collect(Collectors.toList()));
+        getInputModel().get().getTabCompleter().addEntries(
+                TabCompletionType.CHANNEL_NICK,
+                clients.stream().map(GroupChatUser::getNickname).collect(Collectors.toList()));
     }
 
     /**
@@ -336,8 +340,10 @@ public class Channel extends FrameContainer implements GroupChat {
      * @param newName The new nickname of the client
      */
     public void renameClient(final String oldName, final String newName) {
-        getTabCompleter().removeEntry(TabCompletionType.CHANNEL_NICK, oldName);
-        getTabCompleter().addEntry(TabCompletionType.CHANNEL_NICK, newName);
+        getInputModel().get().getTabCompleter().removeEntry(
+                TabCompletionType.CHANNEL_NICK, oldName);
+        getInputModel().get().getTabCompleter().addEntry(
+                TabCompletionType.CHANNEL_NICK, newName);
         refreshClients();
     }
 

src/com/dmdirc/FrameContainer.java

@@ -191,11 +191,6 @@ public abstract class FrameContainer implements WindowModel, InputModel {
         return eventBus;
     }
 
-    @Override
-    public boolean isWritable() {
-        return writable;
-    }
-
     /**
      * Changes the name of this container, and fires a {@link FrameNameChangedEvent}.
      *
@@ -350,7 +345,7 @@ public abstract class FrameContainer implements WindowModel, InputModel {
 
     @Override
     public Optional<InputModel> getInputModel() {
-        if (isWritable()) {
+        if (writable) {
             return Optional.of(this);
         } else {
             return Optional.empty();

src/com/dmdirc/GroupChatManagerImpl.java

@@ -151,8 +151,8 @@ public class GroupChatManagerImpl implements GroupChatManager {
                     connection.getAddress(), chan.getName());
             final Channel newChan = channelFactory.getChannel(
                     connection, chan, channelConfig);
-            connection.getWindowModel().getTabCompleter().addEntry(TabCompletionType.CHANNEL,
-                    chan.getName());
+            connection.getWindowModel().getInputModel().get().getTabCompleter()
+                    .addEntry(TabCompletionType.CHANNEL, chan.getName());
             newChan.getWindowModel().getEventBus().subscribe(this);
             channels.add(newChan);
         }
@@ -195,7 +195,7 @@ public class GroupChatManagerImpl implements GroupChatManager {
     @Handler
     void handleChannelClosing(final ChannelClosedEvent event) {
         final GroupChat channel = event.getChannel();
-        connection.getWindowModel().getTabCompleter()
+        connection.getWindowModel().getInputModel().get().getTabCompleter()
                 .removeEntry(TabCompletionType.CHANNEL, channel.getName());
         channels.remove(channel.getName());
         channel.getEventBus().unsubscribe(this);

src/com/dmdirc/Query.java

@@ -76,7 +76,8 @@ public class Query extends FrameContainer implements PrivateChat {
                 user.getNickname(),
                 connection.getWindowModel().getConfigManager(),
                 backBufferFactory,
-                tabCompleterFactory.getTabCompleter(connection.getWindowModel().getTabCompleter(),
+                tabCompleterFactory.getTabCompleter(
+                        connection.getWindowModel().getInputModel().get().getTabCompleter(),
                         connection.getWindowModel().getConfigManager(),
                         CommandType.TYPE_QUERY, CommandType.TYPE_CHAT),
                 connection.getWindowModel().getEventBus(),
@@ -125,7 +126,7 @@ public class Query extends FrameContainer implements PrivateChat {
             return;
         }
 
-        final int maxLineLength = getMaxLineLength();
+        final int maxLineLength = getInputModel().get().getMaxLineLength();
 
         if (maxLineLength >= action.length() + 2) {
             connection.getParser().get().sendAction(getNickname(), action);

src/com/dmdirc/Server.java

@@ -488,7 +488,7 @@ public class Server extends FrameContainer implements Connection {
             if (!getState().isDisconnected()) {
                 newQuery.reregister();
             }
-            getTabCompleter().addEntry(TabCompletionType.QUERY_NICK, nick);
+            getInputModel().get().getTabCompleter().addEntry(TabCompletionType.QUERY_NICK, nick);
             queries.put(lnick, newQuery);
         }
 
@@ -497,8 +497,8 @@ public class Server extends FrameContainer implements Connection {
 
     @Override
     public void updateQuery(final Query query, final String oldNick, final String newNick) {
-        getTabCompleter().removeEntry(TabCompletionType.QUERY_NICK, oldNick);
-        getTabCompleter().addEntry(TabCompletionType.QUERY_NICK, newNick);
+        getInputModel().get().getTabCompleter().removeEntry(TabCompletionType.QUERY_NICK, oldNick);
+        getInputModel().get().getTabCompleter().addEntry(TabCompletionType.QUERY_NICK, newNick);
 
         queries.put(converter.toLowerCase(newNick), query);
         queries.remove(converter.toLowerCase(oldNick));
@@ -511,7 +511,8 @@ public class Server extends FrameContainer implements Connection {
 
     @Override
     public void delQuery(final Query query) {
-        getTabCompleter().removeEntry(TabCompletionType.QUERY_NICK, query.getNickname());
+        getInputModel().get().getTabCompleter().removeEntry(
+                TabCompletionType.QUERY_NICK, query.getNickname());
         queries.remove(converter.toLowerCase(query.getNickname()));
     }
 

src/com/dmdirc/commandparser/CommandManager.java

@@ -167,9 +167,9 @@ public class CommandManager implements CommandController {
         final String silencedCommandName = getCommandChar() + getSilenceChar() + command.getName();
 
         if (command.getType() == CommandType.TYPE_GLOBAL) {
-            registerCommandName(globalWindowProvider.get().getTabCompleter(),
+            registerCommandName(globalWindowProvider.get().getInputModel().get().getTabCompleter(),
                     plainCommandName, register);
-            registerCommandName(globalWindowProvider.get().getTabCompleter(),
+            registerCommandName(globalWindowProvider.get().getInputModel().get().getTabCompleter(),
                     silencedCommandName, register);
         }
 
@@ -177,18 +177,20 @@ public class CommandManager implements CommandController {
         for (Connection server : connectionManager.getConnections()) {
             if (command.getType() == CommandType.TYPE_SERVER
                     || command.getType() == CommandType.TYPE_GLOBAL) {
-                registerCommandName(server.getWindowModel().getTabCompleter(),
+                registerCommandName(server.getWindowModel().getInputModel().get().getTabCompleter(),
                         plainCommandName, register);
-                registerCommandName(server.getWindowModel().getTabCompleter(),
+                registerCommandName(server.getWindowModel().getInputModel().get().getTabCompleter(),
                         silencedCommandName, register);
             }
 
             if (command.getType() == CommandType.TYPE_CHANNEL
                     || command.getType() == CommandType.TYPE_CHAT) {
                 for (GroupChat channel : server.getGroupChatManager().getChannels()) {
-                    registerCommandName(channel.getWindowModel().getTabCompleter(),
+                    registerCommandName(
+                            channel.getWindowModel().getInputModel().get().getTabCompleter(),
                             plainCommandName, register);
-                    registerCommandName(channel.getWindowModel().getTabCompleter(),
+                    registerCommandName(
+                            channel.getWindowModel().getInputModel().get().getTabCompleter(),
                             silencedCommandName, register);
                 }
             }
@@ -196,9 +198,9 @@ public class CommandManager implements CommandController {
             if (command.getType() == CommandType.TYPE_QUERY
                     || command.getType() == CommandType.TYPE_CHAT) {
                 for (Query query : server.getQueries()) {
-                    registerCommandName(query.getTabCompleter(),
+                    registerCommandName(query.getInputModel().get().getTabCompleter(),
                             plainCommandName, register);
-                    registerCommandName(query.getTabCompleter(),
+                    registerCommandName(query.getInputModel().get().getTabCompleter(),
                             silencedCommandName, register);
                 }
             }

src/com/dmdirc/commandparser/aliases/AliasCommandHandler.java

@@ -26,6 +26,7 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
@@ -47,7 +48,9 @@ public class AliasCommandHandler extends Command {
             final CommandContext context) {
         if (args.getArguments().length >= alias.getMinArguments()) {
             for (String line : alias.getSubstitution().split("\n")) {
-                origin.getCommandParser().parseCommand(origin, getSubstituteCommand(line, args));
+                origin.getInputModel().map(InputModel::getCommandParser)
+                        .ifPresent(cp -> cp.parseCommand(origin,
+                                getSubstituteCommand(line, args)));
             }
         } else {
             showError(origin, args.isSilent(), alias.getName() + " requires at least "

src/com/dmdirc/commandparser/auto/AutoCommandHandler.java

@@ -28,6 +28,7 @@ import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.events.ClientOpenedEvent;
 import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Optional;
@@ -77,7 +78,8 @@ public class AutoCommandHandler {
         if (appliesToServer(event.getConnection().getNetwork(),
                 event.getConnection().getAddress(), event.getConnection().getProfile().getName())) {
             final WindowModel container = event.getConnection().getWindowModel();
-            final CommandParser parser = container.getCommandParser();
+            final CommandParser parser = container.getInputModel()
+                    .map(InputModel::getCommandParser).get();
             execute(container, parser);
         }
     }

src/com/dmdirc/commandparser/commands/global/AllServers.java

@@ -32,6 +32,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
+import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
@@ -74,8 +75,8 @@ public class AllServers extends Command implements IntelligentCommand {
         final String command = args.getArgumentsAsString();
 
         for (Connection target : connectionManager.getConnections()) {
-            target.getWindowModel().getCommandParser()
-                    .parseCommand(target.getWindowModel(), command);
+            target.getWindowModel().getInputModel().map(InputModel::getCommandParser)
+                    .ifPresent(cp -> cp.parseCommand(target.getWindowModel(), command));
         }
     }
 

src/com/dmdirc/commandparser/commands/global/Help.java

@@ -82,8 +82,8 @@ public class Help extends Command implements IntelligentCommand {
      * @param isSilent Whether this command has been silenced or not
      */
     private void showAllCommands(final WindowModel origin, final boolean isSilent) {
-        final List<String> commands = new ArrayList<>(origin.getCommandParser()
-                .getCommands().keySet());
+        final List<String> commands = new ArrayList<>(origin.getInputModel().get()
+                .getCommandParser().getCommands().keySet());
 
         Collections.sort(commands);
 

src/com/dmdirc/commandparser/commands/global/Ifplugin.java

@@ -30,14 +30,18 @@ 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.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
 
+import java.util.Optional;
+
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
@@ -105,8 +109,10 @@ public class Ifplugin extends Command implements IntelligentCommand {
         }
 
         if (result != negative) {
-            if (origin.isWritable()) {
-                origin.getCommandParser().parseCommand(origin, args.getArgumentsAsString(1));
+            final Optional<CommandParser> parser = origin.getInputModel()
+                    .map(InputModel::getCommandParser);
+            if (parser.isPresent()) {
+                parser.get().parseCommand(origin, args.getArgumentsAsString(1));
             } else {
                 globalCommandParserProvider.get()
                         .parseCommand(globalWindowProvider.get(), args.getArgumentsAsString(1));

src/com/dmdirc/commandparser/commands/server/AllChannels.java

@@ -33,6 +33,7 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
@@ -71,8 +72,8 @@ public class AllChannels extends Command implements IntelligentCommand {
         final String command = args.getArgumentsAsString();
 
         for (GroupChat channel : server.getGroupChatManager().getChannels()) {
-            channel.getWindowModel().getCommandParser().parseCommand(channel.getWindowModel(),
-                    command);
+            channel.getWindowModel().getInputModel().map(InputModel::getCommandParser)
+                    .ifPresent(cp -> cp.parseCommand(channel.getWindowModel(), command));
         }
     }
 

src/com/dmdirc/commandparser/commands/server/Message.java

@@ -123,7 +123,7 @@ public class Message extends Command implements IntelligentCommand,
     public int getLineCount(final WindowModel origin, final CommandArguments arguments) {
         if (arguments.getArguments().length >= 2) {
             final String target = arguments.getArguments()[0];
-            return origin.getConnection().get().getWindowModel().getNumLines(
+            return origin.getConnection().get().getWindowModel().getInputModel().get().getNumLines(
                     "PRIVMSG " + target + " :" + arguments.getArgumentsAsString(1));
         } else {
             return 1;

src/com/dmdirc/commandparser/commands/server/OpenQuery.java

@@ -111,8 +111,8 @@ public class OpenQuery extends Command implements IntelligentCommand,
     public int getLineCount(final WindowModel origin, final CommandArguments arguments) {
         if (arguments.getArguments().length >= 2) {
             final String target = arguments.getArguments()[0];
-            return origin.getConnection().get().getWindowModel().getNumLines("PRIVMSG "
-                    + target + " :" + arguments.getArgumentsAsString(1));
+            return origin.getConnection().get().getWindowModel().getInputModel().get()
+                    .getNumLines("PRIVMSG " + target + " :" + arguments.getArgumentsAsString(1));
         } else {
             return 1;
         }

src/com/dmdirc/commandparser/parsers/CommandParser.java

@@ -37,6 +37,7 @@ import com.dmdirc.events.UnknownCommandEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.util.collections.RollingList;
@@ -204,8 +205,8 @@ public abstract class CommandParser implements Serializable {
                 final Optional<GroupChat> channel = server.getGroupChatManager()
                         .getChannel(channelName);
                 if (channel.isPresent()) {
-                    channel.get().getWindowModel().getCommandParser()
-                            .parseCommand(origin, newCommandString, false);
+                    channel.get().getWindowModel().getInputModel().map(InputModel::getCommandParser)
+                            .ifPresent(cp -> cp.parseCommand(origin, newCommandString, false));
                 } else {
                     final Map.Entry<CommandInfo, Command> actCommand = commandManager.getCommand(
                             CommandType.TYPE_CHANNEL, command);

src/com/dmdirc/interfaces/WindowModel.java

@@ -23,11 +23,9 @@
 package com.dmdirc.interfaces;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.FrameTitleChangedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.messages.BackBuffer;
 import com.dmdirc.ui.messages.UnreadStatusManager;
 
@@ -49,8 +47,6 @@ public interface WindowModel {
 
     DMDircMBassador getEventBus();
 
-    boolean isWritable();
-
     /**
      * Changes the title of this container, and fires a {@link FrameTitleChangedEvent}.
      *
@@ -109,44 +105,6 @@ public interface WindowModel {
      */
     BackBuffer getBackBuffer();
 
-    /**
-     * Sends a line of text to this container's source.
-     *
-     * @param line The line to be sent
-     */
-    void sendLine(String line);
-
-    /**
-     * Retrieves the command parser to be used for this container.
-     *
-     * @return This container's command parser
-     */
-    CommandParser getCommandParser();
-
-    /**
-     * Retrieves the tab completer which should be used for this container.
-     *
-     * @return This container's tab completer
-     */
-    TabCompleter getTabCompleter();
-
-    /**
-     * Returns the maximum length that a line passed to sendLine() should be, in order to prevent it
-     * being truncated or causing protocol violations.
-     *
-     * @return The maximum line length for this container
-     */
-    int getMaxLineLength();
-
-    /**
-     * Returns the number of lines that the specified string would be sent as.
-     *
-     * @param line The string to be split and sent
-     *
-     * @return The number of lines required to send the specified string
-     */
-    int getNumLines(String line);
-
     /**
      * Returns the model used to define input parameters for this window.
      *

src/com/dmdirc/ui/input/InputHandler.java

@@ -298,7 +298,7 @@ public abstract class InputHandler implements ConfigChangeListener {
                 fireLineWrap(count);
             }
         } else {
-            final int lines = parentWindow.getNumLines(text);
+            final int lines = parentWindow.getInputModel().get().getNumLines(text);
             fireLineWrap(lines);
         }
     }

test/com/dmdirc/commandparser/aliases/AliasCommandHandlerTest.java

@@ -30,8 +30,11 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 
+import java.util.Optional;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -48,6 +51,7 @@ import static org.mockito.Mockito.when;
 public class AliasCommandHandlerTest {
 
     @Mock private WindowModel container;
+    @Mock private InputModel inputModel;
     @Mock private CommandController commandController;
     @Mock private CommandParser commandParser;
     @Mock private CommandContext context;
@@ -57,7 +61,8 @@ public class AliasCommandHandlerTest {
 
     @Before
     public void setup() {
-        when(container.getCommandParser()).thenReturn(commandParser);
+        when(container.getInputModel()).thenReturn(Optional.of(inputModel));
+        when(inputModel.getCommandParser()).thenReturn(commandParser);
         when(commandController.getCommandChar()).thenReturn('#');
         when(commandController.getSilenceChar()).thenReturn('/');
         when(context.getSource()).thenReturn(container);

test/com/dmdirc/commandparser/auto/AutoCommandHandlerTest.java

@@ -30,6 +30,7 @@ import com.dmdirc.events.ClientOpenedEvent;
 import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Optional;
@@ -57,12 +58,13 @@ public class AutoCommandHandlerTest {
     @Mock private Connection connection;
     @Mock private Profile profile;
     @Mock private WindowModel container;
+    @Mock private InputModel inputModel;
     @Mock private CommandParser commandParser;
     private AutoCommandHandler autoCommandHandler;
 
     @Before
     public void setup() {
-        when(autoCommand.getProfile()).thenReturn(Optional.ofNullable("profile"));
+        when(autoCommand.getProfile()).thenReturn(Optional.of("profile"));
         when(autoCommand.getResponse()).thenReturn("Testing123");
         when(autoCommand.getServer()).thenReturn(Optional.<String>empty());
         when(autoCommand.getNetwork()).thenReturn(Optional.<String>empty());
@@ -72,7 +74,8 @@ public class AutoCommandHandlerTest {
         when(connection.getAddress()).thenReturn("irc.quakenet.org");
         when(connection.getNetwork()).thenReturn("Quakenet");
         when(profile.getName()).thenReturn("profile");
-        when(container.getCommandParser()).thenReturn(commandParser);
+        when(container.getInputModel()).thenReturn(Optional.of(inputModel));
+        when(inputModel.getCommandParser()).thenReturn(commandParser);
         autoCommandHandler = new AutoCommandHandler(commandController, globalCommandParser,
                 globalWindow, autoCommand);
     }
@@ -86,7 +89,7 @@ public class AutoCommandHandlerTest {
 
     @Test
     public void testCheckAutoCommandWithoutGlobal() {
-        when(autoCommand.getNetwork()).thenReturn(Optional.ofNullable("Quakenet"));
+        when(autoCommand.getNetwork()).thenReturn(Optional.of("Quakenet"));
         autoCommandHandler.checkAutoCommand(clientOpenedEvent);
         verify(globalCommandParser, never()).parseCommand(globalWindow,
                 commandController.getCommandChar() + autoCommand.getResponse());
@@ -103,8 +106,8 @@ public class AutoCommandHandlerTest {
 
     @Test
     public void testCheckAutoCommandNoProfile() {
-        when(autoCommand.getNetwork()).thenReturn(Optional.ofNullable("Quakenet"));
-        when(autoCommand.getProfile()).thenReturn(Optional.ofNullable("profile1"));
+        when(autoCommand.getNetwork()).thenReturn(Optional.of("Quakenet"));
+        when(autoCommand.getProfile()).thenReturn(Optional.of("profile1"));
         autoCommandHandler.checkAutoCommand(serverConnectedEvent);
         verify(globalCommandParser, never()).parseCommand(globalWindow,
                 commandController.getCommandChar() + autoCommand.getResponse());
@@ -114,7 +117,7 @@ public class AutoCommandHandlerTest {
 
     @Test
     public void testCheckAutoCommandWithProfile() {
-        when(autoCommand.getNetwork()).thenReturn(Optional.ofNullable("Quakenet"));
+        when(autoCommand.getNetwork()).thenReturn(Optional.of("Quakenet"));
         autoCommandHandler.checkAutoCommand(serverConnectedEvent);
         verify(globalCommandParser, never()).parseCommand(globalWindow,
                 commandController.getCommandChar() + autoCommand.getResponse());
@@ -124,7 +127,7 @@ public class AutoCommandHandlerTest {
 
     @Test
     public void testCheckAutoCommandWithProfileNoServer() {
-        when(autoCommand.getServer()).thenReturn(Optional.ofNullable("server"));
+        when(autoCommand.getServer()).thenReturn(Optional.of("server"));
         autoCommandHandler.checkAutoCommand(serverConnectedEvent);
         verify(globalCommandParser, never()).parseCommand(globalWindow,
                 commandController.getCommandChar() + autoCommand.getResponse());
@@ -134,7 +137,7 @@ public class AutoCommandHandlerTest {
 
     @Test
     public void testCheckAutoCommandWithProfileNoServerOrNetwork() {
-        when(autoCommand.getNetwork()).thenReturn(Optional.ofNullable("network"));
+        when(autoCommand.getNetwork()).thenReturn(Optional.of("network"));
         autoCommandHandler.checkAutoCommand(serverConnectedEvent);
         verify(globalCommandParser, never()).parseCommand(globalWindow,
                 commandController.getCommandChar() + autoCommand.getResponse());
@@ -144,7 +147,7 @@ public class AutoCommandHandlerTest {
 
     @Test
     public void testCheckAutoCommandWithProfileWithServer() {
-        when(autoCommand.getNetwork()).thenReturn(Optional.ofNullable("Quakenet"));
+        when(autoCommand.getNetwork()).thenReturn(Optional.of("Quakenet"));
         autoCommandHandler.checkAutoCommand(serverConnectedEvent);
         verify(globalCommandParser, never()).parseCommand(globalWindow,
                 commandController.getCommandChar() + autoCommand.getResponse());

test/com/dmdirc/commandparser/parsers/CommandParserTest.java

@@ -30,6 +30,7 @@ import com.dmdirc.harness.TestCommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChatManager;
+import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
@@ -58,6 +59,7 @@ public class CommandParserTest {
     @Mock private Command command;
     @Mock private Command channelCommand;
     @Mock private WindowModel container;
+    @Mock private InputModel inputModel;
     @Mock private Channel channel;
     @Mock private Connection connection;
     @Mock private GroupChatManager groupChatManager;
@@ -90,7 +92,8 @@ public class CommandParserTest {
         channelCommandParser.registerCommand(channelCommand, channelCommandInfo);
 
         when(channel.getWindowModel()).thenReturn(channel);
-        when(channel.getCommandParser()).thenReturn(channelCommandParser);
+        when(channel.getInputModel()).thenReturn(Optional.of(inputModel));
+        when(inputModel.getCommandParser()).thenReturn(channelCommandParser);
     }
 
     @Test