Fixes issue 3890

Rework selection behaviour in the inputfield and the textpane.

Change-Id: Ie6cec6c1885124ba3e96b549fdfb86fcf76edcf5
Reviewed-on: http://gerrit.dmdirc.com/1013
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/ui_swing/actions/TextPaneCopyAction.java → src/com/dmdirc/addons/ui_swing/actions/InputFieldCopyAction.java

@@ -27,46 +27,51 @@ import com.dmdirc.addons.ui_swing.textpane.TextPane;
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
+import javax.swing.JTextField;
 
 /**
  * Textpane Copy action.
  */
-public final class TextPaneCopyAction extends AbstractAction { 
-    
+public final class InputFieldCopyAction extends AbstractAction {
+
     /**
      * 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 = 1;
-    
+
     /** Text component to be acted upon. */
-    private final TextPane comp; 
- 
-    /** 
+    private final TextPane textPane;
+    /** Input field to be acted upon. */
+    private final JTextField inputField;
+
+    /**
      * Instantiates a new copy action.
-     * 
-     * @param comp TextPane to be acted upon
+     *
+     * @param textPane TextPane to be acted upon
+     * @param inputField Inputfield to be acted upon
      */
-    public TextPaneCopyAction(final TextPane comp) { 
-        super("Copy"); 
-        
-        this.comp = comp; 
-    } 
- 
-    /** 
+    public InputFieldCopyAction(final TextPane textPane,
+            final JTextField inputField) {
+        super("Copy");
+
+        this.textPane = textPane;
+        this.inputField = inputField;
+    }
+
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Action event
      */
     @Override
-    public void actionPerformed(final ActionEvent e) { 
-        comp.copy(); 
-    } 
- 
-    /** {@inheritDoc} */
-    @Override
-    public boolean isEnabled() { 
-        return comp.isEnabled() && comp.hasSelectedRange();
-    } 
-} 
+    public void actionPerformed(final ActionEvent e) {
+        final String inputSelected = inputField.getSelectedText();
+        if (inputSelected != null && !inputSelected.isEmpty()) {
+            inputField.copy();
+        } else if (textPane.hasSelectedRange()) {
+            textPane.copy();
+        }
+    }
+}

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

@@ -51,6 +51,7 @@ import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
+import javax.swing.JTextField;
 import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 import javax.swing.event.DocumentEvent;
@@ -291,6 +292,15 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
         searchBox.checkError();
     }
 
+    /**
+     * Returns the textfield used in this search bar.
+     *
+     * @return Search textfield
+     */
+    public JTextField getTextField() {
+        return searchBox.getTextField();
+    }
+
     /**
      * {@inheritDoc}.
      *

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

@@ -53,8 +53,6 @@ public class CustomFrame extends TextFrame {
         super(owner, controller);
 
         initComponents();
-
-        addKeyListener(this);
     }
 
     /**

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

@@ -40,6 +40,7 @@ import com.dmdirc.addons.ui_swing.actions.CutAction;
 import com.dmdirc.addons.ui_swing.actions.InputTextFramePasteAction;
 import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialog;
 import com.dmdirc.addons.ui_swing.actions.CommandAction;
+import com.dmdirc.addons.ui_swing.actions.InputFieldCopyAction;
 import com.dmdirc.addons.ui_swing.components.SwingInputField;
 
 import java.awt.BorderLayout;
@@ -47,6 +48,7 @@ import java.awt.Point;
 import java.awt.Toolkit;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.UnsupportedFlavorException;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.io.IOException;
 
@@ -120,6 +122,12 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
         if (getContainer().getServer() != null) {
             getContainer().getServer().addAwayStateListener(this);
         }
+
+        getInputField().getTextField().getInputMap().put(KeyStroke.getKeyStroke(
+                KeyEvent.VK_C, UIUtilities.getCtrlMask()), "textpaneCopy");
+        getInputField().getTextField().getActionMap().put("textpaneCopy",
+                new InputFieldCopyAction(getTextPane(),
+                getInputField().getTextField()));
     }
 
     /** {@inheritDoc} */
