Remove usages of deprecated method getCommandParser from InputWindow.

Fixes issue SWINGUI-35

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

src/com/dmdirc/addons/ui_dummy/DummyInputWindow.java

@@ -63,8 +63,9 @@ public class DummyInputWindow implements InputWindow {
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public CommandParser getCommandParser() {
-        return commandParser;
+        return getContainer().getCommandParser();
     }
 
     /** {@inheritDoc} */

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

@@ -125,7 +125,7 @@ public class TopicBar extends JComponent implements ActionListener,
                 getIcon("close-active"));
 
         final SwingInputHandler handler = new SwingInputHandler(topicText,
-                channelFrame.getCommandParser(), channelFrame);
+                channelFrame.getContainer().getCommandParser(), channelFrame);
         handler.setTypes(true, false, true, false);
         handler.setTabCompleter(channel.getTabCompleter());
 

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

@@ -115,14 +115,11 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
                 .getChannelClients());
     }
 
-    /**
-     * Retrieves the command Parser for this command window.
-     *
-     * @return This window's command Parser
-     */
+    /** {@inheritDoc} */
     @Override
+    @Deprecated
     public CommandParser getCommandParser() {
-        return commandParser;
+        return getContainer().getCommandParser();
     }
 
     /** {@inheritDoc} */

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

@@ -65,6 +65,7 @@ public class CustomInputFrame extends InputTextFrame {
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     @SuppressWarnings("unchecked")
     public final CommandParser getCommandParser() {
         return ((WritableFrameContainer<? extends InputWindow>) frameParent).getCommandParser();

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

@@ -474,8 +474,9 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
             } else {
                 menu.add(
                         new JMenuItem(
-                        new CommandAction(getCommandParser(),
-                        this, menuItem.getName(), menuItem.getCommand(arguments))));
+                        new CommandAction(getContainer().getCommandParser(),
+                        this, menuItem.getName(), menuItem.getCommand(
+                        arguments))));
             }
         }
         return menu;

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

@@ -64,8 +64,9 @@ public final class QueryFrame extends InputTextFrame implements QueryWindow {
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public CommandParser getCommandParser() {
-        return commandParser;
+        return getContainer().getCommandParser();
     }
 
     /**

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

@@ -72,13 +72,11 @@ public final class ServerFrame extends InputTextFrame implements ServerWindow,
         setInputHandler(new SwingInputHandler(getInputField(), commandParser, this));
     }
 
-    /**
-     * Retrieves the command Parser for this command window.
-     * @return This window's command Parser
-     */
+    /** {@inheritDoc} */
     @Override
+    @Deprecated
     public CommandParser getCommandParser() {
-        return commandParser;
+        return getContainer().getCommandParser();
     }
 
     /**

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

@@ -79,7 +79,18 @@ import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.UnsupportedCharsetException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JInternalFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JSeparator;
+import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.WindowConstants;
 import javax.swing.event.InternalFrameEvent;
 import javax.swing.event.InternalFrameListener;
 import javax.swing.plaf.basic.BasicInternalFrameUI;
@@ -115,9 +126,9 @@ public abstract class TextFrame extends JInternalFrame implements Window,
     /** Are we closing? */
     private boolean closing = false;
     /** Command parser for popup commands. */
-    private CommandParser commandParser;
+    private final CommandParser commandParser;
     /** Swing controller. */
-    private SwingController controller;
+    private final SwingController controller;
     /** Are we maximising/restoring? */
     private AtomicBoolean maximiseRestoreInProgress = new AtomicBoolean(false);
     /** Content pane. */
@@ -161,8 +172,8 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         setResizable(true);
         setIconifiable(true);
         setFocusable(true);
-        setPreferredSize(new Dimension(controller.getMainFrame().getWidth() / 2, controller.
-                getMainFrame().getHeight() / 3));
+        setPreferredSize(new Dimension(controller.getMainFrame().getWidth() / 2,
+                controller.getMainFrame().getHeight() / 3));
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 
         addPropertyChangeListener("UI", this);
@@ -186,7 +197,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /**
      * Locate the appropriate command parser in the window heirarchy.
-     * 
+     *
      * @return Closest command parser in the tree
      */
     private CommandParser findCommandParser() {
@@ -198,7 +209,8 @@ public abstract class TextFrame extends JInternalFrame implements Window,
                     inputWindow.getContainer().getParent());
         }
         if (inputWindow instanceof InputWindow) {
-            localParser = ((InputWindow) inputWindow).getCommandParser();
+            localParser = ((InputWindow) inputWindow).getContainer()
+                    .getCommandParser();
         }
 
         if (localParser == null) {
@@ -216,7 +228,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @deprecated Should use {@link FrameContainer#setTitle(java.lang.String)}
      */
     @Override
@@ -234,7 +246,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @deprecated Use {@link FrameContainer#getTitle()} instead
      */
     @Override
@@ -353,7 +365,8 @@ public abstract class TextFrame extends JInternalFrame implements Window,
                         setIcon(true);
                     }
                 } catch (PropertyVetoException ex) {
-                    Logger.userError(ErrorLevel.LOW, "Unable to minimise frame");
+                    Logger.userError(ErrorLevel.LOW,
+                            "Unable to minimise frame");
                 }
             }
         });
