Move FrameManager to the SwingUI, use UI window listeners for frame containers

Make background opened windows respect maximised states

Fixes issue 4037

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

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

@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_dummy;
-
-import com.dmdirc.FrameContainer;
-import com.dmdirc.Main;
-import com.dmdirc.ui.interfaces.FrameManager;
-import com.dmdirc.ui.interfaces.UIController;
-
-import java.awt.Color;
-
-import javax.swing.JComponent;
-
-/**
- * A dummy frame manager. Does nothing.
- * @author chris
- */
-public class DummyFrameManager implements FrameManager {
-    
-    /** Creates a new instance of DummyFrameManager. */
-    public DummyFrameManager() {
-        //Do nothing.
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    public void setParent(final JComponent parent) {
-        parent.setBackground(Color.RED);
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    public void addWindow(final FrameContainer<?> window, final boolean focus) {
-        Main.getUI().getStatusBar()
-                .setMessage("DummyFrameManager: addServer: " + window);
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    public void delWindow(final FrameContainer<?> window) {
-        Main.getUI().getStatusBar()
-                .setMessage("DummyFrameManager: delServer: " + window);
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    public void addWindow(final FrameContainer<?> parent,
-            final FrameContainer<?> window, final boolean focus) {
-        Main.getUI().getStatusBar()
-                .setMessage("DummyFrameManager: addCustom: " + window + "@" + parent);
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    public void delWindow(final FrameContainer<?> parent, final FrameContainer<?> window) {
-        Main.getUI().getStatusBar()
-                .setMessage("DummyFrameManager: delCustom: " + window + "@" + parent);
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    public boolean canPositionVertically() {
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    public boolean canPositionHorizontally() {
-        return true;
-    }
-
-    @Override
-    public void setController(UIController controller) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-}

src/com/dmdirc/addons/ui_swing/MainFrame.java

@@ -32,14 +32,12 @@ import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.addons.ui_swing.SwingWindowFactory.SwingWindowListener;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.interfaces.FrameManager;
-import com.dmdirc.ui.interfaces.FramemanagerPosition;
+import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
+import com.dmdirc.addons.ui_swing.framemanager.FramemanagerPosition;
 import com.dmdirc.ui.interfaces.MainWindow;
 import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.CoreUIUtils;
@@ -365,10 +363,8 @@ public final class MainFrame extends JFrame implements WindowListener,
                     mainFrameManager = new TreeFrameManager();
                 }
                 mainFrameManager.setController(controller);
-
-                WindowManager.addFrameListener(mainFrameManager);
                 mainFrameManager.setParent(frameManagerPanel);
-
+                controller.getWindowFactory().addWindowListener(mainFrameManager);
                 controller.getWindowFactory().addWindowListener(MainFrame.this);
             }
         });

src/com/dmdirc/addons/ui_swing/SwingWindowFactory.java

@@ -170,28 +170,4 @@ public class SwingWindowFactory implements FrameListener {
             }
         });
     }
-
-    /**
-     * An interface for objects interested in Swing UI window events.
-     */
-    public static interface SwingWindowListener {
-
-        /**
-         * Called when a new window is added.
-         *
-         * @param parent The parent of the added window (may be null)
-         * @param window The window that was added
-         */
-        void windowAdded(final Window parent, final Window window);
-
-        /**
-         * Called when a new window was deleted.
-         *
-         * @param parent The parent of the added window (may be null)
-         * @param window The window that was deleted
-         */
-        void windowDeleted(final Window parent, final Window window);
-        
-    }
-
 }

src/com/dmdirc/addons/ui_swing/SwingWindowListener.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing;
+
+import com.dmdirc.ui.interfaces.Window;
+
+/**
+ * An interface for objects interested in Swing UI window events.
+ */
+public interface SwingWindowListener {
+
+    /**
+     * Called when a new window is added.
+     *
+     * @param parent The parent of the added window (may be null)
+     * @param window The window that was added
+     */
+    void windowAdded(final Window parent, final Window window);
+
+    /**
+     * Called when a new window was deleted.
+     *
+     * @param parent The parent of the added window (may be null)
+     * @param window The window that was deleted
+     */
+    void windowDeleted(final Window parent, final Window window);
+}

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

