Merge pull request #139 from greboid/windowmenusorting

Remove the window menu.

ui_swing/src/com/dmdirc/addons/ui_swing/components/menubar/MenuBar.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.menubar;
 
 import com.dmdirc.addons.ui_swing.components.MDIBar;
-import com.dmdirc.addons.ui_swing.framemanager.windowmenu.WindowMenuFrameManager;
 
 import java.awt.Component;
 import java.util.HashMap;
@@ -59,7 +58,6 @@ public class MenuBar extends JMenuBar {
      * @param serverMenu   The server menu to use.
      * @param channelMenu  The channel menu to use.
      * @param settingsMenu The settings menu to use.
-     * @param windowMenu   The window menu to use.
      * @param helpMenu     The help menu to use.
      * @param mdiBar       The MDI bar to use.
      */
@@ -68,7 +66,6 @@ public class MenuBar extends JMenuBar {
             final ServerMenu serverMenu,
             final ChannelMenu channelMenu,
             final SettingsMenu settingsMenu,
-            final WindowMenuFrameManager windowMenu,
             final HelpMenu helpMenu,
             final MDIBar mdiBar) {
         menuItems = new HashMap<>();
@@ -77,7 +74,6 @@ public class MenuBar extends JMenuBar {
         add(serverMenu);
         add(channelMenu);
         add(settingsMenu);
-        add(windowMenu);
         add(helpMenu);
         final int tempCount = getComponentCount();
         add(Box.createHorizontalGlue(), "growx, pushx");
@@ -85,7 +81,6 @@ public class MenuBar extends JMenuBar {
         add(Box.createHorizontalStrut(PlatformDefaults.getPanelInsets(1)
                 .getUnit()));
         menuItemCount = getComponentCount() - tempCount;
-        windowMenu.init();
 
         getActionMap().setParent(null);
         getActionMap().clear();

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

@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * 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.ClientModule;
-import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
-import com.dmdirc.addons.ui_swing.events.SwingEventBus;
-import com.dmdirc.addons.ui_swing.events.SwingWindowAddedEvent;
-import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
-import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.WindowManager;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.inject.Inject;
-import javax.swing.JMenuItem;
-
-import net.engio.mbassy.listener.Handler;
-import net.engio.mbassy.listener.Invoke;
-
-/**
- * A Menu item that closes the active window when triggered.
- */
-public class CloseActiveWindowMenuItem extends JMenuItem {
-
-    private final ActiveFrameManager activeFrameManager;
-    private final SwingEventBus eventBus;
-    private final WindowManager windowManager;
-
-    @Inject
-    public CloseActiveWindowMenuItem(final ActiveFrameManager activeFrameManager,
-            @ClientModule.GlobalConfig final IconManager iconManager,
-            final SwingEventBus eventBus,
-            final WindowManager windowManager) {
-        super(iconManager.getIcon("close"));
-        this.activeFrameManager = activeFrameManager;
-        this.eventBus = eventBus;
-        this.windowManager = windowManager;
-        setMnemonic('c');
-        setText("Close");
-        setActionCommand("Close");
-    }
-
-    /**
-     * Initialises the menu item adding listeners as required.
-     */
-    public void init() {
-        addActionListener(l -> activeFrameManager.getActiveFrame()
-                .ifPresent(c -> c.getContainer().close()));
-        eventBus.subscribe(this);
-    }
-
-    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
-    public void windowAdded(final SwingWindowAddedEvent event) {
-        setEnabled(true);
-    }
-
-    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
-    public void windowDeleted(final SwingWindowDeletedEvent event) {
-        setEnabled(!windowManager.getRootWindows().isEmpty());
-    }
-}

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

@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * 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.DMDircMBassador;
-import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.addons.ui_swing.events.SwingActiveWindowChangeRequestEvent;
-import com.dmdirc.addons.ui_swing.events.SwingEventBus;
-import com.dmdirc.events.FrameIconChangedEvent;
-import com.dmdirc.events.FrameNameChangedEvent;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.messages.Styliser;
-
-import java.awt.event.ActionEvent;
-import java.util.Optional;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-
-import net.engio.mbassy.listener.Handler;
-
-/**
- * An action representing a window.
- */
-public class WindowAction extends AbstractAction {
-
-    private final SwingEventBus eventBus;
-    private final IconManager iconManager;
-    private final TextFrame window;
-
-    public WindowAction(final SwingEventBus eventBus, final IconManager iconManager,
-            final TextFrame window) {
-        this.eventBus = eventBus;
-        this.iconManager = iconManager;
-        this.window = window;
-    }
-
-    public void init(final DMDircMBassador eventBus) {
-        eventBus.subscribe(this);
-        putValue(Action.SMALL_ICON, iconManager.getIcon(window.getContainer().getIcon()));
-        putValue(Action.NAME, Styliser.stipControlCodes(window.getContainer().getName()));
-    }
-
-    @Handler(invocation = EdtHandlerInvocation.class)
-    public void iconChanged(final FrameIconChangedEvent event) {
-        if (event.getContainer().equals(window.getContainer())) {
-            putValue(Action.SMALL_ICON, iconManager.getIcon(event.getIcon()));
-        }
-    }
-
-    @Handler(invocation = EdtHandlerInvocation.class)
-    public void nameChanged(final FrameNameChangedEvent event) {
-        if (event.getContainer().equals(window.getContainer())) {
-            putValue(Action.NAME, Styliser.stipControlCodes(event.getName()));
-        }
-    }
-
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        eventBus.publishAsync(new SwingActiveWindowChangeRequestEvent(Optional.ofNullable(window)));
-    }
-}

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

@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * 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.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.addons.ui_swing.events.SwingEventBus;
-import com.dmdirc.ui.IconManager;
-
-import javax.inject.Inject;
-
-/**
- * Factory to create {@link WindowAction}s.
- */
-public class WindowActionFactory {
-
-    private final DMDircMBassador eventBus;
-    private final SwingEventBus swingEventBus;
-    private final IconManager iconManager;
-
-    @Inject
-    public WindowActionFactory(final DMDircMBassador eventBus,
-            final SwingEventBus swingEventBus,
-            @GlobalConfig final IconManager iconManager) {
-        this.eventBus = eventBus;
-        this.swingEventBus = swingEventBus;
-        this.iconManager = iconManager;
-    }
-
-    public WindowAction getWindowAction(final TextFrame window) {
-        final WindowAction windowAction = new WindowAction(swingEventBus, iconManager, window);
-        windowAction.init(eventBus);
-        return windowAction;
-    }
-}

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

@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * 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.ClientModule.GlobalConfig;
-import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
-import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.addons.ui_swing.events.SwingEventBus;
-import com.dmdirc.addons.ui_swing.events.SwingWindowAddedEvent;
-import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.plugins.PluginDomain;
-
-import com.google.common.collect.Maps;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.swing.AbstractButton;
-import javax.swing.Action;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-
-import net.engio.mbassy.listener.Handler;
-
-/**
- * Manages the window menu window list.
- */
-@Singleton
-public class WindowMenuFrameManager extends JMenu {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-    /** Window action factory. */
-    private final WindowActionFactory windowActionFactory;
-    /** Window selection font changer. */
-    private final WindowSelectionFontChangerFactory windowSelectionFontChanger;
-    /** Window to item mapping. */
-    private final Map<TextFrame, AbstractButton> menuItems;
-    /** Swing event bus. */
-    private final SwingEventBus swingEventBus;
-    /** Close menu item. */
-    private final CloseActiveWindowMenuItem closeMenuItem;
-    /** Global config. */
-    private final AggregateConfigProvider globalConfig;
-    /** Plugin domain. */
-    private final String domain;
-    /** Menu separator. */
-    private final WindowMenuSeparator separator;
-
-    @Inject
-    public WindowMenuFrameManager(@GlobalConfig final AggregateConfigProvider globalConfig,
-            @PluginDomain(SwingController.class) final String domain,
-            final SwingEventBus swingEventBus,
-            final CloseActiveWindowMenuItem closeMenuItem,
-            final WindowActionFactory windowActionFactory,
-            final WindowSelectionFontChangerFactory windowSelectionFontChanger,
-            final WindowMenuSeparator separator) {
-        this.windowActionFactory = windowActionFactory;
-        this.windowSelectionFontChanger = windowSelectionFontChanger;
-        this.swingEventBus = swingEventBus;
-        this.closeMenuItem = closeMenuItem;
-        this.globalConfig = globalConfig;
-        this.separator = separator;
-        this.domain = domain;
-        menuItems = Maps.newHashMap();
-    }
-
-    /**
-     * Initialises the frame managers and adds appropriate listeners.
-     */
-    public void init() {
-        swingEventBus.subscribe(this);
-
-        setText("Window");
-        setMnemonic('w');
-
-        closeMenuItem.init();
-        add(closeMenuItem);
-        separator.init();
-        add(separator);
-
-        WindowMenuScroller.createScroller(this, globalConfig, domain, getMenuComponentCount());
-    }
-
-    @Handler(invocation = EdtHandlerInvocation.class)
-    public void windowAdded(final SwingWindowAddedEvent event) {
-        if (event.getParentWindow().isPresent()) {
-            addChildWindow(event.getParentWindow().get(), event.getChildWindow());
-        } else {
-            addTopLevelWindow(event.getChildWindow());
-        }
-    }
-
-    @Handler(invocation = EdtHandlerInvocation.class)
-    public void windowDeleted(final SwingWindowDeletedEvent event) {
-        if (event.getParentWindow().isPresent()) {
-            deleteChildWindow(event.getParentWindow().get(), event.getChildWindow());
-        } else {
-            deleteTopLevelWindow(event.getChildWindow());
-        }
-    }
-
-    private JMenu getMenu(final TextFrame window) {
-        final Action action = windowActionFactory.getWindowAction(window);
-        final JMenu menu = new JMenu(action);
-        windowSelectionFontChanger.getWindowSelectionFontChanger(menu, window);
-        return menu;
-    }
-
-    private JMenuItem getMenuItem(final TextFrame window) {
-        final Action action = windowActionFactory.getWindowAction(window);
-        final JMenuItem menu = new JMenuItem(action);
-        windowSelectionFontChanger.getWindowSelectionFontChanger(menu, window);
-        return menu;
-    }
-
-    private void addChildWindow(final TextFrame parent, final TextFrame child) {
-        if (!(menuItems.get(parent) instanceof JMenu)) {
-            remove(menuItems.get(parent));
-            final AbstractButton item = getMenu(parent);
-            menuItems.put(parent, item);
-            add(item);
-        }
-        final AbstractButton item = getMenuItem(child);
-        menuItems.put(child, item);
-        menuItems.get(parent).add(item);
-    }
-
-    private void addTopLevelWindow(final TextFrame window) {
-        final AbstractButton item = getMenuItem(window);
-        menuItems.put(window, item);
-        add(item);
-    }
-
-    private void deleteTopLevelWindow(final TextFrame window) {
-        remove(menuItems.get(window));
-    }
-
-    private void deleteChildWindow(final TextFrame parent, final TextFrame child) {
-        menuItems.get(parent).remove(menuItems.get(child));
-    }
-}

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

@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2006-2012 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.addons.ui_swing.UIUtilities;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
-
-import javax.swing.JMenu;
-
-import darrylbu.util.MenuScroller;
-
-/**
- * Window menu scroller.
- */
-public class WindowMenuScroller implements ConfigChangeListener {
-
-    /** Config manager. */
-    private final AggregateConfigProvider config;
-    /** Config domain. */
-    private final String configDomain;
-    /** Menu to scroll. */
-    private final JMenu menu;
-    /** Fixed menu item count. */
-    private final int fixedCount;
-    /** Menu scroller. */
-    private MenuScroller scroller;
-
-    /**
-     * Creates a new menu scroller for the window menu.
-     *
-     * @param menu         Menu to create scroller for
-     * @param config       Config manager
-     * @param configDomain Domain to check config settings in
-     * @param fixedCount   Number of fixed items in the menu
-     */
-    private WindowMenuScroller(final JMenu menu, final AggregateConfigProvider config,
-            final String configDomain, final int fixedCount) {
-        this.menu = menu;
-        this.config = config;
-        this.configDomain = configDomain;
-        this.fixedCount = fixedCount;
-    }
-
-    private void init() {
-        this.scroller = new MenuScroller(menu,
-                config.getOptionInt(configDomain,"windowMenuItems"),
-                config.getOptionInt(configDomain, "windowMenuScrollInterval"), fixedCount, 0);
-        scroller.setShowSeperators(false);
-
-        config.addChangeListener(configDomain, "windowMenuItems", this);
-        config.addChangeListener(configDomain, "windowMenuScrollInterval", this);
-    }
-
-    /**
-     * Creates a menu scroller and attaches it to the menu.
-     */
-    public static void createScroller(final JMenu menu, final AggregateConfigProvider config,
-            final String configDomain, final int fixedCount) {
-        new WindowMenuScroller(menu, config, configDomain, fixedCount).init();
-    }
-
-    @Override
-    public void configChanged(final String domain, final String key) {
-        UIUtilities.invokeLater(() -> {
-            scroller.dispose();
-            scroller = new MenuScroller(menu,
-                    config.getOptionInt(configDomain, "windowMenuItems"),
-                    config.getOptionInt(configDomain, "windowMenuScrollInterval"),
-                    fixedCount, 0);
-            scroller.setShowSeperators(false);
-        });
-    }
-
-}

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

@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * 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.addons.ui_swing.EdtHandlerInvocation;
-import com.dmdirc.addons.ui_swing.events.SwingEventBus;
-import com.dmdirc.addons.ui_swing.events.SwingWindowAddedEvent;
-import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
-import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
-import com.dmdirc.ui.WindowManager;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.inject.Inject;
-import javax.swing.JPopupMenu;
-
-import net.engio.mbassy.listener.Handler;
-import net.engio.mbassy.listener.Invoke;
-
-/**
- * Separator that only appears when there are top level windows.
- */
-public class WindowMenuSeparator extends JPopupMenu.Separator implements ActionListener {
-
-    private final ActiveFrameManager activeFrameManager;
-    private final SwingEventBus eventBus;
-    private final WindowManager windowManager;
-
-    @Inject
-    public WindowMenuSeparator(final ActiveFrameManager activeFrameManager,
-            final SwingEventBus eventBus,
-            final WindowManager windowManager) {
-        this.activeFrameManager = activeFrameManager;
-        this.eventBus = eventBus;
-        this.windowManager = windowManager;
-    }
-    /**
-     * Initialises the menu item adding listeners as required.
-     */
-    public void init() {
-        eventBus.subscribe(this);
-    }
-
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        activeFrameManager.getActiveFrame().ifPresent(c -> c.getContainer().close());
-    }
-
-    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
-    public void windowAdded(final SwingWindowAddedEvent event) {
-        setVisible(true);
-    }
-
-    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
-    public void windowDeleted(final SwingWindowDeletedEvent event) {
-        setVisible(!windowManager.getRootWindows().isEmpty());
-    }
-}

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

@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * 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.addons.ui_swing.EdtHandlerInvocation;
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.addons.ui_swing.events.SwingEventBus;
-import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
-import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
-
-import java.awt.Font;
-
-import javax.swing.JComponent;
-import javax.swing.UIManager;
-
-import net.engio.mbassy.listener.Handler;
-import net.engio.mbassy.listener.Listener;
-import net.engio.mbassy.listener.References;
-
-/**
- * Changes the font for a JComponent on a selection change.
- */
-@Listener(references = References.Strong)
-public class WindowSelectionFontChanger {
-
-    private final JComponent component;
-    private final TextFrame window;
-
-    public WindowSelectionFontChanger(final JComponent component, final TextFrame window) {
-        this.component = component;
-        this.window = window;
-    }
-
-    public void init(final ActiveFrameManager activeFrameMaanger, final SwingEventBus eventBus) {
-        eventBus.subscribe(this);
-        selectionChanged(new SwingWindowSelectedEvent(activeFrameMaanger.getActiveFrame()));
-    }
-
-    @Handler(invocation = EdtHandlerInvocation.class)
-    public void selectionChanged(final SwingWindowSelectedEvent event) {
-        // TODO: Check children and set italic
-        if (event.getWindow().isPresent() && window.equals(event.getWindow().get())) {
-            component.setFont(UIManager.getFont("MenuItem.font").deriveFont(Font.BOLD));
-        } else {
-            component.setFont(UIManager.getFont("MenuItem.font").deriveFont(Font.PLAIN));
-        }
-    }
-}

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

@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * 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.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.addons.ui_swing.events.SwingEventBus;
-import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
-
-import javax.inject.Inject;
-import javax.swing.JComponent;
-
-/**
- * Factory to create {@link WindowSelectionFontChanger}s.
- */
-public class WindowSelectionFontChangerFactory {
-
-    private final ActiveFrameManager activeFrameManager;
-    private final SwingEventBus swingEventBus;
-
-    @Inject
-    public WindowSelectionFontChangerFactory(final ActiveFrameManager activeFrameManager,
-            final SwingEventBus swingEventBus) {
-        this.activeFrameManager = activeFrameManager;
-        this.swingEventBus = swingEventBus;
-    }
-
-    public WindowSelectionFontChanger getWindowSelectionFontChanger(final JComponent component,
-            final TextFrame window) {
-        final WindowSelectionFontChanger windowSelectionFontChanger
-                = new WindowSelectionFontChanger(component, window);
-        windowSelectionFontChanger.init(activeFrameManager, swingEventBus);
-        return windowSelectionFontChanger;
-    }
-}

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/package-info.java

@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * 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.
- */
-
-/**
- * Window menu list frame manager.
- */
-package com.dmdirc.addons.ui_swing.framemanager.windowmenu;