Removes some uses of deprecated methods

Change-Id: I22de49ab4ce11af7647d2cdaadb894ac7a0291ef
Reviewed-on: http://gerrit.dmdirc.com/1196
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

src/com/dmdirc/addons/tabcompletion_bash/BashStyle.java

@@ -92,7 +92,7 @@ public class BashStyle implements TabCompletionStyle {
             
             final String sub = res.getBestSubstring();
             if (sub.equalsIgnoreCase(word) && tabCount >= 2) {
-                window.addLine("tabCompletion", res.toString());
+                window.getContainer().addLine("tabCompletion", res.toString());
                 
                 return null;
             } else {

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

@@ -72,32 +72,57 @@ public final class DummyController extends Plugin implements UIController {
         return new DummyStatusBar();
     }
        
-    /** {@inheritDoc} */
-    @Override
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Controllers should listen for window events using a
+     * {@link FrameListener} and create windows as needed.
+     */
+    @Override  @Deprecated
     public ChannelWindow getChannel(final Channel channel) {
         return new DummyChannelWindow(channel);
     }
     
-    /** {@inheritDoc} */
-    @Override
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Controllers should listen for window events using a
+     * {@link FrameListener} and create windows as needed.
+     */
+    @Override  @Deprecated
     public ServerWindow getServer(final Server server) {
         return new DummyServerWindow(server);
     }
     
-    /** {@inheritDoc} */
-    @Override
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Controllers should listen for window events using a
+     * {@link FrameListener} and create windows as needed.
+     */
+    @Override  @Deprecated
     public QueryWindow getQuery(final Query query) {
         return new DummyQueryWindow(query);
     }
     
-    /** {@inheritDoc} */
-    @Override
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Controllers should listen for window events using a
+     * {@link FrameListener} and create windows as needed.
+     */
+    @Override  @Deprecated
     public Window getWindow(final FrameContainer<?> owner) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
     
-    /** {@inheritDoc} */
-    @Override
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Controllers should listen for window events using a
+     * {@link FrameListener} and create windows as needed.
+     */
+    @Override  @Deprecated
     public InputWindow getInputWindow(final WritableFrameContainer<?> owner) {
         return new DummyInputWindow(owner, owner.getCommandParser());
     }

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

@@ -207,6 +207,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
      * @return This frame's container.
      */
     @Override
+    @SuppressWarnings("unchecked")
     public WritableFrameContainer<? extends InputWindow> getContainer() {
         return (WritableFrameContainer<? extends InputWindow>) super.getContainer();
     }
@@ -263,6 +264,8 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
      * Sets the away indicator on or off.
      *
      * @param awayState away state
+     *
+     * @deprecated Use {@link AwayStateListener}s to listen for changes instead
      */
     @Override
     @Deprecated
@@ -400,8 +403,8 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
             final String text = inputFieldText.substring(0, caretPosition)
                     + clipboard + inputFieldText.substring(caretPosition);
             //check the limit
-            final Integer pasteTrigger = getConfigManager().getOptionInt("ui",
-                    "pasteProtectionLimit");
+            final Integer pasteTrigger = getContainer().getConfigManager()
+                    .getOptionInt("ui", "pasteProtectionLimit");
             //check whether the number of lines is over the limit
             if (pasteTrigger != null && getContainer().getNumLines(text)
                     > pasteTrigger) {
@@ -436,29 +439,29 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
     public void configChanged(final String domain, final String key) {
         super.configChanged(domain, key);
 
-        if ("ui".equals(domain) && getConfigManager() != null) {
+        if ("ui".equals(domain) && getContainer().getConfigManager() != null) {
             if (getInputField() != null) {
                 if ("inputbackgroundcolour".equals(key) || "backgroundcolour".
                         equals(key)) {
-                    getInputField().setBackground(getConfigManager().
-                            getOptionColour(
+                    getInputField().setBackground(getContainer()
+                            .getConfigManager().getOptionColour(
                             "ui", "inputbackgroundcolour",
                             "ui", "backgroundcolour"));
                 } else if ("inputforegroundcolour".equals(key) || "foregroundcolour".
                         equals(key)) {
-                    getInputField().setForeground(getConfigManager().
-                            getOptionColour(
+                    getInputField().setForeground(getContainer()
+                            .getConfigManager().getOptionColour(
                             "ui", "inputforegroundcolour",
                             "ui", "foregroundcolour"));
-                    getInputField().setCaretColor(getConfigManager().
-                            getOptionColour(
+                    getInputField().setCaretColor(getContainer()
+                            .getConfigManager().getOptionColour(
                             "ui", "inputforegroundcolour",
                             "ui", "foregroundcolour"));
                 }
             }
             if ("awayindicator".equals(key)) {
-                useAwayIndicator = getConfigManager().getOptionBool("ui",
-                        "awayindicator");
+                useAwayIndicator = getContainer().getConfigManager()
+                        .getOptionBool("ui", "awayindicator");
             }
         }
     }
@@ -470,7 +473,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
      */
     protected final void popuplateNicklistPopup(final String nickname) {
         final PopupMenu popups = PopupManager.getMenu(PopupType.CHAN_NICK,
-                getConfigManager());
+                getContainer().getConfigManager());
 
         nickPopup = (JPopupMenu) populatePopupMenu(new JPopupMenu(), popups,
                 nickname);

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

@@ -146,7 +146,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         final ConfigManager config = owner.getConfigManager();
 
         setFrameIcon(IconManager.getIconManager().getIcon(owner.getIcon()));
-        setTitle(frameParent.getTitle());
+        getContainer().setTitle(frameParent.getTitle());
 
         owner.addFrameInfoListener(this);
 
@@ -164,7 +164,8 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         inputWindow = this;
         while (!(inputWindow instanceof InputWindow) && inputWindow != null
                 && inputWindow.getContainer().getParent() != null) {
-            inputWindow = inputWindow.getContainer().getParent().getFrame();
+            inputWindow = controller.getWindowFactory().getSwingWindow(
+                    inputWindow.getContainer().getParent());
         }
 
         initComponents();
@@ -202,7 +203,11 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         return panel;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     * 
+     * @deprecated Should use {@link FrameContainer#setTitle(java.lang.String)}
+     */
     @Override
     @Deprecated
     public void setTitle(final String title) {
@@ -216,6 +221,17 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         });
     }
 
+    /**
+     * {@inheritDoc}
+     * 
+     * @deprecated Use {@link FrameContainer#getTitle()} instead
+     */
+    @Override
+    @Deprecated
+    public String getTitle() {
+        return super.getTitle();
+    }
+
     /** {@inheritDoc} */
     @Override
     public void setVisible(final boolean isVisible) {
@@ -617,15 +633,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
      */
     @Override
     public void internalFrameOpened(final InternalFrameEvent event) {
-        new LoggingSwingWorker() {
-
-            /** {@inheritDoc} */
-            @Override
-            protected Object doInBackground() throws Exception {
-                frameParent.windowOpened();
-                return null;
-            }
-        }.execute();
+        //Ignore
     }
 
     /**
@@ -717,15 +725,6 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         if (maximiseRestoreInProgress.get()) {
             return;
         }
-        new LoggingSwingWorker() {
-
-            /** {@inheritDoc} */
-            @Override
-            protected Object doInBackground() throws Exception {
-                frameParent.windowDeactivated();
-                return null;
-            }
-        }.execute();
     }
 
     /** {@inheritDoc} */
@@ -734,7 +733,11 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         return frameParent;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     * 
+     * @deprecated Use {@link FrameContainer#getConfigManager()}
+     */
     @Deprecated
     @Override
     public ConfigManager getConfigManager() {

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonPanel.java

@@ -38,6 +38,12 @@ import net.miginfocom.swing.MigLayout;
  */
 public class ButtonPanel extends JPanel implements Scrollable {
 
+    /**
+     * 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;
     /** The ButtonBar that created this Panel. */
     private ButtonBar buttonBar;
 

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/FrameToggleButton.java

@@ -35,6 +35,12 @@ import javax.swing.JToggleButton;
  */
 public class FrameToggleButton extends JToggleButton {
 
+    /**
+     * 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;
     /** Contains the window associated with this button. */
     private final Window window;
 

src/com/dmdirc/addons/ui_web/DynamicRequestHandler.java

@@ -273,8 +273,9 @@ public class DynamicRequestHandler extends AbstractHandler {
 
         nickEvents.add(new Event("clearnicklist", false));
 
-        for (ChannelClientInfo cci : ((WebChannelWindow) WebInterfaceUI.active)
-                .getChannel().getChannelInfo().getChannelClients()) {
+        for (ChannelClientInfo cci : ((Channel) ((WebChannelWindow)
+                WebInterfaceUI.active).getContainer()).getChannelInfo()
+                .getChannelClients()) {
             nickEvents.add(new Event("addnicklist",
                     cci.getClient().getNickname()));
         }

src/com/dmdirc/addons/ui_web/WebInterfaceUI.java

@@ -134,32 +134,57 @@ public class WebInterfaceUI implements UIController {
         return new WebStatusBar();
     }
 
-    /** {@inheritDoc} */
-    @Override
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Controllers should listen for window events using a
+     * {@link FrameListener} and create windows as needed.
+     */
+    @Override @Deprecated
     public ChannelWindow getChannel(final Channel channel) {
         return new WebChannelWindow(channel);
     }
 
-    /** {@inheritDoc} */
-    @Override
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Controllers should listen for window events using a
+     * {@link FrameListener} and create windows as needed.
+     */
+    @Override @Deprecated
     public ServerWindow getServer(final Server server) {
         return new WebServerWindow(server);
     }
 
-    /** {@inheritDoc} */
-    @Override
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Controllers should listen for window events using a
+     * {@link FrameListener} and create windows as needed.
+     */
+    @Override @Deprecated
     public QueryWindow getQuery(final Query query) {
         return new WebQueryWindow(query);
     }
 
-    /** {@inheritDoc} */
-    @Override
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Controllers should listen for window events using a
+     * {@link FrameListener} and create windows as needed.
+     */
+    @Override @Deprecated
     public Window getWindow(final FrameContainer<?> owner) {
         return new WebWindow(owner);
     }
 
-    /** {@inheritDoc} */
-    @Override
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Controllers should listen for window events using a
+     * {@link FrameListener} and create windows as needed.
+     */
+    @Override @Deprecated
     public InputWindow getInputWindow(final WritableFrameContainer<?> owner) {
         return new WebInputWindow(owner, owner.getCommandParser());
     }
@@ -205,13 +230,21 @@ public class WebInterfaceUI implements UIController {
         // Do nothing
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     * 
+     * @deprecated Use {@link WindowManager#getActiveWindow()} instead
+     */
     @Override @Deprecated
     public Window getActiveWindow() {
         return active;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     * 
+     * @deprecated Use {@link WindowManager#getActiveWindow()} instead
+     */
     @Override @Deprecated
     public Server getActiveServer() {
         //TODO FIXME

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

@@ -70,8 +70,13 @@ public class WebChannelWindow extends WebInputWindow implements ChannelWindow {
         }
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Use {@link #getContainer()}
+     */
     @Override
+    @Deprecated
     public Channel getChannel() {
         return channel;
     }