@@ -27,7 +27,7 @@ import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.SwingWindowFactory.SwingWindowListener;
+import com.dmdirc.addons.ui_swing.SwingWindowListener;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;

src/com/dmdirc/addons/ui_swing/components/desktopPane/DMDircDesktopPane.java

@@ -26,7 +26,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.BackgroundOption;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.SwingWindowFactory.SwingWindowListener;
+import com.dmdirc.addons.ui_swing.SwingWindowListener;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;

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

@@ -275,6 +275,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
                     if (isIcon()) {
                         setIcon(false);
                     }
+                    setMaximum(controller.getMainFrame().getMaximised());
                     if (!isVisible()) {
                         TextFrame.super.setVisible(true);
                     }

src/com/dmdirc/addons/ui_swing/framemanager/FrameManager.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.framemanager;
+
+import com.dmdirc.addons.ui_swing.SwingWindowListener;
+import com.dmdirc.ui.interfaces.UIController;
+
+import javax.swing.JComponent;
+
+/**
+ * A frame manager is a widget that allows the user to navigate between the
+ * various frames that will be open at any one time.
+ * 
+ * @author chris
+ */
+public interface FrameManager extends SwingWindowListener {
+    
+    /**
+     * Sets the parent component of this frame manager. The frame manager
+     * should render itself within the parent.
+     * 
+     * @param parent The parent control
+     */
+    void setParent(JComponent parent);
+
+    /**
+     * Sets the UIController fot the frame manager.  This method will be called
+     * immediately after contruction of the frame manager.
+     *
+     * @param controller UIController
+     */
+    void setController(UIController controller);
+    
+    /**
+     * Indicates whether this frame manager can be positioned vertically
+     * (i.e., at the side of the screen).
+     * 
+     * @return True iff the frame manager can be positioned vertically
+     */
+    boolean canPositionVertically();
+    
+    /**
+     * Indicates whether this frame manager can be positioned horizontally
+     * (i.e., at the top or bottom of the screen).
+     * 
+     * @return True iff the frame manager can be positioned horizontally
+     */
+    boolean canPositionHorizontally();
+
+}

src/com/dmdirc/addons/ui_swing/framemanager/FramemanagerPosition.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.framemanager;
+
+import java.util.Locale;
+
+/**
+ * Frame manager position enum.
+ */
+public enum FramemanagerPosition {
+    /** Top of the window. */
+    TOP,
+    /** Left side of the window. */
+    LEFT,
+    /** Bottom of the window. */
+    BOTTOM,
+    /** Right side of the window. */
+    RIGHT,
+    /** Unknown position. */
+    UNKNOWN;
+    
+    /**
+     * Returns the frame position for s specified string.
+     *
+     * @param name Name of the string
+     *
+     * @return FramemanagerPosition for the string
+     */
+    public static FramemanagerPosition getPosition(final String name) {
+        if (name == null) {
+            return UNKNOWN;
+        }
+        try {
+            return valueOf(name.toUpperCase(Locale.getDefault()));
+        } catch (IllegalArgumentException ex) {
+            return valueOf("UNKNOWN");
+        }
+    }
+    
+    /**
+     * Determines if this position is one of the two horizontal positions.
+     * 
+     * @return True if this is a horizontal position, false otherwise
+     */
+    public boolean isHorizontal() {
+        return this == TOP || this == BOTTOM;
+    }
+}

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

@@ -32,8 +32,8 @@ import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.interfaces.SelectionListener;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.interfaces.FrameManager;
-import com.dmdirc.ui.interfaces.FramemanagerPosition;
+import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
+import com.dmdirc.addons.ui_swing.framemanager.FramemanagerPosition;
 import com.dmdirc.ui.interfaces.UIController;
 import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.util.MapList;
