Fixes issue 3212

Tracks active window in WindowManager for good measure

Change-Id: I1489a1bd6972226c96c55cda78707a25138b6ccf
Reviewed-on: http://gerrit.dmdirc.com/151
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Tested-by: Shane Mc Cormack <shane@dmdirc.com>

src/com/dmdirc/FrameContainer.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc;
 
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.FrameInfoListener;
@@ -273,6 +275,9 @@ public abstract class FrameContainer {
      * Invoked when our window is activated.
      */
     public void windowActivated() {
+        ActionManager.processEvent(
+                                    CoreActionType.CLIENT_FRAME_CHANGED,
+                                    null, this);
         LOGGER.finer(toString() + ": windowActivated(): frame = "
                 + (getFrame() == null ? null : getFrame().getClass().getName()));
 

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

@@ -300,9 +300,6 @@ public abstract class TextFrame extends JInternalFrame implements Window,
                             /** {@inheritDoc} */
                             @Override
                             protected Object doInBackground() throws Exception {
-                                ActionManager.processEvent(
-                                    CoreActionType.CLIENT_FRAME_CHANGED,
-                                    null, getContainer());
                                 return null;
                             }
                         }.execute();

src/com/dmdirc/ui/WindowManager.java

@@ -63,6 +63,9 @@ public class WindowManager {
     private static final SelectionListener selectionListener
             = new WMSelectionListener();
 
+    /** The active window in the client. */
+    private static Window activeWindow = null;
+
     /**
      * Creates a new instance of WindowManager.
      */
@@ -323,6 +326,18 @@ public class WindowManager {
         final List<Window> children = childWindows.get(window);
         return children.toArray(new Window[children.size()]);
     }
+
+    /**
+     * Retrieves the currently active window in the client, or null if no window
+     * is active.
+     *
+     * @since 0.6.3
+     *
+     * @return Active window or null
+     */
+    public static Window getActiveWindow() {
+        return activeWindow;
+    }
     
     /**
      * Fires the addWindow(Window) callback.
@@ -378,6 +393,7 @@ public class WindowManager {
         /** {@inheritDoc} */
         @Override
         public void selectionChanged(final Window window) {
+            activeWindow = window;
             for (SelectionListener listener : selListeners) {
                 listener.selectionChanged(window);
             }