@@ -385,7 +398,8 @@ public abstract class TextFrame extends JInternalFrame implements Window,
                     setMaximum(true);
                     LOGGER.finest("maximise(): Done?");
                 } catch (PropertyVetoException ex) {
-                    Logger.userError(ErrorLevel.LOW, "Unable to minimise frame");
+                    Logger.userError(ErrorLevel.LOW,
+                            "Unable to minimise frame");
                 }
                 maximiseRestoreInProgress.set(false);
 
@@ -414,7 +428,8 @@ public abstract class TextFrame extends JInternalFrame implements Window,
                     }
                     setMaximum(false);
                 } catch (PropertyVetoException ex) {
-                    Logger.userError(ErrorLevel.LOW, "Unable to minimise frame");
+                    Logger.userError(ErrorLevel.LOW,
+                            "Unable to minimise frame");
                 }
                 maximiseRestoreInProgress.set(false);
             }
@@ -440,7 +455,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @deprecated Use corresponding methods in {@link FrameContainer} instead
      */
     @Override
@@ -451,7 +466,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @deprecated Use corresponding methods in {@link FrameContainer} instead
      */
     @Override
@@ -462,19 +477,21 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @deprecated Use corresponding methods in {@link FrameContainer} instead
      */
     @Override
     @Deprecated
