Move doPaste method out of InputTextFrame.

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

@@ -33,12 +33,9 @@ import com.dmdirc.addons.ui_swing.components.AwayLabel;
 import com.dmdirc.addons.ui_swing.components.TypingLabel;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
-import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialogFactory;
 import com.dmdirc.config.ConfigBinding;
-import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ui.InputWindow;
-import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.input.TabCompleterUtils;
@@ -46,15 +43,9 @@ import com.dmdirc.ui.input.TabCompleterUtils;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Point;
-import java.awt.Toolkit;
-import java.awt.Window;
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.io.IOException;
 
 import javax.inject.Provider;
 import javax.swing.JPanel;
@@ -70,6 +61,8 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow, M
 
     /** Serial version UID. */
     private static final long serialVersionUID = 3;
+    /** Factory to create an {@link InputTextFramePasteAction}. */
+    private final InputTextFramePasteActionFactory inputTextFramePasteActionFactory;
     /** Input field panel. */
     protected JPanel inputPanel;
     /** The InputHandler for our input field. */
@@ -84,14 +77,8 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow, M
     private AwayLabel awayLabel;
     /** Typing indicator label. */
     private TypingLabel typingLabel;
-    /** Main frame. */
-    private final Provider<Window> parentWindow;
     /** Plugin Manager. */
     private final PluginManager pluginManager;
-    /** Paste dialog factory. */
-    private final PasteDialogFactory pasteDialogFactory;
-    /** Clipboard to use for copying and pasting. */
-    private final Clipboard clipboard;
     /** The controller to use to retrieve command information. */
     private final CommandController commandController;
     /** The bus to dispatch input events on. */
