Merge pull request #458 from csmith/master

Separate InputModel functions from FrameContainer.

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.dcc;
 
 import com.dmdirc.DMDircMBassador;
+import com.dmdirc.DefaultInputModel;
 import com.dmdirc.addons.dcc.events.DccChatMessageEvent;
 import com.dmdirc.addons.dcc.events.DccChatSelfMessageEvent;
 import com.dmdirc.addons.dcc.events.DccChatSocketClosedEvent;
@@ -30,7 +31,6 @@ import com.dmdirc.addons.dcc.events.DccChatSocketOpenedEvent;
 import com.dmdirc.addons.dcc.io.DCCChat;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
@@ -38,8 +38,6 @@ import com.dmdirc.ui.messages.BackBufferFactory;
 
 import java.util.Arrays;
 
-import javax.annotation.Nullable;
-
 /**
  * This class links DCC Chat objects to a window.
  */
@@ -57,7 +55,6 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
     /**
      * Creates a new instance of DCCChatWindow with a given DCCChat object.
      *
-     * @param parent              The parent of this frame container, if any.
      * @param dcc                 The DCCChat object this window wraps around
      * @param configManager       Config manager
      * @param commandController   The controller to use in the command parser.
@@ -78,12 +75,15 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
             final TabCompleterFactory tabCompleterFactory,
             final DMDircMBassador eventBus) {
         super(title, "dcc-chat-inactive", configManager, backBufferFactory,
-                new DCCCommandParser(configManager, commandController, eventBus),
-                tabCompleterFactory,
                 eventBus,
                 Arrays.asList(
                         WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier()));
+        setInputModel(new DefaultInputModel(
+                this::sendLine,
+                new DCCCommandParser(configManager, commandController, eventBus),
+                tabCompleterFactory.getTabCompleter(configManager),
+                () -> 512));
         dccChat = dcc;
         dcc.setHandler(this);
         nickname = nick;
@@ -101,8 +101,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
         return dccChat;
     }
 
-    @Override
-    public void sendLine(final String line) {
+    private void sendLine(final String line) {
         if (dccChat.isWriteable()) {
             eventBus.publishAsync(new DccChatSelfMessageEvent(this, nickname, line));
             dccChat.sendLine(line);

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

@@ -24,10 +24,8 @@ package com.dmdirc.addons.dcc;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.BackBufferFactory;
 
 import java.util.Collection;
@@ -47,8 +45,6 @@ public abstract class DCCFrameContainer extends FrameContainer {
      * @param title               The title of this window
      * @param icon                The icon to use
      * @param configManager       Config manager
-     * @param parser              Command parser to use for this window
-     * @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
      */
@@ -57,21 +53,12 @@ public abstract class DCCFrameContainer extends FrameContainer {
             final String icon,
             final AggregateConfigProvider configManager,
             final BackBufferFactory backBufferFactory,
-            final CommandParser parser,
-            final TabCompleterFactory tabCompleterFactory,
             final DMDircMBassador eventBus,
             final Collection<String> components) {
         super(icon, title, title, configManager, backBufferFactory,
-                tabCompleterFactory.getTabCompleter(configManager),
                 eventBus,
                 components);
         initBackBuffer();
-        setCommandParser(parser);
-    }
-
-    @Override
-    public int getMaxLineLength() {
-        return 512;
     }
 
     @Override

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.debug;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.events.ServerConnectingEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.events.DataInEvent;
@@ -52,10 +51,6 @@ public class RawWindow extends FrameContainer {
         super("raw", "Raw", "(Raw log)",
                 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(),
                         WindowComponent.INPUTFIELD.getIdentifier()));
@@ -78,11 +73,6 @@ public class RawWindow extends FrameContainer {
         super.close();
     }
 
-    @Override
-    public int getMaxLineLength() {
-        return -1;
-    }
-
     @Handler
     public void handleServerConnecting(final ServerConnectingEvent connectingEvent) {
         connection.getParser().map(Parser::getCallbackManager).ifPresent(c -> c.subscribe(this));

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

@@ -22,6 +22,8 @@
 
 package com.dmdirc.addons.debug;
 
+import com.dmdirc.DefaultInputModel;
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
@@ -58,11 +60,19 @@ public class RawWindowFactory {
     public RawWindow getRawWindow(final Connection connection) {
         final RawWindow rawWindow = new RawWindow(connection,
                 tabCompleterFactory,  backBufferFactory);
-        rawWindow.setCommandParser(new ServerCommandParser(
-                connection.getWindowModel().getConfigManager(),
-                commandController,
-                connection.getWindowModel().getEventBus(),
-                connection));
+        rawWindow.setInputModel(
+                new DefaultInputModel(
+                        connection::sendLine,
+                        new ServerCommandParser(
+                                connection.getWindowModel().getConfigManager(),
+                                commandController,
+                                connection.getWindowModel().getEventBus(),
+                                connection),
+                        tabCompleterFactory.getTabCompleter(
+                                connection.getWindowModel().getInputModel().get().getTabCompleter(),
+                                connection.getWindowModel().getConfigManager(),
+                                CommandType.TYPE_QUERY, CommandType.TYPE_CHAT),
+                        () -> -1));
         windowManager.addWindow(connection.getWindowModel(), rawWindow);
         return rawWindow;
     }

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

@@ -48,21 +48,11 @@ public class FakeWriteableFrameContainer extends FrameContainer {
             final BackBufferFactory backBufferFactory) {
         super(target.getIcon(), target.getName(), target.getTitle(),
                 target.getConfigManager(), backBufferFactory,
-                target.getInputModel().get().getTabCompleter(), eventBus,
+                eventBus,
                 Collections.<String>emptyList());
         this.target = target;
         initBackBuffer();
-        setCommandParser(target.getInputModel().get().getCommandParser());
-    }
-
-    @Override
-    public void sendLine(final String line) {
-        target.getInputModel().ifPresent(im -> im.sendLine(line));
-    }
-
-    @Override
-    public int getMaxLineLength() {
-        return target.getInputModel().get().getMaxLineLength();
+        setInputModel(target.getInputModel().orElse(null));
     }
 
     @Override