Logging history window is now a child of the window it's for, rather than a child of the server

The window manager now automatically removes child windows as needed

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

src/com/dmdirc/Channel.java

@@ -57,7 +57,6 @@ import com.dmdirc.ui.messages.Styliser;
 
 import java.awt.Color;
 import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Map;
 

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

@@ -41,31 +41,31 @@ public class HistoryWindow extends FrameContainer {
     
     /** The title of our window. */
     private final String title;
-    
-    /** The server we're associated with. */
-    private final Server server;
-    
+       
     /** The window we're using. */
     private final Window myWindow;
     
+    /** Our parent window. */
+    private final Window parent;
+    
     /**
      * Creates a new HistoryWindow.
      *
      * @param title The title of the window
      * @param reader The reader to use to get the history
-     * @param server The server we're associated with
+     * @param parent The window this history window was opened from
      */
-    public HistoryWindow(final String title, final ReverseFileReader reader, final Server server) {
+    public HistoryWindow(final String title, final ReverseFileReader reader, final Window parent) {
         super();
         
         this.title = title;
-        this.server = server;
+        this.parent = parent;
         
         icon = IconManager.getIconManager().getIcon("raw");
         
         myWindow = Main.getUI().getWindow(this);
         
-        WindowManager.addWindow(server.getFrame(), myWindow);
+        WindowManager.addWindow(parent, myWindow);
         
         myWindow.setTitle(title);
         myWindow.setFrameIcon(icon);
@@ -97,6 +97,6 @@ public class HistoryWindow extends FrameContainer {
     
     /** {@inheritDoc} */
     public Server getServer() {
-        return server;
+        return parent.getContainer().getServer();
     }
 }

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

@@ -847,7 +847,7 @@ public final class LoggingPlugin extends Plugin implements EventPlugin, Preferen
 			return false;
 		}
 		
-		new HistoryWindow("History of " + target.getContainer().toString(), reader, target.getContainer().getServer());
+		new HistoryWindow("History", reader, target);
 		
 		return true;
 	}

src/com/dmdirc/ui/WindowManager.java

@@ -86,7 +86,12 @@ public class WindowManager {
     public static void removeWindow(final Window window) {
         Logger.doAssertion(window != null);
         Logger.doAssertion(childWindows.containsKey(window));
-        Logger.doAssertion(childWindows.get(window).isEmpty());
+        
+        if (!childWindows.get(window).isEmpty()) {
+            for (Window child : new ArrayList<Window>(childWindows.get(window))) {
+                removeWindow(child);
+            }
+        }
         
         childWindows.remove(window);