Moved FrameContainerComparator into the core, moved non standard windows back to the bottom of the list but kept GlobalWindow at the top

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

src/com/dmdirc/ui/swing/components/FrameContainerComparator.java → src/com/dmdirc/FrameContainerComparator.java

@@ -20,13 +20,8 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.swing.components;
+package com.dmdirc;
 
-import com.dmdirc.Channel;
-import com.dmdirc.FrameContainer;
-import com.dmdirc.Query;
-import com.dmdirc.Raw;
-import com.dmdirc.Server;
 
 import java.io.Serializable;
 import java.util.Comparator;
@@ -114,17 +109,19 @@ public final class FrameContainerComparator implements Comparator<FrameContainer
      * @return Position of the frame container
      */
     private int getPosition(final FrameContainer item) {
-        if (item instanceof Server) {
-            return 1;
-        } else if (item instanceof Raw) {
-            return 2;
-        } else if (item instanceof Channel) {
-            return 3;
-        } else if (item instanceof Query) {
-            return 4;
-        } else {
-            return 5;
-        }
+        if (item instanceof GlobalWindow) {
+            return 0;
+        } else if (item instanceof Server) {
+	    return 1;
+	} else if (item instanceof Raw) {
+	    return 2;
+	} else if (item instanceof Channel) {
+	    return 3;
+	} else if (item instanceof Query) {
+	    return 4;
+	} else {
+	    return 5;
+	}
     }
     
 }

src/com/dmdirc/ui/swing/framemanager/tree/TreeViewModel.java

@@ -23,6 +23,7 @@
 package com.dmdirc.ui.swing.framemanager.tree;
 
 import com.dmdirc.Channel;
+import com.dmdirc.GlobalWindow;
 import com.dmdirc.Query;
 import com.dmdirc.Raw;
 import com.dmdirc.Server;
@@ -142,7 +143,9 @@ public class TreeViewModel extends DefaultTreeModel {
      * @return Position of the object
      */
     private int getPosition(final Object object) {
-	if (object instanceof Server) {
+        if (object instanceof GlobalWindow) {
+            return 0;
+        } else if (object instanceof Server) {
 	    return 1;
 	} else if (object instanceof Raw) {
 	    return 2;
@@ -151,7 +154,7 @@ public class TreeViewModel extends DefaultTreeModel {
 	} else if (object instanceof Query) {
 	    return 4;
 	} else {
-	    return 0;
+	    return 5;
 	}
     }
 }

src/com/dmdirc/ui/swing/framemanager/windowmenu/WindowMenuFrameManager.java

@@ -26,7 +26,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.swing.MainFrame;
-import com.dmdirc.ui.swing.components.FrameContainerComparator;
+import com.dmdirc.FrameContainerComparator;
 
 import java.awt.Color;
 import java.awt.Font;