@@ -210,80 +210,51 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void addWindow(final FrameContainer<?> window, final boolean focus) {
+    public void windowAdded(final Window parent, final Window window) {
         UIUtilities.invokeLater(new Runnable() {
 
             /** {inheritDoc} */
             @Override
             public void run() {
-                windows.add(window);
-                //This window is a root window
-                addButton(window);
-
-                relayout();
-                window.addNotificationListener(ButtonBar.this);
-                window.addSelectionListener(ButtonBar.this);
-                window.addFrameInfoListener(ButtonBar.this);
-            }
-
-        });
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void delWindow(final FrameContainer<?> window) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            /** {inheritDoc} */
-            @Override
-            public void run() {
-                windows.remove(window);
-                buttons.remove(window);
+                if (parent == null) {
+                    windows.add(window.getContainer());
+                    //This window is a root window
+                    addButton(window.getContainer());
+                } else {
+                    windows.add(parent.getContainer(), window.getContainer());
+                    //This window is a root window
+                    addButton(window.getContainer());
+                }
 
                 relayout();
-                window.removeNotificationListener(ButtonBar.this);
-                window.removeFrameInfoListener(ButtonBar.this);
-                window.removeSelectionListener(ButtonBar.this);
+                window.getContainer().addNotificationListener(ButtonBar.this);
+                window.getContainer().addSelectionListener(ButtonBar.this);
+                window.getContainer().addFrameInfoListener(ButtonBar.this);
             }
-        });
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void addWindow(final FrameContainer<?> parent,
-            final FrameContainer<?> window, final boolean focus) {
-        UIUtilities.invokeLater(new Runnable() {
 
-            /** {inheritDoc} */
-            @Override
-            public void run() {
-                windows.add(parent, window);
-                //This window has a parent Window
-                addButton(window);
-
-                relayout();
-                window.addNotificationListener(ButtonBar.this);
-                window.addSelectionListener(ButtonBar.this);
-                window.addFrameInfoListener(ButtonBar.this);
-            }
         });
     }
 
     /** {@inheritDoc} */
     @Override
