some work on issue 617

git-svn-id: http://svn.dmdirc.com/trunk@3116 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/ui/dummy/DummyMainWindow.java

@@ -54,16 +54,6 @@ public final class DummyMainWindow implements MainWindow {
         //Do nothing.
     }
     
-    /** {@inheritDoc} */
-    public void addChild(final Window window) {
-        windows.add(window);
-    }
-    
-    /** {@inheritDoc} */
-    public void delChild(final Window window) {
-        windows.add(window);
-    }
-    
     /** {@inheritDoc} */
     public void setActiveFrame(final Window frame) {
         active = frame;

src/com/dmdirc/ui/interfaces/MainWindow.java

@@ -30,20 +30,6 @@ import javax.swing.JMenuItem;
  */
 public interface MainWindow {
     
-    /**
-     * Adds the specified window as a child of the main frame.
-     *
-     * @param window the window to be added
-     */
-    void addChild(final Window window);
-    
-    /**
-     * Removes the specified window from our desktop pane.
-     *
-     * @param window The window to be removed
-     */
-    void delChild(final Window window);
-    
     /**
      * Sets the active internal frame to the one specified.
      *

src/com/dmdirc/ui/swing/MainFrame.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.ui.swing;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.IconManager;
 import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
@@ -78,7 +79,7 @@ import javax.swing.WindowConstants;
  * The main application frame.
  */
 public final class MainFrame extends JFrame implements WindowListener,
-        MainWindow, ConfigChangeListener {
+        MainWindow, ConfigChangeListener, FrameManager {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -173,42 +174,6 @@ public final class MainFrame extends JFrame implements WindowListener,
         });
     }
 
-    /** {@inheritDoc}. */
-    @Override
-    public void addChild(final Window window) {
-        final JInternalFrame frame = (JInternalFrame) window;
-
-        // Add the frame
-        desktopPane.add(frame);
-
-        // Make sure it'll fit with our offsets
-        if (frame.getWidth() + xOffset > desktopPane.getWidth()) {
-            xOffset = 0;
-        }
-        if (frame.getHeight() + yOffset > desktopPane.getHeight()) {
-            yOffset = 0;
-        }
-
-        // Position the frame
-        frame.setLocation(xOffset, yOffset);
-        frame.moveToFront();
-
-        // Increase the offsets
-        xOffset += FRAME_OPENING_OFFSET;
-        yOffset += FRAME_OPENING_OFFSET;
-    }
-
-    /** {@inheritDoc}. */
-    @Override
-    public void delChild(final Window window) {
-        if (desktopPane.getAllFrames().length == 1) {
-            setTitle(getTitlePrefix());
-        } else {
-            setActiveFrame((Window) desktopPane.selectFrame(true));
-        }
-        desktopPane.remove((JInternalFrame) window);
-    }
-
     /** {@inheritDoc}. */
     @Override
     public void setActiveFrame(final Window frame) {
@@ -391,6 +356,7 @@ public final class MainFrame extends JFrame implements WindowListener,
         frameManager.setParent(frameManagerPanel);
 
         WindowManager.addFrameManager(new CtrlTabFrameManager(desktopPane));
+        WindowManager.addFrameManager(this);
     }
 
     /**
@@ -631,4 +597,94 @@ public final class MainFrame extends JFrame implements WindowListener,
                 IdentityManager.getGlobalConfig().
                 getOptionBool("ui", "showversion", false);
     }
+
+    /** {@inheritDoc}. */
+    @Override
+    public void setParent(final JComponent parent) {
+        //Ignore
+    }
+
+    /** {@inheritDoc}. */
+    @Override
+    public boolean canPositionVertically() {
+        return true;
+    }
+
+    /** {@inheritDoc}. */
+    @Override
+    public boolean canPositionHorizontally() {
+        return true;
+    }
+
+    /** {@inheritDoc}. */
+    @Override
+    public void setSelected(final FrameContainer source) {
+        //Ignore
+    }
+
+    /** {@inheritDoc}. */
+    @Override
+    public void showNotification(final FrameContainer source, final Color colour) {
+        //Ignore
+    }
+
+    /** {@inheritDoc}. */
+    @Override
+    public void clearNotification(final FrameContainer source) {
+        //Ignore
+    }
+
+    /** {@inheritDoc}. */
+    @Override
+    public void addWindow(final FrameContainer window) {
+        final JInternalFrame frame = (JInternalFrame) window.getFrame();
+
+        // Add the frame
+        desktopPane.add(frame);
+
+        // Make sure it'll fit with our offsets
+        if (frame.getWidth() + xOffset > desktopPane.getWidth()) {
+            xOffset = 0;
+        }
+        if (frame.getHeight() + yOffset > desktopPane.getHeight()) {
+            yOffset = 0;
+        }
+
+        // Position the frame
+        frame.setLocation(xOffset, yOffset);
+        frame.moveToFront();
+
+        // Increase the offsets
+        xOffset += FRAME_OPENING_OFFSET;
+        yOffset += FRAME_OPENING_OFFSET;
+    }
+
+    /** {@inheritDoc}. */
+    @Override
+    public void delWindow(FrameContainer window) {
+        if (desktopPane.getAllFrames().length == 1) {
+            setTitle(getTitlePrefix());
+        } else {
+            setActiveFrame((Window) desktopPane.selectFrame(true));
+        }
+        desktopPane.remove((JInternalFrame) window.getFrame());
+    }
+
+    /** {@inheritDoc}. */
+    @Override
+    public void addWindow(final FrameContainer parent, final FrameContainer window) {
+        addWindow(window);
+    }
+
+    /** {@inheritDoc}. */
+    @Override
+    public void delWindow(final FrameContainer parent, final FrameContainer window) {
+        delWindow(window);
+    }
+
+    /** {@inheritDoc}. */
+    @Override
+    public void iconUpdated(final FrameContainer window) {
+        //Ignore
+    }
 }

src/com/dmdirc/ui/swing/components/TextFrame.java

@@ -182,8 +182,6 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         if (pref || Main.getUI().getMainWindow().getMaximised()) {
             hideTitlebar();
         }
-        
-        Main.getUI().getMainWindow().addChild(this);
     }
     
     /** {@inheritDoc} */