-    public final void addLine(final StringBuffer messageType, final Object... args) {
+    public final void addLine(final StringBuffer messageType,
+            final Object... args) {
         frameParent.addLine(messageType, args);
     }
 
     /**
      * {@inheritDoc}
-     * 
-     * @deprecated Call {@link IRCDocument#clear()} via {@link FrameContainer#getDocument()}
+     *
+     * @deprecated Call {@link IRCDocument#clear()} via
+     * {@link FrameContainer#getDocument()}
      */
     @Override
     @Deprecated
@@ -542,13 +559,14 @@ public abstract class TextFrame extends JInternalFrame implements Window,
     /**
      * Removes and reinserts the border of an internal frame on maximising.
      * {@inheritDoc}
-     * 
+     *
      * @param event Property change event
      */
     @Override
     public final void propertyChange(final PropertyChangeEvent event) {
         LOGGER.finer("Property change: name: " + event.getPropertyName()
-                + " value: " + event.getOldValue() + "->" + event.getNewValue());
+                + " value: " + event.getOldValue() + "->"
+                + event.getNewValue());
         if ("UI".equals(event.getPropertyName())) {
             if (isMaximum()) {
                 hideTitlebar();
@@ -591,7 +609,8 @@ public abstract class TextFrame extends JInternalFrame implements Window,
                 final String componentUI = (String) UIManager.get(
                         "InternalFrameUI");
 
-                if ("javax.swing.plaf.synth.SynthLookAndFeel".equals(componentUI)) {
+                if ("javax.swing.plaf.synth.SynthLookAndFeel"
+                        .equals(componentUI)) {
                     temp = SynthLookAndFeel.createUI(TextFrame.this);
                 } else {
                     try {
@@ -642,7 +661,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /**
      * Not needed for this class. {@inheritDoc}
-     * 
+     *
      * @param event Internal frame event
      */
     @Override
@@ -652,7 +671,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /**
      * Not needed for this class. {@inheritDoc}
-     * 
+     *
      * @param event Internal frame event
      */
     @Override
@@ -670,7 +689,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /**
      * Not needed for this class. {@inheritDoc}
-     * 
+     *
      * @param event Internal frame event
      */
     @Override
@@ -680,7 +699,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /**
      * Makes the internal frame invisible. {@inheritDoc}
-     * 
+     *
      * @param event Internal frame event
      */
     @Override
@@ -696,7 +715,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /**
      * Not needed for this class. {@inheritDoc}
-     * 
+     *
      * @param event Internal frame event
      */
     @Override
@@ -706,7 +725,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /**
      * Activates the input field on frame focus. {@inheritDoc}
-     * 
+     *
      * @param event Internal frame event
      */
     @Override
@@ -731,7 +750,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /**
      * Not needed for this class. {@inheritDoc}
-     * 
+     *
      * @param event Internal frame event
      */
     @Override
@@ -749,7 +768,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @deprecated Use {@link FrameContainer#getConfigManager()}
      */
     @Deprecated
@@ -768,7 +787,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
     }
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      *
      * @deprecated Use {@link FrameContainer#getTranscoder()} instead
      */
@@ -819,7 +838,8 @@ public abstract class TextFrame extends JInternalFrame implements Window,
                     if (ActionManager.processEvent(
                             CoreActionType.LINK_URL_CLICKED, null, this,
                             clicktype.getValue())) {
-                        URLHandler.getURLHander().launchApp(clicktype.getValue());
+                        URLHandler.getURLHander().launchApp(
+                                clicktype.getValue());
                     }
                     break;
                 case NICKNAME:
@@ -839,42 +859,42 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /**
      * What popup type should be used for popup menus for nicknames
-     * 
+     *
      * @return Appropriate popuptype for this frame
      */
     public abstract PopupType getNicknamePopupType();
 
     /**
      * What popup type should be used for popup menus for channels
-     * 
+     *
      * @return Appropriate popuptype for this frame
      */
     public abstract PopupType getChannelPopupType();
 
     /**
      * What popup type should be used for popup menus for hyperlinks
-     * 
+     *
      * @return Appropriate popuptype for this frame
      */
     public abstract PopupType getHyperlinkPopupType();
 
     /**
      * What popup type should be used for popup menus for normal clicks
-     * 
+     *
      * @return Appropriate popuptype for this frame
      */
     public abstract PopupType getNormalPopupType();
 
     /**
      * A method called to add custom popup items.
-     * 
+     *
      * @param popupMenu Popup menu to add popup items to
      */
     public abstract void addCustomPopupItems(final JPopupMenu popupMenu);
 
     /**
-     * Shows a popup menu at the specified point for the specified click type
-     * 
+     * Shows a popup menu at the specified point for the specified click type.
+     *
      * @param type ClickType Click type
      * @param point Point Point of the click
      * @param argument Word under the click
@@ -885,7 +905,8 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
         switch (type.getType()) {
             case CHANNEL:
-                popupMenu = getPopupMenu(getChannelPopupType(), type.getValue());
+                popupMenu = getPopupMenu(getChannelPopupType(),
+                        type.getValue());
                 popupMenu.add(new ChannelCopyAction(type.getValue()));
                 if (popupMenu.getComponentCount() > 1) {
                     popupMenu.addSeparator();
@@ -893,7 +914,8 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
                 break;
             case HYPERLINK:
-                popupMenu = getPopupMenu(getHyperlinkPopupType(), type.getValue());
+                popupMenu = getPopupMenu(getHyperlinkPopupType(),
+                        type.getValue());
                 popupMenu.add(new HyperlinkCopyAction(type.getValue()));
                 if (popupMenu.getComponentCount() > 1) {
                     popupMenu.addSeparator();
@@ -901,7 +923,8 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
                 break;
             case NICKNAME:
-                popupMenu = getPopupMenu(getNicknamePopupType(), type.getValue());
+                popupMenu = getPopupMenu(getNicknamePopupType(),
+                        type.getValue());
                 if (popupMenu.getComponentCount() > 0) {
                     popupMenu.addSeparator();
                 }
@@ -935,10 +958,10 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /**
      * Builds a popup menu of a specified type
-     * 
+     *
      * @param type type of menu to build
      * @param arguments Arguments for the command
-     * 
+     *
      * @return PopupMenu
      */
     public JPopupMenu getPopupMenu(
@@ -956,12 +979,12 @@ public abstract class TextFrame extends JInternalFrame implements Window,
     }
 
     /**
-     * Populates the specified popupmenu
-     * 
+     * Populates the specified popupmenu.
+     *
      * @param menu Menu component
      * @param popup Popup to get info from
      * @param arguments Arguments for the command
-     * 
+     *
      * @return Populated popup
      */
     private JComponent populatePopupMenu(final JComponent menu,
@@ -1026,13 +1049,15 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /** {@inheritDoc} */
     @Override
-    public void nameChanged(final FrameContainer<?> window, final String name) {
+    public void nameChanged(final FrameContainer<?> window,
+            final String name) {
         //Ignore
     }
 
     /** {@inheritDoc} */
     @Override
-    public void titleChanged(final FrameContainer<?> window, final String title) {
+    public void titleChanged(final FrameContainer<?> window,
+            final String title) {
         UIUtilities.invokeLater(new Runnable() {
 
             /** {@inheritDoc} */

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

@@ -124,8 +124,9 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
         textField.setColumns(50);
         textField.setRows(10);
 
-        new SwingInputHandler(textField, parent.getCommandParser(), parent)
-                .setTypes(false, false, true, false);
+        new SwingInputHandler(textField, parent.getContainer()
+                .getCommandParser(), parent)
+                .setTypes(false, false, true,false);
 
         scrollPane.setViewportView(textField);
         scrollPane.setVisible(false);

src/com/dmdirc/addons/ui_web/uicomponents/WebInputWindow.java

@@ -55,8 +55,9 @@ public class WebInputWindow extends WebWindow implements InputWindow {
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public CommandParser getCommandParser() {
-        return commandparser;
+        return getContainer().getCommandParser();
     }
 
     /** {@inheritDoc} */