Added Selection and IconChange listeners

Removed deprecated frame manager methods

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

src/com/dmdirc/FrameContainer.java

@@ -23,7 +23,9 @@
 package com.dmdirc;
 
 import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.IconChangeListener;
 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.Window;
@@ -214,7 +216,15 @@ public abstract class FrameContainer {
                 Logger.userError(ErrorLevel.LOW, "Unable to maximise window");
             }
         }
-        Main.getUI().getMainWindow().getFrameManager().setSelected(this);
+        
+        final Object[] listenerList = listeners.getListenerList();
+        for (int i = 0; i < listenerList.length; i += 2) {
+            if (listenerList[i] == SelectionListener.class) {
+                ((SelectionListener) listenerList[i + 1])
+                            .selectionChanged(getFrame());
+            }
+        }        
+        
         clearNotification();
 
         if (getServer() != null) {
@@ -254,6 +264,21 @@ public abstract class FrameContainer {
             getFrame().addLine(type, args);
         }
     }
+    
+    /**
+     * Informs icon change listeners that this container's icon has changed.
+     * 
+     * @param newIcon This container's new icon
+     */
+    protected void iconUpdated(final Icon newIcon) {
+        final Object[] listenerList = listeners.getListenerList();
+        for (int i = 0; i < listenerList.length; i += 2) {
+            if (listenerList[i] == IconChangeListener.class) {
+                ((IconChangeListener) listenerList[i + 1])
+                            .iconChanged(getFrame(), newIcon);
+            }
+        }        
+    }
 
     /**
      * Adds a notification listener for this frame container.
@@ -272,4 +297,40 @@ public abstract class FrameContainer {
     public void removeNotificationListener(final NotificationListener listener) {
         listeners.remove(NotificationListener.class, listener);
     }
+    
+    /**
+     * Adds a selection listener for this frame container.
+     *
+     * @param listener The listener to be added
+     */
+    public void addSelectionListener(final SelectionListener listener) {
+        listeners.add(SelectionListener.class, listener);
+    }
+
+    /**
+     * Removes a selection listener from this frame container.
+     *
+     * @param listener The listener to be removed
+     */
+    public void removeSelectionListener(final SelectionListener listener) {
+        listeners.remove(SelectionListener.class, listener);
+    }    
+    
+    /**
+     * Adds an icon change listener for this frame container.
+     *
+     * @param listener The listener to be added
+     */
+    public void addIconChangeListener(final IconChangeListener listener) {
+        listeners.add(IconChangeListener.class, listener);
+    }
+
+    /**
+     * Removes an icon change listener from this frame container.
+     *
+     * @param listener The listener to be removed
+     */
+    public void removeIconChangeListener(final IconChangeListener listener) {
+        listeners.remove(IconChangeListener.class, listener);
+    }       
 }

src/com/dmdirc/Server.java

@@ -270,7 +270,8 @@ public final class Server extends WritableFrameContainer implements Serializable
                 serverInfo.getSSL() ? "secure-server" : "server");
         if (window != null) {
             window.setFrameIcon(icon);
-            Main.getUI().getMainWindow().getFrameManager().iconUpdated(this);
+            
+            iconUpdated(icon);
         }
     }
     

src/com/dmdirc/interfaces/IconChangeListener.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2006-2007 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.interfaces;
+
+import com.dmdirc.ui.interfaces.Window;
+
+import java.util.EventListener;
+
+import javax.swing.Icon;
+
+/**
+ * Defines the methods that should be implemented by classes which wish to
+ * receive information about frame icon changes.
+ *
+ * @author Chris
+ */
+public interface IconChangeListener extends EventListener {
+
+    /**
+     * Called when a window's icon is changed.
+     *
+     * @param window The window whose icon changed
+     * @param icon The new icon for the window
+     */
+    void iconChanged(final Window window, final Icon icon);
+
+}