-    public void delWindow(final FrameContainer<?> parent, final FrameContainer<?> window) {
+    public void windowDeleted(final Window parent, final Window window) {
         UIUtilities.invokeLater(new Runnable() {
 
             /** {inheritDoc} */
             @Override
             public void run() {
-                windows.remove(parent, window);
-                buttons.remove(window);
+                if (parent == null) {
+                    windows.remove(window.getContainer());
+                    buttons.remove(window.getContainer());
+                } else {
+                    windows.remove(parent.getContainer(), window.getContainer());
+                    buttons.remove(parent.getContainer());
+                }
 
                 relayout();
-            window.removeNotificationListener(ButtonBar.this);
-            window.removeFrameInfoListener(ButtonBar.this);
-            window.removeSelectionListener(ButtonBar.this);
+                window.getContainer().removeNotificationListener(ButtonBar.this);
+                window.getContainer().removeFrameInfoListener(ButtonBar.this);
+                window.getContainer().removeSelectionListener(ButtonBar.this);
             }
         });
     }

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

@@ -31,10 +31,11 @@ import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.interfaces.SelectionListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.interfaces.FrameManager;
+import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.UIController;
+import com.dmdirc.ui.interfaces.Window;
 
 import java.awt.Color;
 import java.awt.Rectangle;
@@ -150,51 +151,41 @@ public final class TreeFrameManager implements FrameManager,
 
     /** {@inheritDoc} */
     @Override
-    public void addWindow(final FrameContainer<?> window, final boolean focus) {
-        addWindow(model.getRootNode(), window);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void addWindow(final FrameContainer<?> parent,
-            final FrameContainer<?> window, final boolean focus) {
-        addWindow(nodes.get(parent), window);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void delWindow(final FrameContainer<?> parent,
-            final FrameContainer<?> window) {
-        delWindow(window);
+    public void windowAdded(final Window parent, final Window window) {
+        if (parent == null) {
+            addWindow(model.getRootNode(), window.getContainer());
+        } else {
+            addWindow(nodes.get(parent.getContainer()), window.getContainer());
+        }
     }
 
     /** {@inheritDoc} */
     @Override
-    public void delWindow(final FrameContainer<?> window) {
+    public void windowDeleted(final Window parent, final Window window) {
         UIUtilities.invokeAndWait(new Runnable() {
 
             /** {@inheritDoc} */
             @Override
             public void run() {
-                if (nodes == null || nodes.get(window) == null) {
+                if (nodes == null || nodes.get(window.getContainer()) == null) {
                     return;
                 }
                 final DefaultMutableTreeNode node =
-                        nodes.get(window);
+                        nodes.get(window.getContainer());
                 if (node.getLevel() == 0) {
                     Logger.appError(ErrorLevel.MEDIUM,
                             "delServer triggered for root node" +
                             node.toString(),
                             new IllegalArgumentException());
                 } else {
-                    model.removeNodeFromParent(nodes.get(window));
+                    model.removeNodeFromParent(nodes.get(window.getContainer()));
                 }
                 synchronized (nodes) {
-                    nodes.remove(window);
+                    nodes.remove(window.getContainer());
                 }
-                window.removeSelectionListener(TreeFrameManager.this);
-                window.removeFrameInfoListener(TreeFrameManager.this);
-                window.removeNotificationListener(TreeFrameManager.this);
+                window.getContainer().removeSelectionListener(TreeFrameManager.this);
+                window.getContainer().removeFrameInfoListener(TreeFrameManager.this);
+                window.getContainer().removeNotificationListener(TreeFrameManager.this);
             }
         });
     }
@@ -308,10 +299,10 @@ public final class TreeFrameManager implements FrameManager,
                         null, null));
 
                 for (FrameContainer<?> window : WindowManager.getRootWindows()) {
-                    addWindow(window, false);
+                    addWindow(null, window);
                     final Collection<FrameContainer<?>> childWindows = window.getChildren();
                     for (FrameContainer childWindow : childWindows) {
-                        addWindow(window, childWindow, false);
+                        addWindow(nodes.get(window), childWindow);
                     }
                 }
             }

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

@@ -42,7 +42,6 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.updater.Update;
 
 import com.dmdirc.addons.ui_web.uicomponents.WebChannelWindow;
-import com.dmdirc.addons.ui_web.uicomponents.WebFrameManager;
 import com.dmdirc.addons.ui_web.uicomponents.WebInputWindow;
 import com.dmdirc.addons.ui_web.uicomponents.WebMainWindow;
 import com.dmdirc.addons.ui_web.uicomponents.WebQueryWindow;
@@ -82,9 +81,7 @@ public class WebInterfaceUI implements UIController {
      * 
      * @param plugin The plugin which owns this Web UI
      */
-    public WebInterfaceUI(final WebInterfacePlugin plugin) {
-        WindowManager.addFrameListener(new WebFrameManager());
-        
+    public WebInterfaceUI(final WebInterfacePlugin plugin) {       
         final SecurityHandler sh = new SecurityHandler();
         final Constraint constraint = new Constraint();
         final ConstraintMapping cm = new ConstraintMapping();

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

@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_web.uicomponents;
-
-import com.dmdirc.FrameContainer;
-import com.dmdirc.ui.interfaces.FrameManager;
-import com.dmdirc.addons.ui_web.DynamicRequestHandler;
-import com.dmdirc.addons.ui_web.Event;
-import com.dmdirc.addons.ui_web.WebInterfaceUI;
-import com.dmdirc.ui.interfaces.UIController;
-import javax.swing.JComponent;
-
-/**
- *
- * @author chris
- */
-public class WebFrameManager implements FrameManager {
-
-    /** {@inheritDoc} */
-    @Override
-    public void setParent(final JComponent parent) {
-        //TODO FIXME
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean canPositionVertically() {
-        //TODO FIXME
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean canPositionHorizontally() {
-        //TODO FIXME
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void addWindow(final FrameContainer<?> window, final boolean focus) {
-        DynamicRequestHandler.addEvent(new Event("newwindow", window.getFrame()));
-        WebInterfaceUI.active = (WebWindow) window.getFrame();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void delWindow(final FrameContainer<?> window) {
-        //TODO FIXME
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void addWindow(final FrameContainer<?> parent,
-            final FrameContainer<?> window, final boolean focus) {
-        DynamicRequestHandler.addEvent(new Event("newchildwindow", new Object[]{
-            parent.getFrame(), window.getFrame()
-        }));
-        WebInterfaceUI.active = (WebWindow) window.getFrame();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void delWindow(final FrameContainer<?> parent, final FrameContainer<?> window) {
-        //TODO FIXME
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void setController(UIController controller) {
-        //Ignore
-    }
-
-}