DI the paste dialog

Change-Id: I5d4ee4e38668767bcf648efaa0f9cc1dd9a2b603
Reviewed-on: http://gerrit.dmdirc.com/3267
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.CopyAction;
 import com.dmdirc.addons.ui_swing.actions.CutAction;
@@ -33,11 +33,12 @@ 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.PasteDialog;
+import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialogFactory;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.messages.ColourManager;
 
@@ -51,6 +52,7 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.io.IOException;
 
+import javax.inject.Provider;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.KeyStroke;
@@ -65,8 +67,6 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
 
     /** Serial version UID. */
     private static final long serialVersionUID = 3;
-    /** Swing controller. */
-    private final SwingController controller;
     /** Config provider for this frame. */
     private final AggregateConfigProvider config;
     /** Colour manager for this frame. */
@@ -85,6 +85,12 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
     private AwayLabel awayLabel;
     /** Typing indicator label. */
     private TypingLabel typingLabel;
+    /** Main frame. */
+    private final Provider<MainFrame> mainFrame;
+    /** Plugin Manager. */
+    private final PluginManager pluginManager;
+    /** Paste dialog factory. */
+    private final PasteDialogFactory pasteDialogFactory;
 
     /**
      * Creates a new instance of InputFrame.
@@ -97,9 +103,11 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
             final WritableFrameContainer owner) {
         super(owner, deps);
 
-        this.controller = getController();
         this.config = owner.getConfigManager();
         this.colourManager = new ColourManager(config);
+        this.mainFrame = deps.mainFrame;
+        this.pluginManager = deps.pluginManager;
+        this.pasteDialogFactory = deps.pasteDialog;
 
         initComponents();
 
@@ -107,19 +115,19 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
             //GTK users appear to dislike choice, ignore them if they want some.
             getInputField().setBackground(UIUtilities.convertColour(
                     colourManager.getColourFromString(
-                    config.getOptionString(
-                    "ui", "inputbackgroundcolour",
-                    "ui", "backgroundcolour"), null)));
+                            config.getOptionString(
+                                    "ui", "inputbackgroundcolour",
+                                    "ui", "backgroundcolour"), null)));
             getInputField().setForeground(UIUtilities.convertColour(
                     colourManager.getColourFromString(
-                    config.getOptionString(
-                    "ui", "inputforegroundcolour",
-                    "ui", "foregroundcolour"), null)));
+                            config.getOptionString(
+                                    "ui", "inputforegroundcolour",
+                                    "ui", "foregroundcolour"), null)));
             getInputField().setCaretColor(UIUtilities.convertColour(
                     colourManager.getColourFromString(
-                    config.getOptionString(
-                    "ui", "inputforegroundcolour",
-                    "ui", "foregroundcolour"), null)));
+                            config.getOptionString(
+                                    "ui", "inputforegroundcolour",
+                                    "ui", "foregroundcolour"), null)));
         }
 
         config.addChangeListener("ui", "inputforegroundcolour", this);
@@ -132,16 +140,16 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
                 | KeyEvent.SHIFT_DOWN_MASK), "textpaneCopy");
         getInputField().getTextField().getActionMap().put("textpaneCopy",
                 new InputFieldCopyAction(getTextPane(),
-                getInputField().getTextField()));
+                        getInputField().getTextField()));
     }
 
     /**
      * Initialises the components for this frame.
      */
     private void initComponents() {
-        inputField = new SwingInputField(this, getController().getMainFrame());
-        inputHandler = new SwingInputHandler(controller.getPluginManager(),
-                inputField, getContainer().getCommandParser(), getContainer());
+        inputField = new SwingInputField(this, mainFrame.get());
+        inputHandler = new SwingInputHandler(pluginManager, inputField,
+                getContainer().getCommandParser(), getContainer());
         inputHandler.addValidationListener(inputField);
         inputHandler.setTabCompleter(((WritableFrameContainer) frameParent).
                 getTabCompleter());
@@ -331,7 +339,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
         //- selection + clipboard)
         final String text = inputFieldText.substring(0, getInputField().
                 getSelectionStart()) + clipboard + inputFieldText.substring(
-                getInputField().getSelectionEnd());
+                        getInputField().getSelectionEnd());
         final String[] clipboardLines = getSplitLine(text);
         //check theres something to paste
         if (clipboardLines.length > 1) {
@@ -343,8 +351,8 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
             if (pasteTrigger != null && getContainer().getNumLines(text)
                     > pasteTrigger) {
                 //show the multi line paste dialog
-                new PasteDialog(controller, this, text, getController()
-                        .getMainFrame()).display();
+                pasteDialogFactory.getPasteDialog(this, text, mainFrame.get()).
+                        displayOrRequestFocus();
             } else {
                 //send the lines
                 for (final String clipboardLine : clipboardLines) {
@@ -380,22 +388,22 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
                 case "backgroundcolour":
                     getInputField().setBackground(UIUtilities.convertColour(
                             colourManager.getColourFromString(
-                            config.getOptionString(
-                            "ui", "inputbackgroundcolour",
-                            "ui", "backgroundcolour"), null)));
+                                    config.getOptionString(
+                                            "ui", "inputbackgroundcolour",
+                                            "ui", "backgroundcolour"), null)));
                     break;
                 case "inputforegroundcolour":
                 case "foregroundcolour":
                     getInputField().setForeground(UIUtilities.convertColour(
                             colourManager.getColourFromString(
-                            config.getOptionString(
-                            "ui", "inputforegroundcolour",
-                            "ui", "foregroundcolour"), null)));
+                                    config.getOptionString(
+                                            "ui", "inputforegroundcolour",
+                                            "ui", "foregroundcolour"), null)));
                     getInputField().setCaretColor(UIUtilities.convertColour(
                             colourManager.getColourFromString(
-                            config.getOptionString(
-                            "ui", "inputforegroundcolour",
-                            "ui", "foregroundcolour"), null)));
+                                    config.getOptionString(
+                                            "ui", "inputforegroundcolour",
+                                            "ui", "foregroundcolour"), null)));
                     break;
             }
         }

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

