Move InputFields into their own package.

Foundation work for Action/Alias dialogs to allow control code input.

Issue CLIENT-53

Change-Id: I2a9cc50577050120357d263f2471e8137c78eaae
Reviewed-on: http://gerrit.dmdirc.com/1535
Automatic-Compile: Greg Holmes <greg@dmdirc.com>
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.SearchAction;
+import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;

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

@@ -22,6 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
+import com.dmdirc.addons.ui_swing.components.inputfields.TextPaneInputField;
+import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.Channel;
 import com.dmdirc.Topic;
 import com.dmdirc.addons.ui_swing.SwingController;

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

@@ -31,7 +31,7 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.NickList;
 import com.dmdirc.addons.ui_swing.components.SplitPane;
-import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
+import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.components.TopicBar;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.commandparser.PopupType;

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

@@ -24,7 +24,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.components.SwingInputHandler;
+import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.interfaces.InputWindow;

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

@@ -30,7 +30,7 @@ import com.dmdirc.addons.ui_swing.actions.CopyAction;
 import com.dmdirc.addons.ui_swing.actions.CutAction;
 import com.dmdirc.addons.ui_swing.actions.InputFieldCopyAction;
 import com.dmdirc.addons.ui_swing.actions.InputTextFramePasteAction;
-import com.dmdirc.addons.ui_swing.components.SwingInputField;
+import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialog;
 import com.dmdirc.commandparser.PopupManager;
 import com.dmdirc.commandparser.PopupMenu;

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

@@ -23,7 +23,7 @@ package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.Query;
 import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
+import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.interfaces.QueryWindow;

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.components.frames;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
+import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.commandparser.parsers.CommandParser;

src/com/dmdirc/addons/ui_swing/components/SwingInputField.java → src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputField.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.components;
+package com.dmdirc.addons.ui_swing.components.inputfields;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;

src/com/dmdirc/addons/ui_swing/components/SwingInputHandler.java → src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java

@@ -20,10 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.components;
+package com.dmdirc.addons.ui_swing.components.inputfields;
 
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;

src/com/dmdirc/addons/ui_swing/components/TextAreaInputField.java → src/com/dmdirc/addons/ui_swing/components/inputfields/TextAreaInputField.java

@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.dmdirc.addons.ui_swing.components;
+package com.dmdirc.addons.ui_swing.components.inputfields;
 
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.config.IdentityManager;

src/com/dmdirc/addons/ui_swing/components/TextFieldInputField.java → src/com/dmdirc/addons/ui_swing/components/inputfields/TextFieldInputField.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.components;
+package com.dmdirc.addons.ui_swing.components.inputfields;
 
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.config.IdentityManager;

src/com/dmdirc/addons/ui_swing/components/TextPaneInputField.java → src/com/dmdirc/addons/ui_swing/components/inputfields/TextPaneInputField.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.components;
+package com.dmdirc.addons.ui_swing.components.inputfields;
 
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.config.IdentityManager;

src/com/dmdirc/addons/ui_swing/components/inputfields/ValidatingTextFieldInputField.java