@@ -147,7 +155,6 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
     private void initComponents() {
         setInputField(new SwingInputField(getController().getMainFrame()));
 
-        getInputField().addKeyListener(this);
         getInputField().addMouseListener(this);
 
         initPopupMenu();

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

@@ -30,14 +30,15 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.ChannelCopyAction;
 import com.dmdirc.addons.ui_swing.actions.CommandAction;
 import com.dmdirc.addons.ui_swing.actions.HyperlinkCopyAction;
+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.actions.TextPaneCopyAction;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.SwingSearchBar;
 import com.dmdirc.addons.ui_swing.textpane.ClickType;
 import com.dmdirc.addons.ui_swing.textpane.LineInfo;
 import com.dmdirc.addons.ui_swing.textpane.TextPane;
+import com.dmdirc.addons.ui_swing.textpane.TextPaneCopyAction;
 import com.dmdirc.addons.ui_swing.textpane.TextPanePageDownAction;
 import com.dmdirc.addons.ui_swing.textpane.TextPanePageUpAction;
 import com.dmdirc.addons.ui_swing.textpane.TextPaneHomeAction;
@@ -65,7 +66,6 @@ import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Point;
 import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.beans.PropertyChangeEvent;
@@ -104,8 +104,8 @@ import net.miginfocom.swing.MigLayout;
  * Implements a generic (internal) frame.
  */
 public abstract class TextFrame extends JInternalFrame implements Window,
-        PropertyChangeListener, InternalFrameListener,
-        MouseListener, KeyListener, ConfigChangeListener, FrameInfoListener {
+        PropertyChangeListener, InternalFrameListener, MouseListener,
+        ConfigChangeListener, FrameInfoListener {
 
     /** Logger to use. */
     private static final java.util.logging.Logger LOGGER =
@@ -126,8 +126,6 @@ public abstract class TextFrame extends JInternalFrame implements Window,
     private StringTranscoder transcoder;
     /** Frame buffer size. */
     private int frameBufferSize;
-    /** Quick copy? */
-    private boolean quickCopy;
     /** Are we closing? */
     private boolean closing = false;
     /** Input window for popup commands. */
@@ -164,7 +162,6 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
         final ConfigManager config = owner.getConfigManager();
         frameBufferSize = config.getOptionInt("ui", "frameBufferSize");
-        quickCopy = config.getOptionBool("ui", "quickCopy");
 
         setFrameIcon(IconManager.getIconManager().getIcon(owner.getIcon()));
 
@@ -206,7 +203,6 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
         config.addChangeListener("ui", "foregroundcolour", this);
         config.addChangeListener("ui", "backgroundcolour", this);
-        config.addChangeListener("ui", "quickCopy", this);
         config.addChangeListener("ui", "frameBufferSize", this);
 
         addPropertyChangeListener("maximum", this);
@@ -519,11 +515,9 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         setTextPane(new TextPane(this));
 
         getTextPane().addMouseListener(this);
-        getTextPane().addKeyListener(this);
 
         searchBar = new SwingSearchBar(this, controller.getMainFrame());
         searchBar.setVisible(false);
-        searchBar.addKeyListener(this);
 
         getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
                 put(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, 0),
@@ -548,6 +542,12 @@ public abstract class TextFrame extends JInternalFrame implements Window,
                 put(KeyStroke.getKeyStroke(KeyEvent.VK_END,
                 UIUtilities.getCtrlDownMask()), "endAction");
 
+        getSearchBar().getTextField().getInputMap().put(KeyStroke.getKeyStroke(
+                KeyEvent.VK_C, UIUtilities.getCtrlMask()), "textpaneCopy");
+        getSearchBar().getTextField().getActionMap().put("textpaneCopy",
+                new InputFieldCopyAction(getTextPane(),
+                getSearchBar().getTextField()));
+
         getActionMap().put("pageUpAction",
                 new TextPanePageUpAction(getTextPane()));
         getActionMap().put("pageDownAction",
@@ -856,11 +856,6 @@ public abstract class TextFrame extends JInternalFrame implements Window,
      */
     @Override
     public void mouseReleased(final MouseEvent mouseEvent) {
-        if (quickCopy && mouseEvent.getSource() == getTextPane()) {
-            getTextPane().copy();
-            getTextPane().clearSelection();
-        }
-
         processMouseClickEvent(mouseEvent, MouseClickType.RELEASED);
     }
 
@@ -1121,41 +1116,6 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         return menu;
     }
 
-    /** 
-     * {@inheritDoc}
-     * 
-     * @param event Key event
-     */
-    @Override
-    public void keyTyped(final KeyEvent event) {
-        //Ignore.
-        }
-
-    /** 
-     * {@inheritDoc}
-     * 
-     * @param event Key event
-     */
-    @Override
-    public void keyPressed(final KeyEvent event) {
-        if (!quickCopy && (event.getModifiers() & UIUtilities.getCtrlMask()) !=
-                0 &&
-                event.getKeyCode() == KeyEvent.VK_C) {
-            getTextPane().copy();
-        }
-
-    }
-
-    /** 
-     * {@inheritDoc}
-     * 
-     * @param event Key event
-     */
-    @Override
-    public void keyReleased(final KeyEvent event) {
-        //Ignore.
-        }
-
     /**
      * Gets the search bar.
      *
@@ -1183,9 +1143,6 @@ public abstract class TextFrame extends JInternalFrame implements Window,
             } else if ("frameBufferSize".equals(key)) {
                 frameBufferSize = getContainer().getConfigManager().
                         getOptionInt("ui", "frameBufferSize");
-            } else if ("quickCopy".equals(key)) {
-                quickCopy = getContainer().getConfigManager().
-                        getOptionBool("ui", "quickCopy");
             }
         }
     }

src/com/dmdirc/addons/ui_swing/textpane/TextPaneCanvas.java

@@ -99,6 +99,8 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
     private String domain;
     /** Background image option. */
     private BackgroundOption backgroundOption;
+    /** Quick copy? */
+    private boolean quickCopy;
 
     /**
      * Creates a new text pane canvas.
@@ -124,6 +126,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
         addComponentListener(this);
         manager.addChangeListener(domain, "textpanebackground", this);
         manager.addChangeListener(domain, "textpanebackgroundoption", this);
+        manager.addChangeListener("ui", "quickCopy", this);
 
         updateCachedSettings();
     }
@@ -181,6 +184,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
         } catch (IllegalArgumentException ex) {
             backgroundOption = BackgroundOption.CENTER;
         }
+        quickCopy = manager.getOptionBool("ui", "quickCopy");
     }
 
     private void paintOntoGraphics(final Graphics2D g) {
@@ -464,15 +468,19 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
                 selection.setEndLine(lineInfo.getLine());
                 selection.setStartPos(start);
                 selection.setEndPos(end);
-                textPane.copy();
-                textPane.clearSelection();
+                if (quickCopy) {
+                    textPane.copy();
+                    clearSelection();
+                }
             } else if (e.getClickCount() == 3) {
                 selection.setStartLine(lineInfo.getLine());
                 selection.setEndLine(lineInfo.getLine());
                 selection.setStartPos(0);
                 selection.setEndPos(clickedText.length());
-                textPane.copy();
-                textPane.clearSelection();
+                if (quickCopy) {
+                    textPane.copy();
+                    clearSelection();
+                }
             }
         }
 
@@ -632,6 +640,17 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      */
     @Override
     public void mouseReleased(final MouseEvent e) {
+        if (quickCopy) {
+            textPane.copy();
+            SwingUtilities.invokeLater(new Runnable() {
+
+                /** {@inheritDoc} */
+                @Override
+                public void run() {
+                    clearSelection();
+                }
+            });
+        }
         if (e.getButton() == MouseEvent.BUTTON1) {
             highlightEvent(MouseEventType.RELEASE, e);
         }