Merge pull request #649 from csmith/master

Separate InputModel functions from FrameContainer.

src/com/dmdirc/Channel.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc;
 
-import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.ChannelClosedEvent;
 import com.dmdirc.events.ChannelSelfActionEvent;
@@ -45,7 +44,6 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.core.components.WindowComponent;
-import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.Styliser;
@@ -99,13 +97,11 @@ public class Channel extends FrameContainer implements GroupChat {
      * @param connection          The connection object that this channel belongs to
      * @param newChannelInfo      The parser's channel object that corresponds to this channel
      * @param configMigrator      The config migrator which provides the config for this channel.
-     * @param tabCompleterFactory The factory to use to create tab completers.
      */
     public Channel(
             final Connection connection,
             final ChannelInfo newChannelInfo,
             final ConfigProviderMigrator configMigrator,
-            final TabCompleterFactory tabCompleterFactory,
             final BackBufferFactory backBufferFactory,
             final GroupChatUserManager groupChatUserManager) {
         super("channel-inactive",
@@ -113,10 +109,6 @@ public class Channel extends FrameContainer implements GroupChat {
                 Styliser.stipControlCodes(newChannelInfo.getName()),
                 configMigrator.getConfigProvider(),
                 backBufferFactory,
-                tabCompleterFactory.getTabCompleter(
-                        connection.getWindowModel().getInputModel().get().getTabCompleter(),
-                        configMigrator.getConfigProvider(), CommandType.TYPE_CHANNEL,
-                        CommandType.TYPE_CHAT),
                 connection.getWindowModel().getEventBus(),
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier(),
@@ -168,10 +160,14 @@ public class Channel extends FrameContainer implements GroupChat {
         }
 
         final GroupChatUser me = getUser(connection.getLocalUser().get()).get();
-        splitLine(line).stream().filter(part -> !part.isEmpty()).forEach(part -> {
-            getEventBus().publishAsync(new ChannelSelfMessageEvent(this, me, part));
-            channelInfo.sendMessage(part);
-        });
+        getInputModel().get()
+                .splitLine(line)
+                .stream()
+                .filter(part -> !part.isEmpty())
+                .forEach(part -> {
+                    getEventBus().publishAsync(new ChannelSelfMessageEvent(this, me, part));
+                    channelInfo.sendMessage(part);
+                });
     }
 
     @Override

src/com/dmdirc/ChannelFactory.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc;
 
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.ChannelCommandParser;
 import com.dmdirc.events.ChannelOpenedEvent;
 import com.dmdirc.interfaces.CommandController;
@@ -65,9 +66,20 @@ public class ChannelFactory {
             final ChannelInfo channelInfo,
             final ConfigProviderMigrator configMigrator) {
         final Channel channel = new Channel(connection, channelInfo, configMigrator,
-                tabCompleterFactory, backBufferFactory, groupChatUserManager);
-        channel.setCommandParser(new ChannelCommandParser(connection.getWindowModel(),
-                commandController, eventBus, channel));
+                backBufferFactory, groupChatUserManager);
+        channel.setInputModel(new DefaultInputModel(
+                channel::sendLine,
+                new ChannelCommandParser(
+                        connection.getWindowModel(),
+                        commandController,
+                        eventBus,
+                        channel),
+                tabCompleterFactory.getTabCompleter(
+                        connection.getWindowModel().getInputModel().get().getTabCompleter(),
+                        configMigrator.getConfigProvider(),
+                        CommandType.TYPE_CHANNEL,
+                        CommandType.TYPE_CHAT),
+                channel::getMaxLineLength));
         windowManager.addWindow(connection.getWindowModel(), channel);
         connection.getWindowModel().getEventBus().publish(new ChannelOpenedEvent(channel));
         return channel;

src/com/dmdirc/DefaultInputModel.java

@@ -0,0 +1,118 @@
+/*
+ * 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;
+
+import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.interfaces.InputModel;
+import com.dmdirc.ui.input.TabCompleter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+/**
+ * Basic implementation of {@link InputModel}.
+ */
+public class DefaultInputModel implements InputModel {
+
+    private final Consumer<String> lineConsumer;
+    private final CommandParser commandParser;
+    private final TabCompleter tabCompleter;
+    private final Supplier<Integer> lineLengthSupplier;
+
+    public DefaultInputModel(final Consumer<String> lineConsumer, final CommandParser commandParser,
+            final TabCompleter tabCompleter, final Supplier<Integer> lineLengthSupplier) {
+        this.lineConsumer = lineConsumer;
+        this.commandParser = commandParser;
+        this.tabCompleter = tabCompleter;
+        this.lineLengthSupplier = lineLengthSupplier;
+    }
+
+    @Override
+    public void sendLine(final String line) {
+        lineConsumer.accept(line);
+    }
+
+    @Override
+    public CommandParser getCommandParser() {
+        return commandParser;
+    }
+
+    @Override
+    public TabCompleter getTabCompleter() {
+        return tabCompleter;
+    }
+
+    @Override
+    public int getMaxLineLength() {
+        return lineLengthSupplier.get();
+    }
+
+    @Override
+    public List<String> splitLine(final String line) {
+        final List<String> result = new ArrayList<>();
+
+        if (line.indexOf('\n') > -1) {
+            for (String part : line.split("\n")) {
+                result.addAll(splitLine(part));
+            }
+        } else {
+            final StringBuilder remaining = new StringBuilder(line);
+
+            while (getMaxLineLength() > -1 && remaining.toString().getBytes().length
+                    > getMaxLineLength()) {
+                int number = Math.min(remaining.length(), getMaxLineLength());
+
+                while (remaining.substring(0, number).getBytes().length > getMaxLineLength()) {
+                    number--;
+                }
+
+                result.add(remaining.substring(0, number));
+                remaining.delete(0, number);
+            }
+
+            result.add(remaining.toString());
+        }
+
+        return result;
+    }
+
+    @Override
+    public final int getNumLines(final String line) {
+        final String[] splitLines = line.split("(\n|\r\n|\r)", Integer.MAX_VALUE);
+        int lines = 0;
+
+        for (String splitLine : splitLines) {
+            if (getMaxLineLength() <= 0) {
+                lines++;
+            } else {
+                lines += (int) Math.ceil(splitLine.getBytes().length
+                        / (double) getMaxLineLength());
+            }
+        }
+
+        return lines;
+    }
+
+}

src/com/dmdirc/FrameContainer.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc;
 
-import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.events.FrameComponentAddedEvent;
 import com.dmdirc.events.FrameComponentRemovedEvent;
@@ -34,28 +33,25 @@ import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.parser.common.CompositionState;
-import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.messages.BackBuffer;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.UnreadStatusManager;
 import com.dmdirc.util.ChildEventBusManager;
 import com.dmdirc.util.collections.ListenerList;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
-import static com.google.common.base.Preconditions.checkState;
+import javax.annotation.Nullable;
 
 /**
  * The frame container implements basic methods that should be present in all objects that handle a
  * frame.
  */
-public abstract class FrameContainer implements WindowModel, InputModel {
+public abstract class FrameContainer implements WindowModel {
 
     /** Listeners not yet using ListenerSupport. */
     protected final ListenerList listeners = new ListenerList();
@@ -77,26 +73,12 @@ public abstract class FrameContainer implements WindowModel, InputModel {
     private final DMDircMBassador eventBus;
     /** The manager handling this frame's unread status. */
     private final UnreadStatusManager unreadStatusManager;
-    /** Whether or not this container is writable. */
-    private final boolean writable;
     /** The back buffer factory. */
     private final BackBufferFactory backBufferFactory;
     /** The back buffer for this container. */
     private BackBuffer backBuffer;
-
-    /**
-     * The tab completer to use.
-     * <p>
-     * Only defined if this container is {@link #writable}.
-     */
-    private final Optional<TabCompleter> tabCompleter;
-
-    /**
-     * The command parser used for commands in this container.
-     * <p>
-     * Only defined if this container is {@link #writable}.
-     */
-    private Optional<CommandParser> commandParser = Optional.empty();
+    /** The input model for this container. */
+    private Optional<InputModel> inputModel = Optional.empty();
 
     /**
      * Instantiate new frame container.
@@ -113,38 +95,6 @@ public abstract class FrameContainer implements WindowModel, InputModel {
         this.name = name;
         this.title = title;
         this.components = new HashSet<>(components);
-        this.writable = false;
-        this.tabCompleter = Optional.empty();
-        this.backBufferFactory = backBufferFactory;
-
-        eventBusManager = new ChildEventBusManager(eventBus);
-        eventBusManager.connect();
-        this.eventBus = eventBusManager.getChildBus();
-        this.unreadStatusManager = new UnreadStatusManager(this);
-        this.eventBus.subscribe(unreadStatusManager);
-        configManager.getBinder().bind(unreadStatusManager, UnreadStatusManager.class);
-
-        setIcon(icon);
-    }
-
-    /**
-     * Instantiate new frame container that accepts user input.
-     */
-    protected FrameContainer(
-            final String icon,
-            final String name,
-            final String title,
-            final AggregateConfigProvider config,
-            final BackBufferFactory backBufferFactory,
-            final TabCompleter tabCompleter,
-            final DMDircMBassador eventBus,
-            final Collection<String> components) {
-        this.configManager = config;
-        this.name = name;
-        this.title = title;
-        this.components = new HashSet<>(components);
-        this.writable = true;
-        this.tabCompleter = Optional.of(tabCompleter);
         this.backBufferFactory = backBufferFactory;
 
         eventBusManager = new ChildEventBusManager(eventBus);
@@ -162,10 +112,6 @@ public abstract class FrameContainer implements WindowModel, InputModel {
         backBuffer.startAddingEvents();
     }
 
-    public void setCommandParser(final CommandParser commandParser) {
-        this.commandParser = Optional.ofNullable(commandParser);
-    }
-
     @Override
     public String getIcon() {
         return icon;
@@ -258,81 +204,6 @@ public abstract class FrameContainer implements WindowModel, InputModel {
         return backBuffer;
     }
 
-    @Override
-    public void sendLine(final String line) {
-        throw new UnsupportedOperationException("Container doesn't override sendLine");
-    }
-
-    @Override
-    public CommandParser getCommandParser() {
-        checkState(writable);
-        return commandParser.get();
-    }
-
-    @Override
-    public TabCompleter getTabCompleter() {
-        checkState(writable);
-        return tabCompleter.get();
-    }
-
-    @Override
-    public int getMaxLineLength() {
-        throw new UnsupportedOperationException("Container doesn't override getMaxLineLength");
-    }
-
-    /**
-     * Splits the specified line into chunks that contain a number of bytes less than or equal to
-     * the value returned by {@link #getMaxLineLength()}.
-     *
-     * @param line The line to be split
-     *
-     * @return An ordered list of chunks of the desired length
-     */
-    protected List<String> splitLine(final String line) {
-        final List<String> result = new ArrayList<>();
-
-        if (line.indexOf('\n') > -1) {
-            for (String part : line.split("\n")) {
-                result.addAll(splitLine(part));
-            }
-        } else {
-            final StringBuilder remaining = new StringBuilder(line);
-
-            while (getMaxLineLength() > -1 && remaining.toString().getBytes().length
-                    > getMaxLineLength()) {
-                int number = Math.min(remaining.length(), getMaxLineLength());
-
-                while (remaining.substring(0, number).getBytes().length > getMaxLineLength()) {
-                    number--;
-                }
-
-                result.add(remaining.substring(0, number));
-                remaining.delete(0, number);
-            }
-
-            result.add(remaining.toString());
-        }
-
-        return result;
-    }
-
-    @Override
-    public final int getNumLines(final String line) {
-        final String[] splitLines = line.split("(\n|\r\n|\r)", Integer.MAX_VALUE);
-        int lines = 0;
-
-        for (String splitLine : splitLines) {
-            if (getMaxLineLength() <= 0) {
-                lines++;
-            } else {
-                lines += (int) Math.ceil(splitLine.getBytes().length
-                        / (double) getMaxLineLength());
-            }
-        }
-
-        return lines;
-    }
-
     /**
      * Sets the composition state for the local user for this chat.
      *
@@ -345,11 +216,17 @@ public abstract class FrameContainer implements WindowModel, InputModel {
 
     @Override
     public Optional<InputModel> getInputModel() {
-        if (writable) {
-            return Optional.of(this);
-        } else {
-            return Optional.empty();
-        }
+        return inputModel;
+    }
+
+    /**
+     * Sets an input model for this window. If a window does not have an input model, then it
+     * will not accept user input.
+     *
+     * @param inputModel The new input model to use (null to disallow input).
+     */
+    public void setInputModel(@Nullable final InputModel inputModel) {
+        this.inputModel = Optional.ofNullable(inputModel);
     }
 
     @Override

src/com/dmdirc/GlobalWindow.java

@@ -54,12 +54,16 @@ public class GlobalWindow extends FrameContainer {
     public GlobalWindow(@GlobalConfig final AggregateConfigProvider config,
             final GlobalCommandParser parser, final TabCompleterFactory tabCompleterFactory,
             final DMDircMBassador eventBus, final BackBufferFactory backBufferFactory) {
-        super("icon", "Global", "(Global)", config, backBufferFactory,
-                tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL), eventBus,
+        super("icon", "Global", "(Global)", config, backBufferFactory, eventBus,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier()));
         initBackBuffer();
-        setCommandParser(parser);
+        setInputModel(new DefaultInputModel(
+                this::sendLine,
+                parser,
+                tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL),
+                this::getMaxLineLength
+        ));
     }
 
     @Override
@@ -67,14 +71,12 @@ public class GlobalWindow extends FrameContainer {
         return Optional.empty();
     }
 
-    @Override
-    public void sendLine(final String line) {
+    private void sendLine(final String line) {
         getEventBus().publishAsync(
                 new CommandErrorEvent(this, "You may only enter commands in the global window."));
     }
 
-    @Override
-    public int getMaxLineLength() {
+    private int getMaxLineLength() {
         return -1;
     }
 

src/com/dmdirc/Query.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc;
 
-import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.events.QueryActionEvent;
 import com.dmdirc.events.QueryClosedEvent;
@@ -45,7 +44,6 @@ import com.dmdirc.parser.events.QuitEvent;
 import com.dmdirc.parser.interfaces.ClientInfo;
 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 java.awt.Toolkit;
@@ -69,17 +67,12 @@ public class Query extends FrameContainer implements PrivateChat {
     public Query(
             final Connection connection,
             final User user,
-            final TabCompleterFactory tabCompleterFactory,
             final BackBufferFactory backBufferFactory) {
         super("query",
                 user.getNickname(),
                 user.getNickname(),
                 connection.getWindowModel().getConfigManager(),
                 backBufferFactory,
-                tabCompleterFactory.getTabCompleter(
-                        connection.getWindowModel().getInputModel().get().getTabCompleter(),
-                        connection.getWindowModel().getConfigManager(),
-                        CommandType.TYPE_QUERY, CommandType.TYPE_CHAT),
                 connection.getWindowModel().getEventBus(),
                 Arrays.asList(
                         WindowComponent.TEXTAREA.getIdentifier(),
@@ -103,11 +96,15 @@ public class Query extends FrameContainer implements PrivateChat {
             return;
         }
 
-        splitLine(line).stream().filter(part -> !part.isEmpty()).forEach(part -> {
-            connection.getParser().get().sendMessage(target, part);
-            getEventBus().publishAsync(new QuerySelfMessageEvent(this,
-                    connection.getLocalUser().get(), part));
-        });
+        getInputModel().get()
+                .splitLine(line)
+                .stream()
+                .filter(part -> !part.isEmpty())
+                .forEach(part -> {
+                    connection.getParser().get().sendMessage(target, part);
+                    getEventBus().publishAsync(new QuerySelfMessageEvent(this,
+                            connection.getLocalUser().get(), part));
+                });
     }
 
     @Override

src/com/dmdirc/QueryFactory.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc;
 
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.QueryCommandParser;
 import com.dmdirc.events.QueryOpenedEvent;
 import com.dmdirc.interfaces.CommandController;
@@ -58,9 +59,20 @@ public class QueryFactory {
     }
 
     public Query getQuery(final Connection connection, final User user) {
-        final Query query = new Query(connection, user, tabCompleterFactory, backBufferFactory);
-        query.setCommandParser(new QueryCommandParser(connection.getWindowModel(),
-                commandController, connection.getWindowModel().getEventBus(), query));
+        final Query query = new Query(connection, user, backBufferFactory);
+        query.setInputModel(new DefaultInputModel(
+                query::sendLine,
+                new QueryCommandParser(
+                        connection.getWindowModel(),
+                        commandController,
+                        connection.getWindowModel().getEventBus(),
+                        query),
+                tabCompleterFactory.getTabCompleter(
+                        connection.getWindowModel().getInputModel().get().getTabCompleter(),
+                        connection.getWindowModel().getConfigManager(),
+                        CommandType.TYPE_QUERY,
+                        CommandType.TYPE_CHAT),
+                query::getMaxLineLength));
         windowManager.addWindow(connection.getWindowModel(), query);
         connection.getWindowModel().getEventBus().publish(new QueryOpenedEvent(query));
         return query;

src/com/dmdirc/Server.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc;
 
-import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.events.ServerConnectErrorEvent;
 import com.dmdirc.events.ServerConnectedEvent;
@@ -51,7 +50,6 @@ import com.dmdirc.parser.interfaces.SecureParser;
 import com.dmdirc.parser.interfaces.StringConverter;
 import com.dmdirc.tls.CertificateManager;
 import com.dmdirc.ui.core.components.WindowComponent;
-import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.ColourManager;
@@ -174,7 +172,6 @@ public class Server extends FrameContainer implements Connection {
     public Server(
             final ConfigProviderMigrator configMigrator,
             final ParserFactory parserFactory,
-            final TabCompleterFactory tabCompleterFactory,
             final IdentityFactory identityFactory,
             final QueryFactory queryFactory,
             final DMDircMBassador eventBus,
@@ -191,8 +188,6 @@ public class Server extends FrameContainer implements Connection {
                 getHost(uri),
                 configMigrator.getConfigProvider(),
                 backBufferFactory,
-                tabCompleterFactory.getTabCompleter(configMigrator.getConfigProvider(),
-                        CommandType.TYPE_SERVER, CommandType.TYPE_GLOBAL),
                 eventBus,
                 Arrays.asList(
                         WindowComponent.TEXTAREA.getIdentifier(),
@@ -621,7 +616,6 @@ public class Server extends FrameContainer implements Connection {
         }
     }
 
-    @Override
     public int getMaxLineLength() {
         return withParserReadLock(Parser::getMaxLength, -1);
     }

src/com/dmdirc/ServerFactoryImpl.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc;
 
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.interfaces.CommandController;
@@ -88,11 +89,21 @@ public class ServerFactoryImpl {
             final URI uri,
             final Profile profile) {
         final Server server = new Server(configMigrator, parserFactory,
-                tabCompleterFactory, identityFactory, queryFactory.get(), eventBus,
+                identityFactory, queryFactory.get(), eventBus,
                 messageEncoderFactory, userSettings, groupChatManagerFactory, executorService,
                 uri, profile, backBufferFactory, userManager);
-        server.setCommandParser(new ServerCommandParser(server.getConfigManager(),
-                commandController.get(), eventBus, server));
+        server.setInputModel(new DefaultInputModel(
+                server::sendLine,
+                new ServerCommandParser(
+                        server.getConfigManager(),
+                        commandController.get(),
+                        eventBus,
+                        server),
+                tabCompleterFactory.getTabCompleter(
+                        configMigrator.getConfigProvider(),
+                        CommandType.TYPE_SERVER,
+                        CommandType.TYPE_GLOBAL),
+                server::getMaxLineLength));
         return server;
     }
 }

src/com/dmdirc/interfaces/InputModel.java

@@ -25,6 +25,8 @@ package com.dmdirc.interfaces;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.input.TabCompleter;
 
+import java.util.List;
+
 /**
  * Models the input functionality of a {@link WindowModel}.
  */
@@ -59,6 +61,16 @@ public interface InputModel {
      */
     int getMaxLineLength();
 
+    /**
+     * Splits the specified line into chunks that contain a number of bytes less than or equal to
+     * the value returned by {@link #getMaxLineLength()}.
+     *
+     * @param line The line to be split
+     *
+     * @return An ordered list of chunks of the desired length
+     */
+    List<String> splitLine(String line);
+
     /**
      * Returns the number of lines that the specified string would be sent as, if it were passed
      * to {@link #sendLine(String)}.

test/com/dmdirc/WritableFrameContainerTest.java

@@ -61,22 +61,23 @@ public class WritableFrameContainerTest {
         commands = new CommandManager(connectionManager, globalWindowProvider);
     }
 
+    // TODO: Move this test to DefaultInputModel.
     @Test
     public void testGetNumLines() {
         final FrameContainer container10 = new TestWritableFrameContainer(10, acp, commands,
                 eventBus, backBufferFactory);
 
-        final int res0a = container10.getNumLines("");
-        final int res0b = container10.getNumLines("\r");
-        final int res0c = container10.getNumLines("\r\n");
+        final int res0a = container10.getInputModel().get().getNumLines("");
+        final int res0b = container10.getInputModel().get().getNumLines("\r");
+        final int res0c = container10.getInputModel().get().getNumLines("\r\n");
 
-        final int res1a = container10.getNumLines("0123456789");
-        final int res1b = container10.getNumLines("\r\n123456789");
-        final int res1c = container10.getNumLines("qaaa");
+        final int res1a = container10.getInputModel().get().getNumLines("0123456789");
+        final int res1b = container10.getInputModel().get().getNumLines("\r\n123456789");
+        final int res1c = container10.getInputModel().get().getNumLines("qaaa");
 
-        final int res2a = container10.getNumLines("01234567890");
-        final int res2b = container10.getNumLines("012345\r\n\r\n34567890");
-        final int res2c = container10.getNumLines("01234567890\r\n\r\n");
+        final int res2a = container10.getInputModel().get().getNumLines("01234567890");
+        final int res2b = container10.getInputModel().get().getNumLines("012345\r\n\r\n34567890");
+        final int res2c = container10.getInputModel().get().getNumLines("01234567890\r\n\r\n");
 
         assertEquals(0, res0a);
         assertEquals(0, res0b);
@@ -91,6 +92,7 @@ public class WritableFrameContainerTest {
         assertEquals(2, res2c);
     }
 
+    // TODO: Move this test to DefaultInputModel.
     @Test
     public void testSplitLine() {
         final FrameContainer container10 = new TestWritableFrameContainer(10, acp, commands,
@@ -108,7 +110,7 @@ public class WritableFrameContainerTest {
         };
 
         for (String[][] test : tests) {
-            final String[] res = container10.splitLine(test[0][0]).toArray(new String[0]);
+            final String[] res = container10.getInputModel().get().splitLine(test[0][0]).toArray(new String[0]);
             assertTrue('\'' + test[0][0] + "' → "
                     + Arrays.toString(res) + " (expected: " + Arrays.toString(test[1]) + ')',
                     Arrays.equals(res, test[1]));

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -23,6 +23,7 @@
 package com.dmdirc.harness;
 
 import com.dmdirc.DMDircMBassador;
+import com.dmdirc.DefaultInputModel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
@@ -36,29 +37,20 @@ import java.util.Optional;
 
 public class TestWritableFrameContainer extends FrameContainer {
 
-    private final int lineLength;
-
     public TestWritableFrameContainer(final int lineLength,
             final AggregateConfigProvider cm, final CommandManager commandManager,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory) {
         super("raw", "Raw", "(Raw)", cm, backBufferFactory,
-                new TabCompleter(cm),
                 eventBus,
                 Collections.<String>emptySet());
 
-        setCommandParser(new GlobalCommandParser(cm, commandManager, eventBus));
-        this.lineLength = lineLength;
-    }
-
-    @Override
-    public void sendLine(final String line) {
-        // Do nothing
-    }
-
-    @Override
-    public int getMaxLineLength() {
-        return lineLength;
+        setInputModel(
+                new DefaultInputModel(
+                        line -> {},
+                        new GlobalCommandParser(cm, commandManager, eventBus),
+                        new TabCompleter(cm),
+                        () -> lineLength));
     }
 
     @Override