@@ -107,15 +94,14 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow, M
     protected InputTextFrame(
             final TextFrameDependencies deps,
             final Provider<SwingInputField> inputFieldProvider,
+            final InputTextFramePasteActionFactory inputTextFramePasteActionFactory,
             final FrameContainer owner) {
         super(owner, owner.getCommandParser(), deps);
 
-        parentWindow = deps.mainWindow;
         pluginManager = deps.pluginManager;
-        pasteDialogFactory = deps.pasteDialog;
-        clipboard = deps.clipboard;
         commandController = deps.commandController;
         eventBus = deps.eventBus;
+        this.inputTextFramePasteActionFactory = inputTextFramePasteActionFactory;
 
         initComponents(inputFieldProvider, deps.tabCompleterUtils);
 
@@ -165,7 +151,8 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow, M
 
         inputFieldPopup.add(new CutAction(getInputField().getTextField()));
         inputFieldPopup.add(new CopyAction(getInputField().getTextField()));
-        inputFieldPopup.add(new InputTextFramePasteAction(clipboard, this));
+        inputFieldPopup.add(inputTextFramePasteActionFactory.getInputTextFramePasteAction(this,
+                inputField, getContainer()));
         inputFieldPopup.setOpaque(true);
         inputFieldPopup.setLightWeightPopupEnabled(true);
 
@@ -181,12 +168,11 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow, M
     private void initInputField() {
         UIUtilities.addUndoManager(eventBus, getInputField().getTextField());
 
-        getInputField().getActionMap().put("paste",
-                new InputTextFramePasteAction(clipboard, this));
+        getInputField().getActionMap().put("paste", inputTextFramePasteActionFactory
+                .getInputTextFramePasteAction(this, inputField, getContainer()));
         getInputField().getInputMap(WHEN_FOCUSED).put(KeyStroke.getKeyStroke(
                 "shift INSERT"), "paste");
-        getInputField().getInputMap(WHEN_FOCUSED).put(KeyStroke.getKeyStroke(
-                "ctrl V"), "paste");
+        getInputField().getInputMap(WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ctrl V"), "paste");
     }
 
     /**
@@ -250,82 +236,6 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow, M
         }
     }
 
-    /** Checks and pastes text. */
-    public void doPaste() {
-        try {
-            if (!clipboard.isDataFlavorAvailable(DataFlavor.stringFlavor)) {
-                return;
-            }
-        } catch (final IllegalStateException ex) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
-                    "Unable to past from clipboard.", ""));
-            return;
-        }
-
-        try {
-            //get the contents of the input field and combine it with the
-            //clipboard
-            doPaste((String) Toolkit.getDefaultToolkit()
-                    .getSystemClipboard().getData(DataFlavor.stringFlavor));
-        } catch (final IOException ex) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
-                    "Unable to get clipboard contents: " + ex.getMessage(), ""));
-        } catch (final UnsupportedFlavorException ex) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
-                    "Unsupported clipboard type", ""));
-        }
-    }
-
-    /**
-     * Pastes the specified content into the input area.
-     *
-     * @param clipboard The contents of the clipboard to be pasted
-     *
-     * @since 0.6.3m1
-     */
-    protected void doPaste(final String clipboard) {
-        final String inputFieldText = getInputField().getText();
-        //Get the text that would result from the paste (inputfield
-        //- selection + clipboard)
-        final String text = inputFieldText.substring(0, getInputField().
-                getSelectionStart()) + clipboard + inputFieldText.substring(
-                        getInputField().getSelectionEnd());
-        final String[] clipboardLines = getSplitLine(text);
-        //check theres something to paste
-        if (clipboardLines.length > 1) {
-            //Clear the input field
-            inputField.setText("");
-            final Integer pasteTrigger = getContainer().getConfigManager().
-                    getOptionInt("ui", "pasteProtectionLimit", false);
-            //check whether the number of lines is over the limit
-            if (pasteTrigger != null && getContainer().getNumLines(text)
-                    > pasteTrigger) {
-                //show the multi line paste dialog
-                pasteDialogFactory.getPasteDialog(this, text, parentWindow.get()).
-                        displayOrRequestFocus();
-            } else {
-                //send the lines
-                for (final String clipboardLine : clipboardLines) {
-                    getContainer().sendLine(clipboardLine);
-                }
-            }
-        } else {
-            //put clipboard text in input field
-            inputField.replaceSelection(clipboard);
-        }
-    }
-
-    /**
-     * Splits the line on all line endings.
-     *
-     * @param line Line that will be split
-     *
-     * @return Split line array
-     */
-    private String[] getSplitLine(final String line) {
-        return line.replace("\r\n", "\n").replace('\r', '\n').split("\n");
-    }
-
     @ConfigBinding(domain="ui", key="inputbackgroundcolour",
             fallbacks = {"ui", "backgroundcolour"}, invocation = EDTInvocation.class)
     public void handleInputBackgroundColour(final String value) {

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

@@ -22,9 +22,21 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
+import com.dmdirc.DMDircMBassador;
+import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
+import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialogFactory;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
+import com.dmdirc.events.UserErrorEvent;
+import com.dmdirc.logger.ErrorLevel;
+
+import java.awt.Toolkit;
+import java.awt.Window;
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.event.ActionEvent;
+import java.io.IOException;
 
 import javax.swing.AbstractAction;
 
@@ -39,6 +51,16 @@ public final class InputTextFramePasteAction extends AbstractAction {
     private final Clipboard clipboard;
     /** Text component to be acted upon. */
     private final InputTextFrame inputFrame;
+    /** Event bus to post events to. */
+    private final DMDircMBassador eventBus;
+    /** Swing input field. */
+    private final SwingInputField inputField;
+    /** Frame container. */
+    private final FrameContainer container;
+    /** Paste dialog factory. */
+    private final PasteDialogFactory pasteDialogFactory;
+    /** Window to parent the dialog on. */
+    private final Window window;
 
     /**
      * Instantiates a new paste action.
@@ -46,16 +68,95 @@ public final class InputTextFramePasteAction extends AbstractAction {
      * @param clipboard Clipboard to paste from
      * @param inputFrame Component to be acted upon
      */
-    public InputTextFramePasteAction(final Clipboard clipboard, final InputTextFrame inputFrame) {
+    public InputTextFramePasteAction(final InputTextFrame inputFrame,
+            final SwingInputField inputField,
+            final FrameContainer container,
+            final Clipboard clipboard,
+            final DMDircMBassador eventBus,
+            final PasteDialogFactory pasteDialogFactory,
+            @MainWindow final Window window) {
         super("Paste");
 
         this.clipboard = clipboard;
         this.inputFrame = inputFrame;
+        this.eventBus = eventBus;
+        this.inputField = inputField;
+        this.container = container;
+        this.pasteDialogFactory = pasteDialogFactory;
+        this.window = window;
     }
 
     @Override
     public void actionPerformed(final ActionEvent e) {
-        inputFrame.doPaste();
+        try {
+            if (!clipboard.isDataFlavorAvailable(DataFlavor.stringFlavor)) {
+                return;
+            }
+        } catch (final IllegalStateException ex) {
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
+                    "Unable to past from clipboard.", ""));
+            return;
+        }
+
+        try {
+            //get the contents of the input field and combine it with the
+            //clipboard
+            doPaste((String) Toolkit.getDefaultToolkit()
+                    .getSystemClipboard().getData(DataFlavor.stringFlavor));
+        } catch (final IOException ex) {
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
+                    "Unable to get clipboard contents: " + ex.getMessage(), ""));
+        } catch (final UnsupportedFlavorException ex) {
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
+                    "Unsupported clipboard type", ""));
+        }
+    }
+
+    /**
+     * Pastes the specified content into the input area.
+     *
+     * @param clipboard The contents of the clipboard to be pasted
+     *
+     * @since 0.6.3m1
+     */
+    public void doPaste(final String clipboard) {
+        final String inputFieldText = inputField.getText();
+        //Get the text that would result from the paste (inputfield
+        //- selection + clipboard)
+        final String text = inputFieldText.substring(0, inputField.getSelectionStart())
+                + clipboard + inputFieldText.substring(inputField.getSelectionEnd());
+        final String[] clipboardLines = getSplitLine(text);
+        //check theres something to paste
+        if (clipboardLines.length > 1) {
+            //Clear the input field
+            inputField.setText("");
+            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) {
+                //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);
+                }
+            }
+        } else {
+            //put clipboard text in input field
+            inputField.replaceSelection(clipboard);
+        }
+    }
+
+    /**
+     * Splits the line on all line endings.
+     *
+     * @param line Line that will be split
+     *
+     * @return Split line array
+     */
+    private String[] getSplitLine(final String line) {
+        return line.replace("\r\n", "\n").replace('\r', '\n').split("\n");
     }
 
     @Override

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

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2006-2014 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.ui_swing.components.frames;
+
+import com.dmdirc.DMDircMBassador;
+import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
+import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialogFactory;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
+
+import java.awt.Window;
+import java.awt.datatransfer.Clipboard;
+
+import javax.inject.Inject;
+
+/**
+ * Factory to create an {@link InputTextFramePasteAction}.
+ */
+public class InputTextFramePasteActionFactory {
+
+    private final Clipboard clipboard;
+    private final DMDircMBassador eventBus;
+    private final PasteDialogFactory pasteDialogFactory;
+    private final Window window;
+
+    @Inject
+    public InputTextFramePasteActionFactory(
+            final Clipboard clipboard,
+            final DMDircMBassador eventBus,
+            final PasteDialogFactory pasteDialogFactory,
+            @MainWindow final Window window) {
+        this.clipboard = clipboard;
+        this.eventBus = eventBus;
+        this.pasteDialogFactory = pasteDialogFactory;
+        this.window = window;
+    }
+
+    public InputTextFramePasteAction getInputTextFramePasteAction(
+            final InputTextFrame inputFrame,
+            final SwingInputField inputField,
+            final FrameContainer container) {
+        return new InputTextFramePasteAction(inputFrame, inputField, container, clipboard,
+                eventBus, pasteDialogFactory, window);
+    }
+}

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.paste;
 
-import com.dmdirc.ClientModule;
+import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
 import com.dmdirc.interfaces.CommandController;
@@ -53,8 +53,8 @@ public class PasteDialogFactory {
 
     @Inject
     public PasteDialogFactory(
-            @ClientModule.GlobalConfig final IconManager iconManager,
-            @ClientModule.GlobalConfig final AggregateConfigProvider config,
+            @GlobalConfig final IconManager iconManager,
+            @GlobalConfig final AggregateConfigProvider config,
             final PluginManager pluginManager,
             final CommandController commandController,
             final DMDircMBassador eventBus,