Tab completion works in topic bar and topic tab in CSD

Change-Id: Ia8a8173f67a7d9f423407f82b2a3c776e87b077e
Reviewed-on: http://gerrit.dmdirc.com/323
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>

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

@@ -128,13 +128,15 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
     /** {@inheritDoc} */
     @Override
     protected void addTabHandler() {
-        JTextComponent localTarget = null;
+        final JTextComponent localTarget;
         if (target instanceof JTextComponent) {
             localTarget = (JTextComponent) target;
         } else if (target instanceof SwingInputField) {
             localTarget = ((SwingInputField) target).getTextField();
+        } else {
+            throw new IllegalArgumentException("Unknown target");
         }
-        localTarget.getActionMap().put("tabPressed", new AbstractAction() {
+        localTarget.getActionMap().put("insert-tab", new AbstractAction() {
 
             /**
              * A version number for this class. It should be changed whenever the class
@@ -151,7 +153,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
                     /** {@inheritDoc} */
                     @Override
                     protected Object doInBackground() throws Exception {
-                        ((JTextField) e.getSource()).setEditable(false);
+                        localTarget.setEditable(false);
                         doTabCompletion();
                         return null;
                     }
@@ -159,13 +161,13 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
                     /** {@inheritDoc} */
                     @Override
                     protected void done() {
-                        ((JTextField) e.getSource()).setEditable(true);
+                        localTarget.setEditable(true);
                     }
                 }.execute();
             }
         });
         localTarget.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
-                put(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, 0), "tabPressed");
+                put(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, 0), "insert-tab");
     }
 
     /** {@inheritDoc} */

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

@@ -47,6 +47,7 @@ public class TextPaneInputField extends JEditorPane implements InputField {
     /** Colour picker. */
     protected ColourPickerDialog colourPicker;
 
+    /** {@inheritDoc} */
     @Override
     public void showColourPicker(boolean irc, boolean hex) {
         if (IdentityManager.getGlobalConfig().getOptionBool("general",
@@ -73,6 +74,7 @@ public class TextPaneInputField extends JEditorPane implements InputField {
         }
     }
 
+    /** {@inheritDoc} */
     @Override
     public void hideColourPicker() {
         if (colourPicker != null) {
@@ -81,11 +83,13 @@ public class TextPaneInputField extends JEditorPane implements InputField {
         }
     }
 
+    /** {@inheritDoc} */
     @Override
     public void addActionListener(ActionListener listener) {
         //Ignore
     }
 
+    /** {@inheritDoc} */
     @Override
     public void removeActionListener(ActionListener listener) {
         //Ignore

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

@@ -139,8 +139,10 @@ public class TopicBar extends JComponent implements ActionListener,
                 getIcon("close"), IconManager.getIconManager().
                 getIcon("close-active"));
 
-        new SwingInputHandler(topicText, channelFrame.getCommandParser(),
-                channelFrame).setTypes(false, false, true, false);
+        final SwingInputHandler handler = new SwingInputHandler(topicText,
+                channelFrame.getCommandParser(), channelFrame);
+        handler.setTypes(true, false, true, false);
+        handler.setTabCompleter(channel.getTabCompleter());
 
         final JScrollPane sp = new JScrollPane(topicText);
         sp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);

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

@@ -101,10 +101,12 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
         topicText.setWrapStyleWord(true);
         topicText.setRows(5);
         topicText.setColumns(30);
-        new SwingInputHandler(topicText, channel.getFrame().getCommandParser(),
-                channel.getFrame()).setTypes(false, false, true, false);
+        final SwingInputHandler handler = new SwingInputHandler(topicText,
+                channel.getFrame().getCommandParser(), channel.getFrame());
+        handler.setTypes(true, false, true, false);
+        handler.setTabCompleter(channel.getTabCompleter());
 
-        topicText.getActionMap().put("paste-from-clipboard",
+        topicText.getActionMap().put("paste-from-clipboard",    
                     new NoNewlinesPasteAction());
         topicText.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 
                 0), new TopicEnterAction(parent));