@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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.inputfields;
+
+import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
+import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.ui.interfaces.InputField;
+import com.dmdirc.util.validators.Validator;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JTextField;
+import javax.swing.text.BadLocationException;
+
+/**
+ * Extended ValidatingTextField that adds Inputfield support.
+ */
+public class ValidatingTextFieldInputField extends ValidatingJTextField
+        implements InputField {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 2;
+
+    /** Colour picker. */
+    protected ColourPickerDialog colourPicker;
+
+    /**
+     * Creates a new text field with the specified validator.
+     *
+     * @param validator Validator for this textfield
+     */
+    public ValidatingTextFieldInputField(final Validator<String> validator) {
+        super(validator);
+    }
+
+    /**
+     * Creates a new text field with the specified validator.
+     *
+     * @param validator Validator for this textfield
+     * @param textField Textfield to use as a base
+     */
+    public ValidatingTextFieldInputField(final JTextField textField,
+            final Validator<String> validator) {
+        super(textField, validator);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void addActionListener(final ActionListener listener) {
+        // Ignore request - we don't handle returns for text areas
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void removeActionListener(final ActionListener listener) {
+        // Ignore request - we don't handle returns for text areas
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void showColourPicker(final boolean irc, final boolean hex) {
+        if (IdentityManager.getGlobalConfig().getOptionBool("general",
+                "showcolourdialog")) {
+            colourPicker = new ColourPickerDialog(irc, hex);
+            colourPicker.addActionListener(new ActionListener() {
+
+                @Override
+                public void actionPerformed(final ActionEvent actionEvent) {
+                    try {
+                        getDocument().insertString(getCaretPosition(),
+                                actionEvent.getActionCommand(), null);
+                    } catch (BadLocationException ex) {
+                        //Ignore, wont happen
+                    }
+                    colourPicker.dispose();
+                    colourPicker = null;
+                }
+            });
+            colourPicker.display();
+            colourPicker.setLocation((int) getLocationOnScreen().getX(),
+                    (int) getLocationOnScreen().getY() -
+                    colourPicker.getHeight());
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void hideColourPicker() {
+        if (colourPicker != null) {
+            colourPicker.dispose();
+            colourPicker = null;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getCaretPosition() {
+        return getTextField().getCaretPosition();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setCaretPosition(int position) {
+        getTextField().setCaretPosition(position);
+    }
+
+}

src/com/dmdirc/addons/ui_swing/components/performpanel/PerformPanel.java

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.components.performpanel;
 
 import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.actions.wrappers.PerformWrapper.PerformDescription;
-import com.dmdirc.addons.ui_swing.components.TextAreaInputField;
+import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
 
 import java.util.Collection;
 import java.util.Collections;

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionResponsePanel.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
 import com.dmdirc.config.IdentityManager;
 
 import java.util.TreeSet;
@@ -67,9 +68,12 @@ public class ActionResponsePanel extends JPanel {
 
     /** Initialises the components. */
     private void initComponents() {
-        response = new JTextArea();
+        response = new TextAreaInputField("");
         scrollPane = new JScrollPane(response);
         response.setRows(4);
+        //new SwingInputHandler(response, GlobalCommandParser
+        //        .getGlobalCommandParser(), inputWindow)
+        //        .setTypes(false, false, true,false);
         formatter = new JComboBox(new DefaultComboBoxModel());
 
         ((DefaultComboBoxModel) formatter.getModel()).addElement("No change");

src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasPanel.java

@@ -27,8 +27,11 @@ import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.CoreActionComponent;
 import com.dmdirc.actions.wrappers.Alias;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
+import com.dmdirc.addons.ui_swing.components.inputfields.ValidatingTextFieldInputField;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionComparisonCellRenderer;
-import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
+import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.commandparser.validators.CommandNameValidator;
 import com.dmdirc.util.validators.FileNameValidator;
 import com.dmdirc.util.validators.ValidatorChain;
@@ -60,7 +63,7 @@ public final class AliasPanel extends JPanel implements ActionListener {
      */
     private static final long serialVersionUID = 2;
     /** Name field. */
-    private final ValidatingJTextField command;
+    private final ValidatingTextFieldInputField command;
     /** argument component combo box. */
     private final JComboBox argumentComponent;
     /** Argument number spinner. */
@@ -75,9 +78,12 @@ public final class AliasPanel extends JPanel implements ActionListener {
     public AliasPanel() {
         super();
 
-        command = new ValidatingJTextField(new ValidatorChain<String>(
+        command = new ValidatingTextFieldInputField(new ValidatorChain<String>(
                 new CommandNameValidator(), new FileNameValidator()));
         command.setEnabled(false);
+        //new SwingInputHandler(command, GlobalCommandParser
+        //        .getGlobalCommandParser(), inputWindow)
+        //        .setTypes(false, false, true,false);
 
         argumentComponent = new JComboBox(new CoreActionComparison[]{null,
             CoreActionComparison.INT_GREATER, CoreActionComparison.INT_EQUALS,

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

@@ -28,8 +28,8 @@ import com.dmdirc.Topic;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.NoNewlinesPasteAction;
 import com.dmdirc.addons.ui_swing.actions.TopicEnterAction;
-import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
-import com.dmdirc.addons.ui_swing.components.TextAreaInputField;
+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.ui.interfaces.InputWindow;
 import java.awt.Color;

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

@@ -23,8 +23,8 @@
 package com.dmdirc.addons.ui_swing.dialogs.paste;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
-import com.dmdirc.addons.ui_swing.components.TextAreaInputField;
+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.frames.InputTextFrame;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;

test/com/dmdirc/addons/ui_swing/components/frames/InputTextFrameTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.harness.ui.ClassComponentMatcher;
 import com.dmdirc.harness.ui.DMDircUITestCase;
-import com.dmdirc.addons.ui_swing.components.TextAreaInputField;
+import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
 import org.junit.Test;
 import org.uispec4j.Trigger;
 import org.uispec4j.Window;