Remove input methods from WindowModel.

Migrate all users to using the InputModel.

conditional_execute/src/com/dmdirc/addons/conditional_execute/ConditionalExecuteCommand.java

@@ -28,6 +28,7 @@ import com.dmdirc.commandparser.CommandType;
 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 java.util.HashMap;
@@ -231,8 +232,10 @@ public class ConditionalExecuteCommand extends Command {
                         "You can't run commands and manipulate the namespace at the same time, ignored.");
             } else {
                 // Command to run!
-                if (namespace.canRun(inverse) && origin.isWritable()) {
-                    origin.getCommandParser().parseCommand(origin, args.getArgumentsAsString(i));
+                if (namespace.canRun(inverse)) {
+                    final String command = args.getArgumentsAsString(i);
+                    origin.getInputModel().map(InputModel::getCommandParser)
+                            .ifPresent(cp -> cp.parseCommand(origin, command));
                 }
                 return;
             }

conditional_execute/test/com/dmdirc/addons/conditional_execute/ConditionalExecuteCommandTest.java

@@ -28,8 +28,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;
@@ -52,6 +55,7 @@ public class ConditionalExecuteCommandTest {
     @Mock private CommandController commandController;
     @Mock private CommandParser commandParser;
     @Mock private WindowModel container;
+    @Mock private InputModel inputModel;
     @Mock private CommandContext context;
     @Mock private DMDircMBassador eventbus;
     @Captor private ArgumentCaptor<CommandErrorEvent> errorEventCaptor;
@@ -61,8 +65,8 @@ public class ConditionalExecuteCommandTest {
     public void setup() {
         when(commandController.getCommandChar()).thenReturn('/');
         when(commandController.getSilenceChar()).thenReturn('/');
-        when(container.getCommandParser()).thenReturn(commandParser);
-        when(container.isWritable()).thenReturn(true);
+        when(container.getInputModel()).thenReturn(Optional.of(inputModel));
+        when(inputModel.getCommandParser()).thenReturn(commandParser);
         when(container.getEventBus()).thenReturn(eventbus);
 
         command = new ConditionalExecuteCommand(commandController);

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

@@ -59,7 +59,7 @@ public class DCCCommandParser extends GlobalCommandParser {
      */
     @Override
     protected void handleNonCommand(final WindowModel origin, final String line) {
-        origin.sendLine(line);
+        origin.getInputModel().ifPresent(im -> im.sendLine(line));
     }
 
 }

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

@@ -52,7 +52,8 @@ public class RawWindow extends FrameContainer {
         super("raw", "Raw", "(Raw log)",
                 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(),

debug/src/com/dmdirc/addons/debug/commands/Time.java

@@ -27,10 +27,14 @@ import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import java.util.Optional;
+
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
@@ -79,9 +83,11 @@ public class Time extends DebugCommand implements IntelligentCommand {
             return;
         }
 
-        if (origin.isWritable()) {
+        final Optional<CommandParser> parser =
+                origin.getInputModel().map(InputModel::getCommandParser);
+        if (parser.isPresent()) {
             final long start = System.currentTimeMillis();
-            origin.getCommandParser().parseCommand(origin, args.getArgumentsAsString(0));
+            parser.get().parseCommand(origin, args.getArgumentsAsString(0));
             final long end = System.currentTimeMillis();
             showOutput(origin, args.isSilent(),
                     "Command executed in " + (end - start) + " milliseconds.");

nowplaying/src/com/dmdirc/addons/nowplaying/NowPlayingCommand.java

@@ -33,6 +33,7 @@ import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.Chat;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
@@ -106,8 +107,9 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
                     if (source.getState() == MediaSourceState.CLOSED) {
                         showError(origin, args.isSilent(), "Source is not running.");
                     } else {
-                        target.getWindowModel().getCommandParser().parseCommand(origin,
-                                getInformation(source, args.getArgumentsAsString(2)));
+                        target.getWindowModel().getInputModel().map(InputModel::getCommandParser)
+                                .ifPresent(cp -> cp.parseCommand(origin,
+                                        getInformation(source, args.getArgumentsAsString(2))));
                     }
                 }
             } else {
@@ -116,9 +118,10 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
             }
         } else {
             if (manager.hasRunningSource()) {
-                target.getWindowModel().getCommandParser().parseCommand(origin,
-                        getInformation(manager.getBestSource(), args.
-                                getArgumentsAsString(0)));
+                target.getWindowModel().getInputModel().map(InputModel::getCommandParser)
+                        .ifPresent(cp -> cp.parseCommand(origin,
+                                getInformation(manager.getBestSource(),
+                                        args.getArgumentsAsString(0))));
             } else {
                 showError(origin, args.isSilent(), "No running media sources available.");
             }

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

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

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

@@ -32,6 +32,7 @@ import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.Chat;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
@@ -76,10 +77,11 @@ public class RedirectCommand extends Command implements IntelligentCommand {
     public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final Chat target = ((ChatCommandContext) context).getChat();
-        target.getWindowModel().getCommandParser().parseCommand(
-                new FakeWriteableFrameContainer(target.getWindowModel(),
-                        eventBus, backBufferFactory),
-                args.getArgumentsAsString());
+        target.getWindowModel().getInputModel().map(InputModel::getCommandParser).
+                ifPresent(cp -> cp.parseCommand(
+                        new FakeWriteableFrameContainer(target.getWindowModel(),
+                                eventBus, backBufferFactory),
+                        args.getArgumentsAsString()));
     }
 
     @Override

time/src/com/dmdirc/addons/time/TimedCommand.java

@@ -101,7 +101,7 @@ public class TimedCommand extends TimerTask {
         if (timer == null) {
             return;
         }
-        origin.getCommandParser().parseCommand(origin, command);
+        origin.getInputModel().get().getCommandParser().parseCommand(origin, command);
 
         if (--repetitions <= 0) {
             manager.removeTimer(timerKey);

time/test/com/dmdirc/addons/time/TimedCommandTest.java

@@ -23,8 +23,10 @@
 package com.dmdirc.addons.time;
 
 import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 
+import java.util.Optional;
 import java.util.Timer;
 
 import org.junit.Before;
@@ -45,6 +47,7 @@ public class TimedCommandTest {
 
     @Mock private TimerManager timerManager;
     @Mock private WindowModel origin;
+    @Mock private InputModel inputModel;
     @Mock private CommandParser commandParser;
     @Mock private TimerFactory timerFactory;
     @Mock private Timer timer;
@@ -54,7 +57,8 @@ public class TimedCommandTest {
     @Before
     public void setUp() throws Exception {
         when(timerFactory.getTimer(anyString())).thenReturn(timer);
-        when(origin.getCommandParser()).thenReturn(commandParser);
+        when(origin.getInputModel()).thenReturn(Optional.of(inputModel));
+        when(inputModel.getCommandParser()).thenReturn(commandParser);
         instance = new TimedCommand(timerManager, 1, 2, 3, "command", origin);
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/components/TopicBar.java

@@ -122,7 +122,6 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
      * @param channel           The channel that this topic bar is for.
      * @param window            The window this topic bar is for.
      * @param iconManager       The icon manager to use for this bar's icons.
-     * @param eventBus          The event bus to post errors to
      */
     public TopicBar(
             final Window parentWindow,
@@ -159,10 +158,11 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
 
         final SwingInputHandler handler = new SwingInputHandler(
                 serviceManager, topicText, commandController,
-                channel.getWindowModel().getCommandParser(), channel.getWindowModel(),
+                channel.getWindowModel().getInputModel().get().getCommandParser(),
+                channel.getWindowModel(),
                 tabCompleterUtils, channel.getEventBus());
         handler.setTypes(true, false, true, false);
-        handler.setTabCompleter(channel.getWindowModel().getTabCompleter());
+        handler.setTabCompleter(channel.getWindowModel().getInputModel().get().getTabCompleter());
 
         final JScrollPane sp = new JScrollPane(topicText);
         sp.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java

@@ -96,7 +96,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow, M
             final Provider<SwingInputField> inputFieldProvider,
             final InputTextFramePasteActionFactory inputTextFramePasteActionFactory,
             final WindowModel owner) {
-        super(owner, owner.getCommandParser(), deps);
+        super(owner, owner.getInputModel().get().getCommandParser(), deps);
 
         serviceManager = deps.serviceManager;
         commandController = deps.commandController;
@@ -135,9 +135,10 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow, M
             final TabCompleterUtils tabCompleterUtils) {
         inputField = inputFieldProvider.get();
         inputHandler = new SwingInputHandler(serviceManager, inputField, commandController,
-                getContainer().getCommandParser(), getContainer(), tabCompleterUtils, eventBus);
+                getContainer().getInputModel().get().getCommandParser(), getContainer(),
+                tabCompleterUtils, eventBus);
         inputHandler.addValidationListener(inputField);
-        inputHandler.setTabCompleter(frameParent.getTabCompleter());
+        inputHandler.setTabCompleter(frameParent.getInputModel().get().getTabCompleter());
 
         initPopupMenu();
         nickPopup = new JPopupMenu();

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/InputTextFramePasteAction.java

@@ -137,13 +137,15 @@ public final class InputTextFramePasteAction extends AbstractAction {
             final Integer pasteTrigger = container.getConfigManager().
                     getOptionInt("ui", "pasteProtectionLimit", false);
             //check whether the number of lines is over the limit
-            if (pasteTrigger != null && container.getNumLines(text) > pasteTrigger) {
+            if (pasteTrigger != null && container.getInputModel().get().getNumLines(text) >
+                    pasteTrigger) {
                 //show the multi line paste dialog
                 pasteDialogFactory.getPasteDialog(inputFrame, text, window).displayOrRequestFocus();
             } else {
                 //send the lines
                 for (final String clipboardLine : clipboardLines) {
-                    inputFrame.getContainer().sendLine(clipboardLine);
+                    inputFrame.getContainer().getInputModel()
+                            .ifPresent(im -> im.sendLine(clipboardLine));
                 }
             }
         } else {

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java

@@ -125,10 +125,11 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
         topicText.setRows(5);
         topicText.setColumns(30);
         final SwingInputHandler handler = new SwingInputHandler(serviceManager, topicText,
-                commandController, groupChat.getWindowModel().getCommandParser(),
+                commandController,
+                groupChat.getWindowModel().getInputModel().get().getCommandParser(),
                 channelWindow.getContainer(), tabCompleterUtils, groupChat.getEventBus());
         handler.setTypes(true, false, true, false);
-        handler.setTabCompleter(groupChat.getWindowModel().getTabCompleter());
+        handler.setTabCompleter(groupChat.getWindowModel().getInputModel().get().getTabCompleter());
 
         topicText.getActionMap().put("paste-from-clipboard",
                 new ReplacePasteAction(clipboard, "(\r\n|\n|\r)", " "));

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java

@@ -147,14 +147,14 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
         setResizable(false);
 
         infoLabel.setText("This will be sent as "
-                + parent.getContainer().getNumLines(textField.getText())
+                + parent.getContainer().getInputModel().get().getNumLines(textField.getText())
                 + " lines. Are you sure you want to continue?");
 
         textField.setColumns(50);
         textField.setRows(10);
 
         new SwingInputHandler(serviceManager, textField, commandController,
-                parent.getContainer().getCommandParser(),
+                parent.getContainer().getInputModel().get().getCommandParser(),
                 parent.getContainer(), tabCompleterUtils, eventBus)
                 .setTypes(false, false, true,false);
 
@@ -218,7 +218,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
                         Integer.MAX_VALUE);
                 for (final String line : lines) {
                     if (!line.isEmpty()) {
-                        parent.getContainer().sendLine(line);
+                        parent.getContainer().getInputModel().ifPresent(im -> im.sendLine(line));
                         parent.getInputHandler().addToBuffer(line);
                     }
                 }
@@ -229,7 +229,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
             setResizable(true);
             scrollPane.setVisible(true);
             infoLabel.setText("This will be sent as "
-                    + parent.getContainer().getNumLines(textField.getText())
+                    + parent.getContainer().getInputModel().get().getNumLines(textField.getText())
                     + " lines.");
             setResizable(true);
             pack();
@@ -242,7 +242,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
     @Override
     public void keyTyped(final KeyEvent e) {
         infoLabel.setText("This will be sent as "
-                + parent.getContainer().getNumLines(textField.getText())
+                + parent.getContainer().getInputModel().get().getNumLines(textField.getText())
                 + " lines.");
     }
 

ui_web2/src/com/dmdirc/addons/ui_web2/serialisers/WindowModelSerialiser.java

@@ -53,7 +53,7 @@ public class WindowModelSerialiser implements JsonSerializer<WindowModel> {
         res.addProperty("name", src.getName());
         res.addProperty("icon", src.getIcon());
         res.addProperty("title", src.getTitle());
-        res.addProperty("writable", src.isWritable());
+        res.addProperty("writable", src.getInputModel().isPresent());
         res.add("children", context.serialize(windowManager.getChildren(src)));
         res.add("components", context.serialize(src.getComponents()));
         res.add("backbuffer", context.serialize(src.getBackBuffer()));