Fixes issue 3802: Sort order of window menu is wrong

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

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenu.java

@@ -41,7 +41,7 @@ import javax.swing.SwingUtilities;
  * Frame container JMenu.
  */
 public class FrameContainerMenu extends JMenu implements FrameInfoListener,
-        ActionListener, SelectionListener {
+        ActionListener, SelectionListener, FrameContainerMenuIterface {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -129,11 +129,8 @@ public class FrameContainerMenu extends JMenu implements FrameInfoListener,
         setFont(getFont().deriveFont(Font.ITALIC));
     }
 
-    /**
-     * Returns the wrapped frame container.
-     *
-     * @return Wrapped frame container
-     */
+    /** {@inheritDoc} */
+    @Override
     public FrameContainer getFrame() {
         return frame;
     }

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenuItem.java

@@ -40,7 +40,7 @@ import javax.swing.SwingUtilities;
  * Action representing a frame.
  */
 public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListener,
-        ActionListener, SelectionListener {
+        ActionListener, SelectionListener, FrameContainerMenuIterface {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -126,11 +126,8 @@ public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListen
         }
     }
 
-    /**
-     * Returns the wrapped frame container.
-     * 
-     * @return Wrapped frame container
-     */
+    /** {@inheritDoc} */
+    @Override
     public FrameContainer getFrame() {
         return frame;
     }

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenuIterface.java

@@ -0,0 +1,38 @@
+/*
+ * 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.windowmenu;
+
+import com.dmdirc.FrameContainer;
+
+/**
+ * Interface to define a menu or menu item that holds a framecontainer.
+ */
+public interface FrameContainerMenuIterface {
+
+    /**
+     * Returns the wrapped frame container.
+     *
+     * @return Wrapped frame container
+     */
+    public FrameContainer getFrame();
+}

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowMenuFrameManager.java

@@ -323,11 +323,11 @@ public final class WindowMenuFrameManager extends JMenu implements
     private int getIndex(final FrameContainer newChild, final JMenu menu) {
         final int count = menu == this ? itemCount : 0;
         for (int i = count; i < menu.getMenuComponentCount(); i++) {
-            if (!(menu.getMenuComponent(i) instanceof FrameContainerMenuItem)) {
+            if (!(menu.getMenuComponent(i) instanceof FrameContainerMenuIterface)) {
                 continue;
             }
-            final FrameContainer child =
-                    ((FrameContainerMenuItem) menu.getMenuComponent(i)).getFrame();
+            final FrameContainer child = ((FrameContainerMenuIterface)
+                    menu.getMenuComponent(i)).getFrame();
             if (sortBefore(newChild, child)) {
                 return i;
             } else if (!sortAfter(newChild, child) && IdentityManager.