Remove deprecations.

Depends-On: Ic938a7785a30477f47074e574ec8311723d803a9

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

src/com/dmdirc/FrameContainer.java

@@ -36,7 +36,6 @@ import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.ui.messages.IRCDocument;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.ListenerList;
-import com.dmdirc.util.StringTranscoder;
 
 import java.awt.Color;
 import java.util.Collection;
@@ -225,19 +224,6 @@ public abstract class FrameContainer<T extends Window> {
         }
     }
 
-    /**
-     * Retrieves the {@link StringTranscoder} used to transcode this frame's
-     * text.
-     *
-     * @deprecated Encoding is now handled by parsers, do not use.
-     * @return This frame's transcoder
-     * @since 0.6.4
-     */
-    @Deprecated
-    public StringTranscoder getTranscoder() {
-        return new StringTranscoder(null);
-    }
-
     /** {@inheritDoc} */
     @Override
     public String toString() {
@@ -427,14 +413,6 @@ public abstract class FrameContainer<T extends Window> {
         return windows.contains(target);
     }
 
-    /**
-     * Invoked when our window has been opened.
-     * @deprecated Pointless. Stop calling me.
-     */
-    @Deprecated
-    public void windowOpened() {
-    }
-
     /**
      * Invoked when our window is closing.
      * <p>
@@ -511,14 +489,6 @@ public abstract class FrameContainer<T extends Window> {
         }
     }
 
-    /**
-     * Invoked when our window is deactivated.
-     * @deprecated Not used. Stop calling me.
-     */
-    @Deprecated
-    public void windowDeactivated() {
-    }
-
     /**
      * Adds a line to this container's window. If the window is null for some
      * reason, the line is silently discarded.

src/com/dmdirc/Main.java

@@ -399,17 +399,6 @@ public final class Main {
         return CONTROLLERS.iterator().next();
     }
 
-    /**
-     * Sets the UI controller that should be used by this client.
-     *
-     * @param newController The new UI Controller
-     * @deprecated Shouldn't be used. UI plugins should declare services.
-     */
-    @Deprecated
-    public static synchronized void setUI(final UIController newController) {
-        // Do nothing.
-    }
-
     /**
      * Returns the application's config directory.
      *

src/com/dmdirc/Server.java

@@ -540,19 +540,6 @@ public class Server extends WritableFrameContainer<ServerWindow> implements Conf
         return Collections.unmodifiableCollection(queries.values());
     }
 
-
-    /**
-     * Adds a query to this server.
-     *
-     * @param host host of the remote client being queried
-     * @return The query that was added (may be null if closing)
-     * @deprecated Use {@link #getQuery(java.lang.String)} instead
-     */
-    @Deprecated
-    public Query addQuery(final String host) {
-        return getQuery(host);
-    }
-
     /**
      * Deletes a query from this server.
      *
@@ -849,19 +836,6 @@ public class Server extends WritableFrameContainer<ServerWindow> implements Conf
         }
     }
 
-    /**
-     * Joins the specified channel with the specified key.
-     *
-     * @since 0.6.3m1
-     * @param channel The channel to be joined
-     * @param key The key for the channel
-     * @deprecated Use {@link #join(com.dmdirc.parser.common.ChannelJoinRequest[])}
-     */
-    @Deprecated
-    public void join(final String channel, final String key) {
-        join(new ChannelJoinRequest(channel, key));
-    }
-
     /**
      * Attempts to join the specified channels. If channels with the same name
      * already exist, they are (re)joined and their windows activated.
@@ -916,18 +890,6 @@ public class Server extends WritableFrameContainer<ServerWindow> implements Conf
         }
     }
 
-    /**
-     * Joins the specified channel, or adds it to the auto-join list if the
-     * server is not connected.
-     *
-     * @param channel The channel to be joined
-     * @deprecated Use {@link #join(com.dmdirc.parser.common.ChannelJoinRequest[])}
-     */
-    @Deprecated
-    public void join(final String channel) {
-        join(new ChannelJoinRequest(channel));
-    }
-
     /** {@inheritDoc} */
     @Override
     public void sendLine(final String line) {

src/com/dmdirc/ServerManager.java

@@ -27,7 +27,6 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.common.ChannelJoinRequest;
-import com.dmdirc.ui.interfaces.Window;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -146,27 +145,6 @@ public final class ServerManager {
         return servers.size();
     }
 
-    /**
-     * Returns the server instance that owns the specified internal frame.
-     *
-     * @param active The internal frame to check
-     * @return The server associated with the internal frame
-     * @deprecated Use {@link Window#getContainer()} and
-     * {@link FrameContainer#getServer()} instead.
-     */
-    @Deprecated
-    public Server getServerFromFrame(final Window active) {
-        synchronized (servers) {
-            for (Server server : servers) {
-                if (server.ownsFrame(active)) {
-                    return server;
-                }
-            }
-        }
-
-        return null;
-    }
-
     /**
      * Retrieves a list of servers connected to the specified network.
      *

src/com/dmdirc/actions/Action.java

@@ -145,7 +145,8 @@ public class Action extends ActionModel implements ConfigChangeListener {
 
         new File(dir).mkdirs();
 
-        ActionManager.processEvent(CoreActionType.ACTION_CREATED, null, this);
+        ActionManager.getActionManager().triggerEvent(
+                CoreActionType.ACTION_CREATED, null, this);
 
         save();
 
@@ -153,7 +154,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
                 (group + "/" + name).replace(' ', '.'), this);
         checkDisabled();
 
-        ActionManager.registerAction(this);
+        ActionManager.getActionManager().addAction(this);
     }
 
     /**
@@ -220,7 +221,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
             setStopping(Boolean.parseBoolean(config.getKeyDomain(DOMAIN_MISC).get("stopping")));
         }
 
-        ActionManager.registerAction(this);
+        ActionManager.getActionManager().addAction(this);
 
         checkMetaData();
     }
@@ -231,7 +232,8 @@ public class Action extends ActionModel implements ConfigChangeListener {
      */
     private void checkMetaData() {
         if (config.isKeyDomain(DOMAIN_METADATA)) {
-            final ActionGroup myGroup = ActionManager.getGroup(group);
+            final ActionGroup myGroup = ActionManager.getActionManager()
+                    .getOrCreateGroup(group);
             final Map<String, String> data = config.getKeyDomain(DOMAIN_METADATA);
 
             if (data.containsKey("description")) {
@@ -256,13 +258,15 @@ public class Action extends ActionModel implements ConfigChangeListener {
         }
 
         for (int i = 0; config.isKeyDomain("setting " + i); i++) {
-            final ActionGroup myGroup = ActionManager.getGroup(group);
+            final ActionGroup myGroup = ActionManager.getActionManager()
+                    .getOrCreateGroup(group);
             final Map<String, String> data = config.getKeyDomain("setting " + i);
 
             if (data.containsKey("type") && data.containsKey("setting")
                     && data.containsKey("title") && data.containsKey("default")
                     && data.containsKey("tooltip")) {
-                ActionManager.registerDefault(data.get("setting"), data.get("default"));
+                ActionManager.getActionManager().registerSetting(
+                        data.get("setting"), data.get("default"));
                 myGroup.getSettings().put(data.get("setting"), new PreferencesSetting(
                         PreferencesType.valueOf(data.get("type")), "actions",
                         data.get("setting"), data.get("title"), data.get("tooltip")));
@@ -280,7 +284,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
         triggers = new ActionType[newTriggers.size()];
 
         for (int i = 0; i < triggers.length; i++) {
-            triggers[i] = ActionManager.getActionType(newTriggers.get(i));
+            triggers[i] = ActionManager.getActionManager().getType(newTriggers.get(i));
 
             if (triggers[i] == null) {
                 error("Invalid trigger specified: " + newTriggers.get(i));
@@ -383,7 +387,8 @@ public class Action extends ActionModel implements ConfigChangeListener {
             Logger.userError(ErrorLevel.HIGH, "I/O error when saving action: "
                     + group + "/" + name + ": " + ex.getMessage());
         }
-        ActionManager.processEvent(CoreActionType.ACTION_UPDATED, null, this);
+        ActionManager.getActionManager().triggerEvent(
+                CoreActionType.ACTION_UPDATED, null, this);
     }
 
     /**
@@ -431,7 +436,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
 
         // ------ Read the comparison
 
-        comparison = ActionManager.getActionComparison(data.get("comparison"));
+        comparison = ActionManager.getActionManager().getComparison(data.get("comparison"));
         if (comparison == null) {
             error("Invalid comparison specified: " + data.get("comparison"));
             return false;
@@ -474,7 +479,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
         ActionComponent component;
 
         if (componentName.indexOf('.') == -1) {
-            component = ActionManager.getActionComponent(componentName);
+            component = ActionManager.getActionManager().getComponent(componentName);
         } else {
             try {
                 component = new ActionComponentChain(triggers[0].getType().getArgTypes()[arg],
@@ -538,7 +543,8 @@ public class Action extends ActionModel implements ConfigChangeListener {
      * Deletes this action.
      */
     public void delete() {
-        ActionManager.processEvent(CoreActionType.ACTION_DELETED, null, getGroup(), getName());
+        ActionManager.getActionManager().triggerEvent(
+                CoreActionType.ACTION_DELETED, null, getGroup(), getName());
         new File(location).delete();
     }
 

src/com/dmdirc/actions/ActionSubstitutor.java

@@ -106,7 +106,8 @@ public class ActionSubstitutor {
 
         int i = 0;
         for (Class<?> myClass : type.getType().getArgTypes()) {
-            for (ActionComponent comp : ActionManager.getCompatibleComponents(myClass)) {
+            for (ActionComponent comp : ActionManager.getActionManager()
+                    .findCompatibleComponents(myClass)) {
                 final String key = "{" + i + "." + comp.toString() + "}";
                 final String desc = type.getType().getArgNames()[i] + "'s " + comp.getName();
 
@@ -130,7 +131,8 @@ public class ActionSubstitutor {
         final Map<String, String> res = new HashMap<String, String>();
 
         if (hasFrameContainer()) {
-            for (ActionComponent comp : ActionManager.getCompatibleComponents(Server.class)) {
+            for (ActionComponent comp : ActionManager.getActionManager()
+                    .findCompatibleComponents(Server.class)) {
                 final String key = "{" + comp.toString() + "}";
                 final String desc = "The connection's " + comp.getName();
 

src/com/dmdirc/actions/internal/WhoisNumericFormatter.java

@@ -63,7 +63,8 @@ public class WhoisNumericFormatter implements ActionListener {
      * manager.
      */
     public void register() {
-        ActionManager.addListener(this, CoreActionType.SERVER_NUMERIC,
+        ActionManager.getActionManager().registerListener(this,
+                CoreActionType.SERVER_NUMERIC,
                 CoreActionType.SERVER_DISCONNECTED);
     }
 

src/com/dmdirc/actions/validators/ActionGroupValidator.java

@@ -37,7 +37,7 @@ public class ActionGroupValidator implements Validator<String> {
     /** {@inheritDoc} */
     @Override
     public ValidationResponse validate(final String object) {
-        if (ActionManager.getGroups().containsKey(object)) {
+        if (ActionManager.getActionManager().getGroupsMap().containsKey(object)) {
             return new ValidationResponse(FAILURE_EXISTS);
         } else {
             return new ValidationResponse();

src/com/dmdirc/commandparser/PopupManager.java

@@ -52,8 +52,9 @@ public class PopupManager {
     public static PopupMenu getMenu(final PopupType menuType, final ConfigManager configManager) {
         final PopupMenu menu = getMenu(menuType.toString(), menuType, configManager);
 
-        ActionManager.processEvent(CoreActionType.CLIENT_POPUP_GENERATED,
-                null, menuType, menu, configManager);
+        ActionManager.getActionManager().triggerEvent(
+                CoreActionType.CLIENT_POPUP_GENERATED, null, menuType, menu,
+                configManager);
 
         return menu;
     }

src/com/dmdirc/commandparser/commands/ChannelCommand.java

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2006-2011 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.commandparser.commands;
-
-import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandType;
-
-/**
- * Represents a command which can be performed only in the context of a channel.
- *
- * @deprecated Commands should extend {@link Command} directly
- * @author chris
- */
-@Deprecated
-public abstract class ChannelCommand extends Command implements CommandInfo {
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_CHANNEL;
-    }
-
-}

src/com/dmdirc/commandparser/commands/ChatCommand.java

@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2006-2011 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.commandparser.commands;
-
-import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandType;
-
-/**
- * Represents a command that can be performed in the context of a "chat" window
- * (i.e., a channel or a query).
- *
- * @deprecated Commands should extend {@link Command} directly
- * @author Chris
- */
-@Deprecated
-public abstract class ChatCommand extends Command implements CommandInfo {
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_CHAT;
-    }
-
-}

src/com/dmdirc/commandparser/commands/GlobalCommand.java

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2006-2011 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.commandparser.commands;
-
-import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandType;
-
-/**
- * Represents a generic global command. Global commands are associated with
- * no servers.
- *
- * @deprecated Commands should extend {@link Command} directly
- * @author chris
- */
-@Deprecated
-public abstract class GlobalCommand extends Command implements CommandInfo {
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-}

src/com/dmdirc/commandparser/commands/QueryCommand.java

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2006-2011 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.commandparser.commands;
-
-import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandType;
-
-/**
- * Represents a command which can be performed only in the context of a query.
- *
- * @deprecated Commands should extend {@link Command} directly
- * @author chris
- */
-@Deprecated
-public abstract class QueryCommand extends Command implements CommandInfo {
-        
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_QUERY;
-    }
-}

src/com/dmdirc/commandparser/commands/ServerCommand.java

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2006-2011 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.commandparser.commands;
-
-import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandType;
-
-/**
- * Represents a generic server command. Server commands are associated with
- * a server instance.
- *
- * @deprecated Commands should extend {@link Command} directly
- * @author chris
- */
-@Deprecated
-public abstract class ServerCommand extends Command implements CommandInfo {
-    
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_SERVER;
-    }
-}

src/com/dmdirc/commandparser/commands/global/AliasCommand.java

@@ -108,7 +108,7 @@ public final class AliasCommand extends Command implements
             if (AliasWrapper.getCommandName(alias).substring(1).equalsIgnoreCase(
                     name)) {
                 alias.delete();
-                ActionManager.unregisterAction(alias);
+                ActionManager.getActionManager().removeAction(alias);
 
                 return true;
             }

src/com/dmdirc/config/Identity.java

@@ -569,18 +569,6 @@ public class Identity extends ConfigSource implements Comparable<Identity> {
         return myTarget;
     }
 
-    /**
-     * Retrieve this identity's ConfigFile.
-     *
-     * @return The ConfigFile object used by this identity
-     * @deprecated Direct access should be avoided to prevent synchronisation
-     * issues
-     */
-    @Deprecated
-    public ConfigFile getFile() {
-        return file;
-    }
-
     /**
      * Determines if this identity is loaded from the specified File.
      *

src/com/dmdirc/config/IdentityManager.java

@@ -459,18 +459,6 @@ public final class IdentityManager {
         }
     }
 
-    /**
-     * Adds a config manager to this manager.
-     *
-     * @param manager The ConfigManager to add
-     * @deprecated Use {@link #addIdentityListener(com.dmdirc.config.IdentityListener)}
-     */
-    @Deprecated
-    @Precondition("The specified ConfigManager is not null")
-    public static void addConfigManager(final ConfigManager manager) {
-        addIdentityListener(manager);
-    }
-
     /**
      * Adds a new identity listener which will be informed of all settings
      * identities which are added to this manager.
@@ -500,18 +488,6 @@ public final class IdentityManager {
         }
     }
 
-    /**
-     * Retrieves a list of identities that serve as profiles.
-     *
-     * @return A list of profiles
-     * @deprecated Use {@link #getCustomIdentities(java.lang.String)} with
-     * an argument of <code>profile</code> to retrieve profiles.
-     */
-    @Deprecated
-    public static List<Identity> getProfiles() {
-        return getCustomIdentities("profile");
-    }
-
     /**
      * Retrieves a list of identities that belong to the specified custom type.
      *

src/com/dmdirc/plugins/PluginInfo.java

@@ -1378,66 +1378,6 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
         return loadAll.equalsIgnoreCase("true") || loadAll.equalsIgnoreCase("yes");
     }
 
-    /**
-     * Get misc meta-information.
-     *
-     * @param metainfo The metainfo to return
-     * @deprecated Use {@link #getKeyValue(String, String, String) instead
-     * @return Misc Meta Info (or "" if not found);
-     */
-    @Deprecated
-    public String getMetaInfo(final String metainfo) {
-        return getMetaInfo(metainfo, "");
-    }
-
-    /**
-     * Get misc meta-information.
-     *
-     * @param metainfo The metainfo to return
-     * @param fallback Fallback value if requested value is not found
-     * @deprecated Use {@link #getKeyValue(String, String, String) instead
-     * @return Misc Meta Info (or fallback if not found);
-     */
-    @Deprecated
-    public String getMetaInfo(final String metainfo, final String fallback) {
-        return getKeyValue("misc", metainfo, fallback);
-    }
-
-    /**
-     * Get misc meta-information.
-     *
-     * @param metainfo The metainfos to look for in order. If the first item in
-     *                 the array is not found, the next will be looked for, and
-     *                 so on until either one is found, or none are found.
-     * @deprecated Use {@link #getKeyValue(String, String, String) instead
-     * @return Misc Meta Info (or "" if none are found);
-     */
-    @Deprecated
-    public String getMetaInfo(final String[] metainfo) {
-        return getMetaInfo(metainfo, "");
-    }
-
-    /**
-     * Get misc meta-information.
-     *
-     * @param metainfo The metainfos to look for in order. If the first item in
-     *                 the array is not found, the next will be looked for, and
-     *                 so on until either one is found, or none are found.
-     * @param fallback Fallback value if requested values are not found
-     * @deprecated Use {@link #getKeyValue(String, String, String) instead
-     * @return Misc Meta Info (or "" if none are found);
-     */
-    @Deprecated
-    public String getMetaInfo(final String[] metainfo, final String fallback) {
-        for (String meta : metainfo) {
-            final String result = getKeyValue("misc", meta, null);
-            if (result != null) {
-                return result;
-            }
-        }
-        return fallback;
-    }
-
     /**
      * Compares this object with the specified object for order.
      * Returns a negative integer, zero, or a positive integer as per String.compareTo();

src/com/dmdirc/plugins/PluginManager.java

@@ -70,7 +70,9 @@ public class PluginManager implements ActionListener {
     private PluginManager() {
         final String fs = System.getProperty("file.separator");
         myDir = Main.getConfigDir() + "plugins" + fs;
-        ActionManager.addListener(this, CoreActionType.CLIENT_PREFS_OPENED, CoreActionType.CLIENT_PREFS_CLOSED);
+        ActionManager.getActionManager().registerListener(this,
+                CoreActionType.CLIENT_PREFS_OPENED,
+                CoreActionType.CLIENT_PREFS_CLOSED);
     }
 
     /**
@@ -274,8 +276,8 @@ public class PluginManager implements ActionListener {
             if (requirements.isEmpty()) {
                 knownPlugins.put(filename.toLowerCase(), pluginInfo);
 
-                ActionManager.processEvent(CoreActionType.PLUGIN_REFRESH, null,
-                        this);
+                ActionManager.getActionManager().triggerEvent(
+                        CoreActionType.PLUGIN_REFRESH, null, this);
                 return true;
             } else {
                 throw new PluginException("Plugin " + filename + " was not loaded, one or more requirements not met (" + requirements + ")");
@@ -451,7 +453,8 @@ public class PluginManager implements ActionListener {
             }
         }
 
-        ActionManager.processEvent(CoreActionType.PLUGIN_REFRESH, null, this);
+        ActionManager.getActionManager().triggerEvent(
+                CoreActionType.PLUGIN_REFRESH, null, this);
         return new LinkedList<PluginInfo>(res.values());
     }
 

src/com/dmdirc/ui/WindowManager.java

@@ -32,7 +32,6 @@ import com.dmdirc.interfaces.SelectionListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.interfaces.FrameListener;
-import com.dmdirc.ui.interfaces.Window;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -159,34 +158,6 @@ public class WindowManager {
         fireAddWindow(window, focus);
     }
 
-    /**
-     * Adds a new root window to the Window Manager.
-     *
-     * @param window The window to be added
-     * @deprecated Use {@link #addWindow(com.dmdirc.FrameContainer)}
-     */
-    @Deprecated
-    public static void addWindow(final Window window) {
-        Logger.assertTrue(window != null);
-
-        addWindow(window.getContainer());
-    }
-
-    /**
-     * Adds a new child window to the Window Manager.
-     *
-     * @param parent The parent window
-     * @param child The child window to be added
-     * @deprecated Use {@link #addWindow(com.dmdirc.FrameContainer, com.dmdirc.FrameContainer)}
-     */
-    @Deprecated
-    public static void addWindow(final Window parent, final Window child) {
-        Logger.assertTrue(parent != null);
-        Logger.assertTrue(child != null);
-
-        addWindow(parent.getContainer(), child.getContainer());
-    }
-
     /**
      * Adds a new child window to the Window Manager.
      *
@@ -243,30 +214,6 @@ public class WindowManager {
                 || isInHierarchy(target.getParent()));
     }
 
-    /**
-     * Removes a window from the Window Manager. If the specified window
-     * has child windows, they are recursively removed before the target window.
-     * If the window hasn't previously been added, the request to remove it is
-     * ignored.
-     * <p>
-     * This method will not block, but may instead create a new thread in order
-     * to wait for child windows to be terminated. {@link FrameContainer}s
-     * calling this method should persist resource references until after the
-     * {@link FrameContainer#windowClosed()} method is called, to ensure
-     * correct state when the window deleted listeners are fired at a later
-     * time. See the documentation at {@link FrameContainer#windowClosing()} for
-     * further explanation.
-     *
-     * @see FrameContainer#windowClosing()
-     * @param window The window to be removed
-     * @deprecated Use {@link #removeWindow(com.dmdirc.FrameContainer)}
-     */
-    @Deprecated
-    public static void removeWindow(final Window window) {
-        Logger.assertTrue(window != null);
-        removeWindow(window.getContainer());
-    }
-
     /**
      * Removes a window from the Window Manager. If the specified window
      * has child windows, they are recursively removed before the target window.
@@ -413,20 +360,6 @@ public class WindowManager {
         return null;
     }
 
-    /**
-     * Retrieves the parent window of the specified window. If the window
-     * has no parent (i.e., it is a root window or it has not been added),
-     * returns null.
-     *
-     * @param window The window whose parent is being sought
-     * @return The parent of the specified window, or null if not found
-     * @deprecated Call {@link FrameContainer#getParent()} directly
-     */
-    @Deprecated
-    public static FrameContainer<?> getParent(final FrameContainer<?> window) {
-        return window.getParent();
-    }
-
     /**
      * Retrieves all known root (parent-less) windows.
      *
@@ -457,19 +390,6 @@ public class WindowManager {
         return activeWindow == null ? null : getActiveWindow().getServer();
     }
 
-    /**
-     * Retrieves all children of the specified window.
-     *
-     * @since 0.6.4
-     * @param window The window whose children are being requested
-     * @return A collection of all known child windows.
-     * @deprecated Call {@link FrameContainer#getChildren()} directly
-     */
-    @Deprecated
-    public static Collection<FrameContainer<?>> getChildren(final FrameContainer<?> window) {
-        return window.getChildren();
-    }
-
     /**
      * Fires the addWindow(Window) callback.
      *
@@ -532,7 +452,8 @@ public class WindowManager {
             listener.selectionChanged(window);
         }
 
-        ActionManager.processEvent(CoreActionType.CLIENT_FRAME_CHANGED, null, window);
+        ActionManager.getActionManager().triggerEvent(
+                CoreActionType.CLIENT_FRAME_CHANGED, null, window);
     }
 
     /**
@@ -550,4 +471,4 @@ public class WindowManager {
 
     }
 
-}
+}

src/com/dmdirc/ui/core/util/URLHandler.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.ui.core.util;
 
-import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
@@ -63,20 +62,6 @@ public class URLHandler {
         this.desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null;
     }
 
-    /**
-     * Gets an instance of URLHandler.
-     *
-     * @return URLHandler instance
-     * @deprecated This will return a URLHandler for a random UI which may not
-     * implement the required methods. It will probably break. Users of this
-     * class must create instances of URLHandler directly with an appropriate
-     * UIController.
-     */
-    @Deprecated
-    public static URLHandler getURLHander() {
-        return new URLHandler(Main.getUI());
-    }
-
     /**
      * Launches an application for a given url.
      *

src/com/dmdirc/ui/input/InputHandler.java

@@ -386,16 +386,6 @@ public abstract class InputHandler implements ConfigChangeListener {
         return new ArrayList<String>(buffer.getList());
     }
 
-    /**
-     * Handles tab completion of a string. Called when the user presses tab.
-     *
-     * @deprecated Preferred method is {@link doTabCompletion(boolean)}
-     */
-    @Deprecated
-    protected void doTabCompletion() {
-        doTabCompletion(false);
-    }
-
     /**
      * Handles tab completion of a string. Called when the user presses
      * (shift) tab.

src/com/dmdirc/ui/interfaces/InputWindow.java

@@ -23,7 +23,6 @@
 package com.dmdirc.ui.interfaces;
 
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.input.InputHandler;
 
 /**
@@ -34,16 +33,6 @@ import com.dmdirc.ui.input.InputHandler;
  */
 public interface InputWindow extends Window {
 
-    /**
-     * Retrieves the command Parser for this input window.
-     *
-     * @return This window's command parser
-     *
-     * @deprecated Use {@link WritableFrameContainer.getCommandParser()} instead
-     */
-    @Deprecated
-    CommandParser getCommandParser();
-
     /**
      * Retrieves the input handler for this input window.
      *
@@ -51,16 +40,6 @@ public interface InputWindow extends Window {
      */
     InputHandler getInputHandler();
 
-    /**
-     * Toggles the away-status indicator for this input window, if the UI
-     * supports it.
-     *
-     * @param isAway Whether the away indicator should be displayed or not
-     * @deprecated Use {@link AwayStateListener}s to listen for changes instead
-     */
-    @Deprecated
-    void setAwayIndicator(boolean isAway);
-
     /**
      * Retrieves the container that owns this command window.
      *

src/com/dmdirc/ui/interfaces/MainWindow.java

@@ -41,20 +41,6 @@ public interface MainWindow {
      */
     void quit();
 
-    /**
-     * Sets whether or not the internal frame state is currently maximised.
-     *
-     * @param max whether the frame is maxomised
-     */
-    void setMaximised(final boolean max);
-
-    /**
-     * Gets whether or not the internal frame state is currently maximised.
-     *
-     * @return True iff frames should be maximised, false otherwise
-     */
-    boolean getMaximised();
-
     /**
      * Returns a prefix for use in the titlebar. Includes the version number
      * if the config option is set.

src/com/dmdirc/ui/interfaces/UIController.java

@@ -23,10 +23,7 @@
 package com.dmdirc.ui.interfaces;
 
 import com.dmdirc.Channel;
-import com.dmdirc.FrameContainer;
-import com.dmdirc.Query;
 import com.dmdirc.Server;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
 import com.dmdirc.updater.Update;
@@ -49,71 +46,6 @@ public interface UIController {
      */
     MainWindow getMainWindow();
 
-    /**
-     * Retrieves the status bar component used by this UI.
-     *
-     * @deprecated Should not be used externally - use the
-     * {@link com.dmdirc.ui.core.components.StatusBarManager} instead.
-     * @return This UI's status bar
-     */
-    @Deprecated
-    StatusBar getStatusBar();
-
-    /**
-     * Creates a channel window for the specified channel.
-     *
-     * @param channel The channel that is requesting a window be made
-     * @return A new channel window for the specified channel
-     * @deprecated Controllers should listen for window events using a
-     * {@link FrameListener} and create windows as needed.
-     */
-    @Deprecated
-    ChannelWindow getChannel(Channel channel);
-
-    /**
-     * Creates a server window for the specified server.
-     *
-     * @param server The server that is requesting a window be made
-     * @return A new server window for the specified server
-     * @deprecated Controllers should listen for window events using a
-     * {@link FrameListener} and create windows as needed.
-     */
-    @Deprecated
-    ServerWindow getServer(Server server);
-
-    /**
-     * Creates a query window for the specified query.
-     *
-     * @param query The query that is requesting a window be made
-     * @return A new query window for the specified query
-     * @deprecated Controllers should listen for window events using a
-     * {@link FrameListener} and create windows as needed.
-     */
-    @Deprecated
-    QueryWindow getQuery(Query query);
-
-    /**
-     * Creates a new custom window instance.
-     *
-     * @param owner The owner of the input window
-     * @return A new custom window
-     * @deprecated Controllers should listen for window events using a
-     * {@link FrameListener} and create windows as needed.
-     */
-    @Deprecated
-    Window getWindow(FrameContainer<?> owner);
-
-    /**
-     * Creates a new custom input window instance.
-     *
-     * @param owner The owner of the input window
-     * @return A new custom input window
-     * @deprecated Controllers should listen for window events using a
-     * {@link FrameListener} and create windows as needed.
-     */
-    @Deprecated
-    InputWindow getInputWindow(WritableFrameContainer<?> owner);
-
     /**
      * Returns an updater dialog for the specified updates.
      *
@@ -128,14 +60,6 @@ public interface UIController {
      */
     void showFirstRunWizard();
 
-    /**
-     * Shows the (addons) migration wizard for the ui.
-     *
-     * @deprecated Migration wizard is no longer used or needed
-     */
-    @Deprecated
-    void showMigrationWizard();
-
     /**
      * Shows the SSL certificate information dialog.
      *
@@ -163,24 +87,6 @@ public interface UIController {
      */
     void initUISettings();
 
-    /**
-     * Returns the active window.
-     *
-     * @return Active window or null
-     * @deprecated Use {@link WindowManager#getActiveWindow()} instead
-     */
-    @Deprecated
-    Window getActiveWindow();
-
-    /**
-     * Returns the active server.
-     *
-     * @return Active server null
-     * @deprecated Use {@link WindowManager#getActiveServer()} instead
-     */
-    @Deprecated
-    Server getActiveServer();
-
     /**
      * Shows the unknown URL protocol handling dialog for a URL.
      *

src/com/dmdirc/ui/interfaces/Window.java

@@ -23,8 +23,6 @@
 package com.dmdirc.ui.interfaces;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.config.ConfigManager;
-import com.dmdirc.util.StringTranscoder;
 
 /**
  * The Window interface specifies common methods that should be implemented
@@ -32,55 +30,6 @@ import com.dmdirc.util.StringTranscoder;
  */
 public interface Window {
 
-    /**
-     * Formats the arguments using the Formatter, then adds the result to the
-     * main text area.
-     *
-     * @param messageType The type of this message
-     * @param args The arguments for the message
-     * @deprecated Use corresponding methods in {@link FrameContainer} instead
-     */
-    @Deprecated
-    void addLine(String messageType, Object... args);
-
-    /**
-     * Formats the arguments using the Formatter, then adds the result to the
-     * main text area.
-     *
-     * @param messageType The type of this message
-     * @param args The arguments for the message
-     * @deprecated Use corresponding methods in {@link FrameContainer} instead
-     */
-    @Deprecated
-    void addLine(StringBuffer messageType, Object... args);
-
-    /**
-     * Adds the specified raw line to the window, without using a formatter.
-     *
-     * @param line The line to be added
-     * @param timestamp Whether or not to display the timestamp for this line
-     * @deprecated Use corresponding methods in {@link FrameContainer} instead
-     */
-    @Deprecated
-    void addLine(final String line, final boolean timestamp);
-
-    /**
-     * Clears the main text area of the command window.
-     *
-     * @deprecated Call {@link IRCDocument#clear()} via {@link FrameContainer#getDocument()}
-     */
-    @Deprecated
-    void clear();
-
-    /**
-     * Retrieves the config manager for this command window.
-     *
-     * @return This window's config manager
-     * @deprecated Use {@link FrameContainer#getConfigManager()}
-     */
-    @Deprecated
-    ConfigManager getConfigManager();
-
     /**
      * Retrieves the container that owns this command window.
      *
@@ -88,101 +37,11 @@ public interface Window {
      */
     FrameContainer<?> getContainer();
 
-    /**
-     * Determines if the current window is visible.
-     *
-     * @return boolean visibility
-     * @deprecated With MDI removal, the client no longer has a concept of
-     * visibility
-     */
-    @Deprecated
-    boolean isVisible();
-
-    /**
-     * Sets the visibility of this window.
-     *
-     * @param isVisible Whether the window should be visible or not
-     * @deprecated With MDI removal, the client no longer has a concept of
-     * visibility
-     */
-    @Deprecated
-    void setVisible(boolean isVisible);
-
-    /**
-     * Retrives the current title of this window.
-     *
-     * @return This window's title
-     * @deprecated Use {@link FrameContainer#getTitle()} instead
-     */
-    @Deprecated
-    String getTitle();
-
-    /**
-     * Determines if this frame is currently maximised.
-     *
-     * @return true if the frame is maximised, false otherwise
-     * @deprecated This shouldn't be used outside the UI
-     */
-    @Deprecated
-    boolean isMaximum();
-
-    /**
-     * Sets the title of this window.
-     *
-     * @param title The new title to be used.
-     * @deprecated Should use {@link FrameContainer#setTitle(java.lang.String)}
-     */
-    @Deprecated
-    void setTitle(String title);
-
     /**
      * Opens this window.
      */
     void open();
 
-    /**
-     * Restores this window.
-     *
-     * @since 0.6.3m1
-     * @deprecated This shouldn't be used outside the UI
-     */
-    @Deprecated
-    void restore();
-
-    /**
-     * Maximises this window.
-     *
-     * @since 0.6.3m1
-     * @deprecated This shouldn't be used outside the UI
-     */
-    @Deprecated
-    void maximise();
-
-    /**
-     * Toggles Maximise State.
-     *
-     * @since 0.6.3m1
-     * @deprecated This shouldn't be used outside the UI
-     */
-    @Deprecated
-    void toggleMaximise();
-
-    /**
-     * Minimises this window.
-     * @deprecated This shouldn't be used outside the UI
-     */
-    @Deprecated
-    void minimise();
-
-    /**
-     * Returns the transcoder that is being used by the UI.
-     *
-     * @return This window's transcoder
-     * @deprecated Use {@link FrameContainer#getTranscoder()} instead
-     */
-    @Deprecated
-    StringTranscoder getTranscoder();
-
     /** Closes this window. */
     void close();
 

src/com/dmdirc/ui/messages/IRCDocument.java

@@ -116,41 +116,6 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
         }
     }
 
-    /**
-     * Adds the stylised string to the canvas.
-     *
-     * @param text stylised string to add to the text
-     * @deprecated Use {@link #addText(java.util.List)} instead
-     */
-    @Deprecated
-    public void addText(final String[] text) {
-        final int index;
-        synchronized (lines) {
-            final Line line = new Line(styliser, text, fontSize, fontName);
-            lines.add(line);
-            index = lines.indexOf(line);
-        }
-        fireLineAdded(index);
-    }
-
-    /**
-     * Adds the stylised string to the canvas.
-     *
-     * @param text stylised string to add to the text
-     * @param lineHeight Line height for the new line of text
-     * @deprecated Use {@link #addText(java.util.List)} instead
-     */
-    @Deprecated
-    public void addText(final String[] text, final int lineHeight) {
-        final int index;
-        synchronized (lines) {
-            final Line line = new Line(styliser, text, lineHeight, fontName);
-            lines.add(line);
-            index = lines.indexOf(line);
-        }
-        fireLineAdded(index);
-    }
-
     /**
      * Adds the stylised string to the canvas.
      *
@@ -237,21 +202,6 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
         listeners.remove(IRCDocumentListener.class, listener);
     }
 
-    /**
-     * Fires the line added method on all listeners.
-     *
-     * @param index Index of the added line
-     * @deprecated Use {@link #fireLinesAdded(int, int)} instead
-     */
-    @Deprecated
-    protected void fireLineAdded(final int index) {
-        for (IRCDocumentListener listener
-                : listeners.get(IRCDocumentListener.class)) {
-            listener.lineAdded(index, lines.size());
-        }
-        trim(frameBufferSize);
-    }
-
     /**
      * Fires the lines added method on all listeners.
      *

src/com/dmdirc/ui/messages/IRCDocumentListener.java

@@ -29,16 +29,6 @@ import java.util.EventListener;
  */
 public interface IRCDocumentListener extends EventListener {
 
-    /**
-     * A line has been added to the textpane.
-     *
-     * @param line Index of the added line
-     * @param size New number of lines
-     * @deprecated Use {@link #linesAdded(line, length, size)}
-     */
-    @Deprecated
-    void lineAdded(final int line, final int size);
-
     /**
      * A line has been added to the textpane.
      *

src/com/dmdirc/ui/themes/ThemeIdentity.java

@@ -63,19 +63,6 @@ public class ThemeIdentity extends Identity {
         this.theme = theme;
     }
 
-    /** {@inheritDoc} */
-    @Override @Deprecated
-    public boolean hasOption(final String domain, final String option,
-            final Validator<String> validator) {
-        if (domain.equalsIgnoreCase("ui") || domain.equalsIgnoreCase("identity")
-                || domain.equalsIgnoreCase("icon")  || domain.equalsIgnoreCase("theme")
-                || domain.equalsIgnoreCase("formatter") || domain.equalsIgnoreCase("colour")) {
-            return super.hasOption(domain, option, validator);
-        } else {
-            return false;
-        }
-    }
-
     /** {@inheritDoc} */
     @Override
     public String getOption(final String domain,

test/com/dmdirc/ServerManagerTest.java

@@ -38,7 +38,6 @@ public class ServerManagerTest {
     @BeforeClass
     public static void setUp() throws Exception {
         IdentityManager.load();
-        Main.setUI(new DummyController());
         Main.ensureExists(PluginManager.getPluginManager(), "tabcompletion");
     }
 

test/com/dmdirc/ServerTest.java

@@ -23,7 +23,6 @@
 package com.dmdirc;
 
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.addons.ui_dummy.DummyController;
 
 import java.net.URI;
 import org.junit.BeforeClass;
@@ -36,11 +35,10 @@ public class ServerTest {
 
     @BeforeClass
     public static void setUp() throws Exception {
-        Main.setUI(new DummyController());
         Main.extractCorePlugins("tabcompletion_");
         IdentityManager.load();
         server = new Server(new URI("irc-test://255.255.255.255"),
-                IdentityManager.getProfiles().get(0));
+                IdentityManager.getCustomIdentities("profile").get(0));
         server.connect();
     }
 

test/com/dmdirc/config/prefs/PreferencesManagerTest.java

@@ -24,7 +24,6 @@ package com.dmdirc.config.prefs;
 import com.dmdirc.Main;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionListener;
 
@@ -43,7 +42,6 @@ public class PreferencesManagerTest {
     public static void setUp() throws Exception {
         IdentityManager.load();
         Main.extractCorePlugins("ui_");
-        Main.setUI(new SwingController());
         PluginManager.getPluginManager();
         controller = mock(UIController.class);
     }

test/com/dmdirc/ui/WindowManagerTest.java

@@ -50,7 +50,7 @@ public class WindowManagerTest {
         verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), eq(true));
         verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), (FrameContainer<?>) anyObject(), eq(true));
         
-        WindowManager.addWindow(parent);
+        WindowManager.addWindow(parent.getContainer());
         
         verify(tfm).addWindow(same(parent.getContainer()), eq(true));
         verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), (FrameContainer<?>) anyObject(), eq(true));
@@ -61,10 +61,10 @@ public class WindowManagerTest {
         final FrameListener tfm = mock(FrameListener.class);
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
         final Window child = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
-        WindowManager.addWindow(parent);
+        WindowManager.addWindow(parent.getContainer());
         WindowManager.addFrameListener(tfm);
         
-        WindowManager.addWindow(parent, child);
+        WindowManager.addWindow(parent.getContainer(), child.getContainer());
         
         verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), eq(true));
         verify(tfm).addWindow(same(parent.getContainer()), same(child.getContainer()), eq(true));
@@ -74,10 +74,10 @@ public class WindowManagerTest {
     public void testRemoveRoot() {
         final FrameListener tfm = mock(FrameListener.class);
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
-        WindowManager.addWindow(parent);
+        WindowManager.addWindow(parent.getContainer());
         WindowManager.addFrameListener(tfm);
 
-        WindowManager.removeWindow(parent);
+        WindowManager.removeWindow(parent.getContainer());
         
         verify(tfm).delWindow(same(parent.getContainer()));
     }
@@ -87,11 +87,11 @@ public class WindowManagerTest {
         final FrameListener tfm = mock(FrameListener.class);
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
         final Window child = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
-        WindowManager.addWindow(parent);
-        WindowManager.addWindow(parent, child);
+        WindowManager.addWindow(parent.getContainer());
+        WindowManager.addWindow(parent.getContainer(), child.getContainer());
         WindowManager.addFrameListener(tfm);
 
-        WindowManager.removeWindow(child);
+        WindowManager.removeWindow(child.getContainer());
 
         verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), eq(true));
         verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), (FrameContainer<?>) anyObject(), eq(true));
@@ -104,12 +104,12 @@ public class WindowManagerTest {
         final FrameListener tfm = mock(FrameListener.class);
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
         final Window child = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
-        WindowManager.addWindow(parent);
+        WindowManager.addWindow(parent.getContainer());
         
         WindowManager.addFrameListener(tfm);
 
         WindowManager.removeFrameListener(tfm);
-        WindowManager.addWindow(parent, child);
+        WindowManager.addWindow(parent.getContainer(), child.getContainer());
         
         verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), eq(true));
         verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), (FrameContainer<?>) anyObject(), eq(true));