src/com/dmdirc/interfaces/SelectionListener.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2006-2007 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.interfaces;
+
+import com.dmdirc.ui.interfaces.Window;
+
+import java.util.EventListener;
+
+/**
+ * Defines the methods that should be implemented by classes which wish to
+ * receive information about frame selection changes.
+ *
+ * @author Chris
+ */
+public interface SelectionListener extends EventListener {
+
+    /**
+     * Called when a new window is selected.
+     *
+     * @param window The window that's now selected
+     */
+    void selectionChanged(final Window window);
+
+}

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

@@ -29,7 +29,6 @@ import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.interfaces.ChannelWindow;
-import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.MainWindow;
 import com.dmdirc.ui.interfaces.PreferencesInterface;
@@ -40,7 +39,6 @@ import com.dmdirc.ui.interfaces.StatusBar;
 import com.dmdirc.ui.interfaces.UIController;
 import com.dmdirc.ui.interfaces.UpdaterDialog;
 import com.dmdirc.ui.interfaces.Window;
-import com.dmdirc.ui.dummy.DummyFrameManager;
 import com.dmdirc.updater.Update;
 
 import java.util.List;
@@ -69,12 +67,7 @@ public final class DummyController implements UIController {
     public StatusBar getStatusBar() {
         return new DummyStatusBar();
     }
-    
-    /** {@inheritDoc} */
-    public FrameManager getFrameManager() {
-        return new DummyFrameManager();
-    }
-    
+       
     /** {@inheritDoc} */
     public ChannelWindow getChannel(final Channel channel) {
         return new DummyChannelWindow(channel);

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

@@ -22,10 +22,8 @@
 
 package com.dmdirc.ui.dummy;
 
-import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.MainWindow;
 import com.dmdirc.ui.interfaces.Window;
-import com.dmdirc.ui.dummy.DummyFrameManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -71,12 +69,6 @@ public final class DummyMainWindow implements MainWindow {
         active = frame;
     }
     
-    /** {@inheritDoc} */
-    @Deprecated
-    public FrameManager getFrameManager() {
-        return new DummyFrameManager();
-    }
-    
     /** {@inheritDoc} */
     public ImageIcon getIcon() {
         return null;

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

@@ -50,16 +50,7 @@ public interface MainWindow {
      * @param frame The frame to be activated
      */
     void setActiveFrame(final Window frame);
-    
-    /**
-     * Retrieves the frame manager that's currently in use.
-     *
-     * @return The current frame manager
-     * @deprecated Frame Managers should interface via WindowManager.
-     */
-    @Deprecated
-    FrameManager getFrameManager();
-    
+        
     /**
      * Retrieves the application icon.
      *

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

@@ -54,14 +54,6 @@ public interface UIController {
      */
     StatusBar getStatusBar();
     
-    /**
-     * Retrieves the frame manager used by this UI.
-     *
-     * @return This UI's frame manager
-     */
-    @Deprecated
-    FrameManager getFrameManager();
-    
     /**
      * Creates a channel window for the specified channel.
      *

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

@@ -284,13 +284,6 @@ public final class MainFrame extends JFrame implements WindowListener,
         }
     }
 
-    /** {@inheritDoc}. */
-    @Override
-    @Deprecated
-    public FrameManager getFrameManager() {
-        return mainFrameManager;
-    }
-
     /**
      * Returns the size of the frame manager.
      *

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

@@ -34,7 +34,6 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.interfaces.ChannelWindow;
-import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.PreferencesInterface;
 import com.dmdirc.ui.interfaces.PreferencesPanel;
@@ -95,11 +94,6 @@ public final class SwingController implements UIController {
         return statusBar;
     }
     
-    /** {@inheritDoc} */
-    public FrameManager getFrameManager() {
-        return getMainWindow().getFrameManager();
-    }
-    
     /** {@inheritDoc} */
     public ChannelWindow getChannel(final Channel channel) {
         return new ChannelFrame(channel);