Fix fallout from the title change

Change-Id: I89bd5b3c39bd5e8edc6550f8f6dd04eadfa2b8b3
Reviewed-on: http://gerrit.dmdirc.com/1119
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/dcc/DCCChatWindow.java

@@ -62,7 +62,7 @@ public class DCCChatWindow extends DCCFrame implements DCCChatHandler {
         myWindow = Main.getUI().getInputWindow(this, DCCCommandParser.getDCCCommandParser());
         plugin.addWindow(this);
 
-        myWindow.setTitle(title);
+        setTitle(title);
         myWindow.open();
     }
 

src/com/dmdirc/addons/dcc/DCCFrame.java

@@ -138,7 +138,7 @@ public abstract class DCCFrame extends WritableFrameContainer {
      * @param icon The icon to use
      */
     public DCCFrame(final DCCPlugin plugin, final String title, final String icon, final boolean defaultWindow) {
-        super(icon, title, IdentityManager.getGlobalConfig());
+        super(icon, title, title, IdentityManager.getGlobalConfig());
         this.plugin = plugin;
 
         if (defaultWindow) {
@@ -148,7 +148,7 @@ public abstract class DCCFrame extends WritableFrameContainer {
                 @Override
                 public void run() {
                     final EmptyFrame frame = new EmptyFrame(DCCFrame.this);
-                    frame.setTitle(title);
+                    setTitle(title);
                     setObject(frame);
                 }
 

src/com/dmdirc/addons/dcc/DCCTransferWindow.java

@@ -292,8 +292,8 @@ public class DCCTransferWindow extends DCCFrame implements DCCTransferHandler,
             title.append(dcc.getType() == DCCTransfer.TransferType.SEND ? "Sending: " : "Recieving: ");
             title.append(otherNickname);
             title.append(" ("+ String.format("%.0f", Math.floor(percent)) +"%)");
-            this.setName(title.toString());
-            this.getFrame().setTitle(title.toString());
+            setName(title.toString());
+            setTitle(title.toString());
         }
 
         updateSpeedAndTime();

src/com/dmdirc/addons/logging/HistoryWindow.java

@@ -52,14 +52,13 @@ public class HistoryWindow extends FrameContainer {
      */
     public HistoryWindow(final String title, final ReverseFileReader reader,
                          final Window parent, final int numLines) {
-        super("raw", title, parent.getConfigManager());
+        super("raw", title, title, parent.getConfigManager());
 
         this.parent = parent;
 
         window = Main.getUI().getWindow(this);
 
         WindowManager.addWindow(parent, window);
-        window.setTitle(title);
         window.open();
         final int frameBufferSize = IdentityManager.getGlobalConfig().getOptionInt(
                 "ui", "frameBufferSize");

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

@@ -59,8 +59,6 @@ public class CustomFrame extends TextFrame {
      * Initialises components in this frame.
      */
     private void initComponents() {
-        setTitle("Custom Frame");
-
         getContentPane().setLayout(new MigLayout("ins 0, fill, hidemode 3, wrap 1"));
         getContentPane().add(getTextPane(), "grow, push");
         getContentPane().add(getSearchBar(), "growx, pushx");

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

@@ -76,8 +76,6 @@ public class CustomInputFrame extends InputTextFrame {
      * Initialises components in this frame.
      */
     private void initComponents() {
-        setTitle("Custom Input Frame");
-
         getContentPane().setLayout(new MigLayout("ins 0, fill, hidemode 3, wrap 1"));
         getContentPane().add(getTextPane(), "grow, push");
         getContentPane().add(getSearchBar(), "growx, pushx");

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

@@ -77,8 +77,6 @@ public final class QueryFrame extends InputTextFrame implements QueryWindow {
      * Initialises components in this frame.
      */
     private void initComponents() {
-        setTitle("Query Frame");
-
         getContentPane().setLayout(new MigLayout("ins 0, fill, hidemode 3, wrap 1"));
         getContentPane().add(getTextPane(), "grow, push");
         getContentPane().add(getSearchBar(), "growx, pushx");

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

@@ -89,8 +89,6 @@ public final class ServerFrame extends InputTextFrame implements ServerWindow,
         settingsMI = new JMenuItem("Settings");
         settingsMI.addActionListener(this);
 
-        setTitle("Server Frame");
-
         getContentPane().setLayout(new MigLayout("ins 0, fill, hidemode 3, wrap 1"));
         getContentPane().add(getTextPane(), "grow, push");
         getContentPane().add(getSearchBar(), "growx, pushx");

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

@@ -57,7 +57,6 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;
@@ -147,6 +146,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         final ConfigManager config = owner.getConfigManager();
 
         setFrameIcon(IconManager.getIconManager().getIcon(owner.getIcon()));
+        setTitle(frameParent.getTitle());
 
         owner.addFrameInfoListener(this);
 
@@ -163,7 +163,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
         inputWindow = this;
         while (!(inputWindow instanceof InputWindow) && inputWindow != null) {
-            inputWindow = WindowManager.getParent(inputWindow.getContainer()).getFrame();
+            inputWindow = inputWindow.getContainer().getParent().getFrame();
         }
 
         initComponents();
@@ -212,6 +212,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public void setTitle(final String title) {
         UIUtilities.invokeLater(new Runnable() {
 
@@ -738,12 +739,9 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         return textPane;
     }
 
-    /**
-     * Returns the transcoder for this frame.
-     *
-     * @return String transcoder for this frame
-     */
+    /** {@inheritDoc} */
     @Override
+    @Deprecated
     public StringTranscoder getTranscoder() {
         return transcoder;
     }
@@ -1001,4 +999,19 @@ public abstract class TextFrame extends JInternalFrame implements Window,
     public void nameChanged(final FrameContainer window, final String name) {
         //Ignore
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void titleChanged(final FrameContainer window, final String title) {
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                // TODO: Can be changed back to setTitle once the deprecated
+                // method is removed
+                TextFrame.super.setTitle(title);
+            }
+        });
+    }
 }

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

@@ -318,10 +318,15 @@ public final class ButtonBar implements FrameManager, ActionListener,
         buttons.get(window).setIcon(IconManager.getIconManager().getIcon(icon));
     }
 
-
     /** {@inheritDoc} */
     @Override
     public void nameChanged(final FrameContainer window, final String name) {
         buttons.get(window).setText(name);
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void titleChanged(final FrameContainer window, final String title) {
+        // Do nothing
+    }
 }

src/com/dmdirc/addons/ui_swing/framemanager/tree/NodeLabel.java

@@ -134,6 +134,12 @@ public class NodeLabel extends JLabel implements SelectionListener,
         }
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public void titleChanged(final FrameContainer window, final String title) {
+        // Do nothing
+    }
+
     /** 
      * Sets the rollover state for the node.
      * 

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

@@ -417,4 +417,10 @@ public final class TreeFrameManager implements FrameManager,
             }
         });
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void titleChanged(final FrameContainer window, final String title) {
+        // Do nothing
+    }
 }

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenu.java

@@ -99,6 +99,12 @@ public class FrameContainerMenu extends JMenu implements FrameInfoListener,
         });
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public void titleChanged(final FrameContainer window, final String title) {
+        // Do nothing
+    }
+
     /**
      * {@inheritDoc}
      *

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenuItem.java

@@ -100,6 +100,12 @@ public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListen
         });
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public void titleChanged(final FrameContainer window, final String title) {
+        // Do nothing
+    }
+
     /** 
      * {@inheritDoc}
      * 

test/com/dmdirc/addons/ui_swing/components/frames/InputTextFrameTest.java

@@ -89,7 +89,7 @@ public class InputTextFrameTest {
     public void tearDown() {
         window.close();
         owner.window.close();
-        WindowManager.removeWindow(owner.window);
+        WindowManager.removeWindow(owner);
     }
 
     @Test
@@ -152,11 +152,10 @@ public class InputTextFrameTest {
         final CustomInputFrame titf = new CustomInputFrame(owner,
                 GlobalCommandParser.getGlobalCommandParser(), controller);
 
-        titf.setTitle("testing123");
-
+        owner.setTitle("testing123");
         owner.window = titf;
 
-        WindowManager.addWindow(titf);
+        WindowManager.addWindow(owner);
 
         titf.open();