@@ -36,6 +36,7 @@ import com.dmdirc.addons.ui_swing.actions.InputFieldCopyAction;
 import com.dmdirc.addons.ui_swing.actions.NicknameCopyAction;
 import com.dmdirc.addons.ui_swing.actions.SearchAction;
 import com.dmdirc.addons.ui_swing.components.SwingSearchBar;
+import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialogFactory;
 import com.dmdirc.addons.ui_swing.textpane.ClickTypeValue;
 import com.dmdirc.addons.ui_swing.textpane.MouseEventType;
 import com.dmdirc.addons.ui_swing.textpane.TextPane;
@@ -60,6 +61,7 @@ import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.parser.common.ChannelJoinRequest;
+import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.ui.messages.ColourManager;
@@ -616,6 +618,8 @@ public abstract class TextFrame extends JPanel implements Window,
         final CommandController commandController;
         final EventBus eventBus;
         final AggregateConfigProvider globalConfig;
+        final PasteDialogFactory pasteDialog;
+        final PluginManager pluginManager;
 
         @Inject
         public TextFrameDependencies(
@@ -626,6 +630,8 @@ public abstract class TextFrame extends JPanel implements Window,
                 final URLHandler urlHandler,
                 final CommandController commandController,
                 final EventBus eventBus,
+                final PasteDialogFactory pasteDialog,
+                final PluginManager pluginManager,
                 @GlobalConfig final AggregateConfigProvider globalConfig) {
             this.textPaneFactory = textPaneFactory;
             this.controller = controller;
@@ -635,6 +641,8 @@ public abstract class TextFrame extends JPanel implements Window,
             this.commandController = commandController;
             this.eventBus = eventBus;
             this.globalConfig = globalConfig;
+            this.pasteDialog = pasteDialog;
+            this.pluginManager = pluginManager;
         }
 
     }

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

@@ -22,13 +22,18 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.paste;
 
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.ui.IconManager;
+import com.dmdirc.util.annotations.factory.Factory;
+import com.dmdirc.util.annotations.factory.Unbound;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;
@@ -49,6 +54,7 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Allows the user to confirm and modify a multi-line paste.
  */
+@Factory(inject = true)
 public final class PasteDialog extends StandardDialog implements ActionListener,
         KeyListener {
 
@@ -66,26 +72,37 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
     private JButton editButton;
     /** Parent window. */
     private final Window parentWindow;
-    /** Swing controller. */
-    @Deprecated
-    private final SwingController controller;
+    /** Icon manager to retrieve icons with. */
+    private final IconManager iconManager;
+    /** Plugin Manager to retrieve tab completers with. */
+    private final PluginManager pluginManager;
+    /** Config to read settings from. */
+    private final AggregateConfigProvider config;
 
     /**
      * Creates a new instance of PreferencesDialog.
      *
-     * @param controller   Swing controller
+     * @param iconManager Icon manager to retrieve icons with
+     * @param config        Config to read settings from
+     * @param pluginManager to retrieve tab completers with
      * @param newParent    The frame that owns this dialog
      * @param text         text to show in the paste dialog
      * @param parentWindow Parent window
      */
-    public PasteDialog(final SwingController controller,
-            final InputTextFrame newParent, final String text,
-            final Window parentWindow) {
+    public PasteDialog(
+            @SuppressWarnings("qualifiers") @GlobalConfig final IconManager iconManager,
+            @SuppressWarnings("qualifiers") @GlobalConfig final AggregateConfigProvider config,
+            final PluginManager pluginManager,
+            @Unbound final InputTextFrame newParent,
+            @Unbound final String text,
+            @Unbound final Window parentWindow) {
         super(parentWindow, ModalityType.MODELESS);
 
         parent = newParent;
         this.parentWindow = parentWindow;
-        this.controller = controller;
+        this.iconManager = iconManager;
+        this.config = config;
+        this.pluginManager = pluginManager;
 
         initComponents(text);
         initListeners();
@@ -105,9 +122,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
      */
     private void initComponents(final String text) {
         scrollPane = new JScrollPane();
-        textField =
-                new TextAreaInputField(controller.getIconManager(), controller.getGlobalConfig(),
-                text);
+        textField = new TextAreaInputField(iconManager, config, text);
         editButton = new JButton("Edit");
         infoLabel = new TextLabel();
 
@@ -127,9 +142,8 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
         textField.setColumns(50);
         textField.setRows(10);
 
-        new SwingInputHandler(controller.getPluginManager(), textField,
-                parent.getContainer().getCommandParser(), parent.getContainer())
-                .setTypes(false, false, true, false);
+        new SwingInputHandler(pluginManager, textField, parent.getContainer().getCommandParser(),
+                parent.getContainer()).setTypes(false, false, true, false);
 
         scrollPane.setViewportView(textField);
         scrollPane.setVisible(false);