fixes issue 2085: ctrl+enter broken in csd/paste dialog

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

@@ -216,7 +216,8 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
         if (e.getKeyCode() != KeyEvent.VK_TAB && e.getKeyCode() !=
                 KeyEvent.VK_UP && e.getKeyCode() != KeyEvent.VK_DOWN) {
             final String line = target.getText();
-            if (UIUtilities.isCtrlDown(e) && e.getKeyCode() == KeyEvent.VK_ENTER) {
+            if (UIUtilities.isCtrlDown(e) && e.getKeyCode() == KeyEvent.VK_ENTER
+                    && (flags & HANDLE_RETURN) == HANDLE_RETURN) {
                 target.setText("");
             }
             SwingUtilities.invokeLater(new Runnable() {

src/com/dmdirc/ui/input/InputHandler.java

@@ -67,17 +67,17 @@ public abstract class InputHandler implements ConfigChangeListener {
      * Indicates that the caret should be moved to the start of a selection when
      * a control code has been inserted.
      */
-    private static final int POSITION_START = 2;
+    protected static final int POSITION_START = 2;
     /** Flag to indicate that this input handler should handle tab completion. */
-    private static final int HANDLE_TABCOMPLETION = 1;
+    protected static final int HANDLE_TABCOMPLETION = 1;
     /** Flag to indicate that this input handler should maintain a back buffer. */
-    private static final int HANDLE_BACKBUFFER = 2;
+    protected static final int HANDLE_BACKBUFFER = 2;
     /** Flag to indicate that this input handler should handle formatting. */
-    private static final int HANDLE_FORMATTING = 4;
+    protected static final int HANDLE_FORMATTING = 4;
     /** Flag to indicate that this input handler should handle returns. */
-    private static final int HANDLE_RETURN = 8;
+    protected static final int HANDLE_RETURN = 8;
     /** The flags for this particular input handler. */
-    private int flags = HANDLE_TABCOMPLETION | HANDLE_BACKBUFFER
+    protected int flags = HANDLE_TABCOMPLETION | HANDLE_BACKBUFFER
             | HANDLE_FORMATTING | HANDLE_RETURN;
     /** The input buffer. */
     protected RollingList<String> buffer;