Remove singleton calls from DCC plugin.

Change-Id: I1584ffcd5367af8e0fbe01c24eb09d2bb2bae707
Reviewed-on: http://gerrit.dmdirc.com/2253
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/dcc/ChatContainer.java

@@ -25,6 +25,7 @@ package com.dmdirc.addons.dcc;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.dcc.actions.DCCActions;
 import com.dmdirc.addons.dcc.io.DCCChat;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 
@@ -47,16 +48,19 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
      *
      * @param plugin the DCC Plugin responsible for this window
      * @param dcc The DCCChat object this window wraps around
+     * @param configManager Config manager
      * @param title The title of this window
      * @param nick My Current Nickname
      * @param targetNick Nickname of target
      */
     public ChatContainer(final DCCPlugin plugin, final DCCChat dcc,
-            final String title, final String nick, final String targetNick) {
-        super(title, "dcc-chat-inactive",DCCCommandParser.getDCCCommandParser(),
+            final ConfigManager configManager, final String title,
+            final String nick, final String targetNick) {
+        super(title, "dcc-chat-inactive", configManager,
+                DCCCommandParser.getDCCCommandParser(),
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                 WindowComponent.INPUTFIELD.getIdentifier()));
-        this.dccChat = dcc;
+        dccChat = dcc;
         dcc.setHandler(this);
         nickname = nick;
         otherNickname = targetNick;

src/com/dmdirc/addons/dcc/DCCCommand.java

@@ -30,7 +30,7 @@ import com.dmdirc.addons.dcc.io.DCC;
 import com.dmdirc.addons.dcc.io.DCCChat;
 import com.dmdirc.addons.dcc.io.DCCTransfer;
 import com.dmdirc.addons.dcc.kde.KFileChooser;
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -39,9 +39,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -62,14 +60,18 @@ public class DCCCommand extends Command implements IntelligentCommand {
 
     /** My Plugin. */
     private final DCCPlugin myPlugin;
+    /** Main frame instance used as the parent for dialogs. */
+    private final MainFrame mainFrame;
 
     /**
      * Creates a new instance of DCCCommand.
      *
+     * @param mainFrame mainFrame instance to use
      * @param plugin The DCC Plugin that this command belongs to
      */
-    public DCCCommand(final DCCPlugin plugin) {
+    public DCCCommand(final MainFrame mainFrame, final DCCPlugin plugin) {
         super();
+        this.mainFrame = mainFrame;
         myPlugin = plugin;
     }
 
@@ -137,6 +139,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
         final DCCChat chat = new DCCChat();
         if (myPlugin.listen(chat)) {
             final ChatContainer window = new ChatContainer(myPlugin, chat,
+                    origin.getConfigManager(),
                     "*Chat: " + target, myNickname, target);
             parser.sendCTCP(target, "DCC", "CHAT chat " + DCC.ipToLong(
                     myPlugin.getListenIP(parser)) + " " + chat.getPort());
@@ -173,17 +176,19 @@ public class DCCCommand extends Command implements IntelligentCommand {
             @Override
             public void run() {
                 final JFileChooser jc = givenFile.exists()
-                        ? KFileChooser.getFileChooser(myPlugin, givenFile)
-                        : KFileChooser.getFileChooser(myPlugin);
+                        ? KFileChooser.getFileChooser(origin.getConfigManager(),
+                                myPlugin, givenFile)
+                        : KFileChooser.getFileChooser(origin.getConfigManager(),
+                                myPlugin);
                 final int result = showFileChooser(givenFile, target, jc);
                 if (result != JFileChooser.APPROVE_OPTION
                         || !handleInvalidItems(jc)) {
                     return;
                 }
-                final DCCTransfer send = new DCCTransfer(IdentityManager
-                        .getGlobalConfig().getOptionInt(myPlugin.getDomain(),
+                final DCCTransfer send = new DCCTransfer(origin
+                        .getConfigManager().getOptionInt(myPlugin.getDomain(),
                         "send.blocksize"));
-                send.setTurbo(IdentityManager.getGlobalConfig().getOptionBool(
+                send.setTurbo(origin.getConfigManager().getOptionBool(
                         myPlugin.getDomain(), "send.forceturbo"));
                 send.setType(DCCTransfer.TransferType.SEND);
 
@@ -197,10 +202,11 @@ public class DCCCommand extends Command implements IntelligentCommand {
                 send.setFileName(jc.getSelectedFile().getAbsolutePath());
                 send.setFileSize(jc.getSelectedFile().length());
 
-                if (IdentityManager.getGlobalConfig().getOptionBool(
+                if (origin.getConfigManager().getOptionBool(
                         myPlugin.getDomain(), "send.reverse")) {
                     final Parser parser = server.getParser();
-                    new TransferContainer(myPlugin, send, "Send: " + target,
+                    new TransferContainer(myPlugin, send,
+                            origin.getConfigManager(), "Send: " + target,
                             target, server);
                     parser.sendCTCP(target, "DCC", "SEND \""
                             + jc.getSelectedFile().getName() + "\" "
@@ -211,7 +217,8 @@ public class DCCCommand extends Command implements IntelligentCommand {
                 } else {
                     final Parser parser = server.getParser();
                     if (myPlugin.listen(send)) {
-                        new TransferContainer(myPlugin, send, "*Send: "
+                        new TransferContainer(myPlugin, send,
+                                origin.getConfigManager(), "*Send: "
                                 + target, target, server);
                         parser.sendCTCP(target, "DCC", "SEND \""
                                 + jc.getSelectedFile().getName() + "\" "
@@ -274,9 +281,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
         jc.setDialogTitle("Send file to " + target + " - DMDirc ");
         jc.setFileSelectionMode(JFileChooser.FILES_ONLY);
         jc.setMultiSelectionEnabled(false);
-        return jc.showOpenDialog(((SwingController) PluginManager
-                .getPluginManager().getPluginInfoByName("ui_swing")
-                .getPlugin()).getMainFrame());
+        return jc.showOpenDialog(mainFrame);
         }
     }
 

src/com/dmdirc/addons/dcc/DCCFrameContainer.java

@@ -25,7 +25,7 @@ package com.dmdirc.addons.dcc;
 import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.ui.input.TabCompleter;
 
 import java.util.Collection;
@@ -43,13 +43,14 @@ public abstract class DCCFrameContainer extends WritableFrameContainer {
      *
      * @param title The title of this window
      * @param icon The icon to use
+     * @param configManager Config manager
      * @param parser Command parser to use for this window
      * @param components The UI components that this frame requires
      */
     public DCCFrameContainer(final String title, final String icon,
-            final CommandParser parser, final Collection<String> components) {
-        super(icon, title, title, IdentityManager.getGlobalConfig(), parser,
-                components);
+            final ConfigManager configManager, final CommandParser parser,
+            final Collection<String> components) {
+        super(icon, title, title, configManager, parser, components);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/dcc/DCCPlugin.java

@@ -26,7 +26,6 @@ import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.dcc.actions.DCCActions;
 import com.dmdirc.addons.dcc.io.DCC;
 import com.dmdirc.addons.dcc.io.DCCChat;
@@ -35,6 +34,7 @@ import com.dmdirc.addons.dcc.kde.KFileChooser;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.components.frames.ComponentFrame;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -43,13 +43,13 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.WindowManager;
 
 import java.io.File;
@@ -71,6 +71,10 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
     private PlaceholderContainer container;
     /** This plugin's plugin info. */
     private final PluginInfo pluginInfo;
+    /** Config manager to read settings from. */
+    private final ConfigManager config;
+    /** Parent swing controller. */
+    private final SwingController controller;
 
     /**
      * Creates a new instance of this plugin.
@@ -81,8 +85,11 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
     public DCCPlugin(final SwingController controller,
             final PluginInfo pluginInfo) {
         super();
+        this.controller = controller;
+        config = controller.getGlobalConfig();
         this.pluginInfo = pluginInfo;
-        registerCommand(new DCCCommand(this), DCCCommand.INFO);
+        registerCommand(new DCCCommand(controller.getMainFrame(), this),
+                DCCCommand.INFO);
         final SwingWindowFactory factory = controller.getWindowFactory();
         factory.registerImplementation(new HashSet<String>(Arrays.asList(
                 "com.dmdirc.addons.dcc.ui.PlaceholderPanel")),
@@ -139,12 +146,11 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                final JFileChooser jc = KFileChooser.getFileChooser(
-                        DCCPlugin.this, IdentityManager.getGlobalConfig()
-                        .getOption(getDomain(), "receive.savelocation"));
+                final JFileChooser jc = KFileChooser.getFileChooser(config,
+                        DCCPlugin.this,
+                        config.getOption(getDomain(), "receive.savelocation"));
                 int result;
-                if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(),
-                        "receive.autoaccept")) {
+                if (config.getOptionBool(getDomain(), "receive.autoaccept")) {
                     result = JFileChooser.APPROVE_OPTION;
                 } else {
                     result = showFileChooser(send, jc);
@@ -158,12 +164,12 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
                 }
                 final boolean resume = handleResume(jc);
                 if (reverse && !token.isEmpty()) {
-                    new TransferContainer(DCCPlugin.this, send,
+                    new TransferContainer(DCCPlugin.this, send, config,
                             "*Receive: " + nickname, nickname, null);
                     send.setToken(token);
                     if (resume) {
-                        if (IdentityManager.getGlobalConfig().getOptionBool(
-                                getDomain(), "receive.reverse.sendtoken")) {
+                        if (config.getOptionBool(getDomain(),
+                                "receive.reverse.sendtoken")) {
                             parser.sendCTCP(nickname, "DCC", "RESUME "
                                     + send.getShortFileName() + " 0 "
                                     + jc.getSelectedFile().length() + " "
@@ -183,8 +189,8 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
                         }
                     }
                 } else {
-                    new TransferContainer(DCCPlugin.this, send, "Receive: "
-                            + nickname, nickname, null);
+                    new TransferContainer(DCCPlugin.this, send, config,
+                            "Receive: " + nickname, nickname, null);
                     if (resume) {
                         parser.sendCTCP(nickname, "DCC", "RESUME "
                                 + send.getShortFileName() + " "
@@ -216,13 +222,11 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
             final String token) {
         if (jc.getSelectedFile().exists() && send.getFileSize() > -1
                 && send.getFileSize() <= jc.getSelectedFile().length()) {
-            if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(),
-                    "receive.autoaccept")) {
+            if (config.getOptionBool(getDomain(), "receive.autoaccept")) {
                 return false;
             } else {
-                JOptionPane.showMessageDialog(((SwingController) PluginManager
-                        .getPluginManager().getPluginInfoByName("ui_swing")
-                        .getPlugin()).getMainFrame(), "This file has already "
+                JOptionPane.showMessageDialog(controller.getMainFrame(),
+                        "This file has already "
                         + "been completed, or is longer than the file you are "
                         + "receiving.\nPlease choose a different file.",
                         "Problem with selected file",
@@ -243,14 +247,11 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
      */
     private boolean handleResume(final JFileChooser jc) {
         if (jc.getSelectedFile().exists()) {
-            if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(),
-                    "receive.autoaccept")) {
+            if (config.getOptionBool(getDomain(), "receive.autoaccept")) {
                 return true;
             } else {
                 final int result = JOptionPane.showConfirmDialog(
-                        ((SwingController) PluginManager
-                        .getPluginManager().getPluginInfoByName("ui_swing")
-                        .getPlugin()).getMainFrame(), "This file exists already"
+                        controller.getMainFrame(), "This file exists already"
                         + ", do you want to resume an exisiting download?",
                         "Resume Download?", JOptionPane.YES_NO_OPTION);
                 return (result == JOptionPane.YES_OPTION);
@@ -278,9 +279,7 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
                 jc.setFileSelectionMode(JFileChooser.FILES_ONLY);
                 jc.setMultiSelectionEnabled(false);
                 jc.setSelectedFile(new File(send.getFileName()));
-        return jc.showSaveDialog(((SwingController) PluginManager
-                .getPluginManager().getPluginInfoByName("ui_swing")
-                .getPlugin()).getMainFrame());
+        return jc.showSaveDialog(controller.getMainFrame());
     }
 
     /** {@inheritDoc} */
@@ -299,14 +298,14 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
      * @return True if Socket was opened.
      */
     protected boolean listen(final DCC dcc) {
-        final boolean usePortRange = IdentityManager.getGlobalConfig()
-                .getOptionBool(getDomain(), "firewall.ports.usePortRange");
+        final boolean usePortRange = config.getOptionBool(getDomain(),
+                "firewall.ports.usePortRange");
         try {
             if (usePortRange) {
-                final int startPort = IdentityManager.getGlobalConfig()
-                        .getOptionInt(getDomain(), "firewall.ports.startPort");
-                final int endPort = IdentityManager.getGlobalConfig()
-                        .getOptionInt(getDomain(), "firewall.ports.endPort");
+                final int startPort = config.getOptionInt(getDomain(),
+                        "firewall.ports.startPort");
+                final int endPort = config.getOptionInt(getDomain(),
+                        "firewall.ports.endPort");
                 dcc.listen(startPort, endPort);
             } else {
                 dcc.listen();
@@ -328,8 +327,7 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
     public void handleProcessEvent(final ActionType type,
             final StringBuffer format, final boolean dontAsk,
             final Object... arguments) {
-        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(),
-                "receive.autoaccept") && !dontAsk) {
+        if (config.getOptionBool(getDomain(), "receive.autoaccept") && !dontAsk) {
             handleProcessEvent(type, format, true, arguments);
             return;
         }
@@ -375,14 +373,14 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
             }
             final String myNickname = ((Server) arguments[0]).getParser()
                     .getLocalClient().getNickname();
-            final DCCFrameContainer f = new ChatContainer(this, chat,
+            final DCCFrameContainer f = new ChatContainer(this, chat, config,
                     "Chat: " + nickname, myNickname, nickname);
             f.addLine("DCCChatStarting", nickname, chat.getHost(),
                     chat.getPort());
             chat.connect();
         } else {
             ActionManager.getActionManager().triggerEvent(
-                    DCCActions.DCC_CHAT_REQUEST, null, ((Server) arguments[0]),
+                    DCCActions.DCC_CHAT_REQUEST, null, arguments[0],
                     nickname);
             askQuestion("User " + nickname + " on "
                     + ((Server) arguments[0]).getName()
@@ -478,7 +476,7 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
             } else {
                 ActionManager.getActionManager().triggerEvent(
                         DCCActions.DCC_SEND_REQUEST, null,
-                        ((Server) arguments[0]), nickname, filename);
+                        arguments[0], nickname, filename);
                 askQuestion("User " + nickname + " on "
                         + ((Server) arguments[0]).getName()
                         + " would like to send you a file over DCC.\n\nFile: "
@@ -490,10 +488,9 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
         } else {
             final boolean newSend = send == null;
             if (newSend) {
-                send = new DCCTransfer(IdentityManager.getGlobalConfig()
-                        .getOptionInt(getDomain(), "send.blocksize"));
-                send.setTurbo(IdentityManager.getGlobalConfig().getOptionBool(
-                        getDomain(), "send.forceturbo"));
+                send = new DCCTransfer(config.getOptionInt(getDomain(),
+                        "send.blocksize"));
+                send.setTurbo(config.getOptionBool(getDomain(), "send.forceturbo"));
             }
             try {
                 send.setAddress(Long.parseLong(ip), Integer.parseInt(port));
@@ -628,14 +625,15 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
      * Create the container window.
      */
     protected void createContainer() {
-        container = new PlaceholderContainer(this);
+        container = new PlaceholderContainer(this, config, controller);
         WindowManager.getWindowManager().addWindow(container);
     }
 
     /** {@inheritDoc} */
     @Override
     public void domainUpdated() {
-        final Identity defaults = IdentityManager.getAddonIdentity();
+        final Identity defaults = IdentityManager.getIdentityManager()
+                .getGlobalAddonIdentity();
 
         defaults.setOption(getDomain(), "receive.savelocation",
                 Main.getConfigDir() + "downloads"
@@ -647,8 +645,8 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
      */
     @Override
     public void onLoad() {
-        final File dir = new File(IdentityManager.getGlobalConfig()
-                .getOption(getDomain(), "receive.savelocation"));
+        final File dir = new File(config.getOption(getDomain(),
+                "receive.savelocation"));
         if (dir.exists()) {
             if (!dir.isDirectory()) {
                 Logger.userError(ErrorLevel.LOW,
@@ -698,8 +696,7 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
      * @return The IP Address we should send as our listening IP.
      */
     public String getListenIP(final Parser parser) {
-        final String configIP = IdentityManager.getGlobalConfig().getOption(
-                getDomain(), "firewall.ip");
+        final String configIP = config.getOption(getDomain(), "firewall.ip");
         if (!configIP.isEmpty()) {
             try {
                 return InetAddress.getByName(configIP).getHostAddress();

src/com/dmdirc/addons/dcc/PlaceholderContainer.java

@@ -26,8 +26,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.config.ConfigManager;
 
 import java.awt.Dialog.ModalityType;
 import java.util.Arrays;
@@ -39,17 +38,22 @@ public class PlaceholderContainer extends FrameContainer {
 
     /** The plugin which owns this placeholder. */
     private final DCCPlugin plugin;
+    /** Parent swing controller. */
+    private final SwingController controller;
 
     /**
      * Creates a placeholder DCC frame.
      *
      * @param plugin The plugin which owns this placeholder
+     * @param config Config manager
+     * @param controller Swing controller
      */
-    public PlaceholderContainer(final DCCPlugin plugin) {
-        super("dcc", "DCCs", "DCCs", IdentityManager.getGlobalConfig(),
-                Arrays.asList("com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
-
+    public PlaceholderContainer(final DCCPlugin plugin,
+            final ConfigManager config, final SwingController controller) {
+        super("dcc", "DCCs", "DCCs", config, Arrays.asList(
+                "com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
         this.plugin = plugin;
+        this.controller = controller;
     }
 
     /** {@inheritDoc} */
@@ -66,9 +70,7 @@ public class PlaceholderContainer extends FrameContainer {
         }
 
         if (dccs > 0) {
-            new StandardQuestionDialog(((SwingController) PluginManager
-                    .getPluginManager().getPluginInfoByName("ui_swing")
-                    .getPlugin()), ModalityType.MODELESS,
+            new StandardQuestionDialog(controller, ModalityType.MODELESS,
                     "Close confirmation",
                     "Closing this window will cause all existing DCCs "
                     + "to terminate, are you sure you want to do this?") {

src/com/dmdirc/addons/dcc/TransferContainer.java

@@ -29,7 +29,7 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.dcc.actions.DCCActions;
 import com.dmdirc.addons.dcc.io.DCC;
 import com.dmdirc.addons.dcc.io.DCCTransfer;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
 import com.dmdirc.ui.WindowManager;
@@ -50,6 +50,9 @@ public class TransferContainer extends FrameContainer implements
     /** The dcc plugin that owns this frame */
     protected final DCCPlugin plugin;
 
+    /** Config manager. */
+    private final ConfigManager config;
+
     /** The Window we're using. */
     private boolean windowClosing = false;
 
@@ -84,21 +87,24 @@ public class TransferContainer extends FrameContainer implements
      *
      * @param plugin the DCC Plugin responsible for this window
      * @param dcc The DCCTransfer object this window wraps around
+     * @param configManager Config manager
      * @param title The title of this window
      * @param targetNick Nickname of target
      * @param server The server that initiated this send
      */
     public TransferContainer(final DCCPlugin plugin, final DCCTransfer dcc,
-            final String title, final String targetNick, final Server server) {
+            final ConfigManager config, final String title,
+            final String targetNick, final Server server) {
         super(dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
-                title, title, IdentityManager.getGlobalConfig(),
+                title, title, config,
                 Arrays.asList("com.dmdirc.addons.dcc.ui.TransferPanel"));
         this.plugin = plugin;
         this.dcc = dcc;
         this.server = server;
-        this.parser = server == null ? null : server.getParser();
-        this.myPlugin = plugin;
+        this.config = config;
+        parser = server == null ? null : server.getParser();
+        myPlugin = plugin;
 
         if (parser != null) {
             parser.getCallbackManager().addNonCriticalCallback(
@@ -152,8 +158,8 @@ public class TransferContainer extends FrameContainer implements
             percent = getPercent();
         }
 
-        final boolean percentageInTitle = IdentityManager.getGlobalConfig()
-                .getOptionBool(plugin.getDomain(), "general.percentageInTitle");
+        final boolean percentageInTitle = config.getOptionBool(
+                plugin.getDomain(), "general.percentageInTitle");
 
         if (percentageInTitle) {
             final StringBuilder title = new StringBuilder();
@@ -325,8 +331,7 @@ public class TransferContainer extends FrameContainer implements
                 }, "DCC-Error-Message");
                 errorThread.start();
             } else {
-                if (IdentityManager.getGlobalConfig().getOptionBool(
-                        plugin.getDomain(), "send.reverse")) {
+                if (config.getOptionBool(plugin.getDomain(), "send.reverse")) {
                     parser.sendCTCP(otherNickname, "DCC", "SEND \"" +
                             new File(dcc.getFileName()).getName() + "\" "
                             + DCC.ipToLong(myPlugin.getListenIP(parser))

src/com/dmdirc/addons/dcc/kde/KFileChooser.java

@@ -23,8 +23,7 @@
 package com.dmdirc.addons.dcc.kde;
 
 import com.dmdirc.addons.dcc.DCCPlugin;
-import com.dmdirc.config.IdentityManager;
-
+import com.dmdirc.config.ConfigManager;
 import java.awt.Component;
 import java.awt.HeadlessException;
 import java.io.File;
@@ -68,16 +67,19 @@ public final class KFileChooser extends JFileChooser {
 
     /** The plugin that this file chooser is for. */
     private final DCCPlugin plugin;
+    /** Used to read settings from. */
+    private final ConfigManager config;
 
     /**
      * Constructs a FileChooser pointing to the user's default directory.
      *
      * @param plugin The plugin that owns this KFileChooser
      */
-    private KFileChooser(final DCCPlugin plugin) {
+    private KFileChooser(final ConfigManager config, final DCCPlugin plugin) {
         super();
 
         this.plugin = plugin;
+        this.config = config;
     }
 
     /**
@@ -86,10 +88,11 @@ public final class KFileChooser extends JFileChooser {
      * @param plugin The plugin that owns this KFileChooser
      * @param currentDirectory Directory to use as the base directory
      */
-    private KFileChooser(final DCCPlugin plugin, final File currentDirectory) {
+    private KFileChooser(final ConfigManager config, final DCCPlugin plugin, final File currentDirectory) {
         super(currentDirectory);
 
         this.plugin = plugin;
+        this.config = config;
     }
 
     /**
@@ -99,10 +102,11 @@ public final class KFileChooser extends JFileChooser {
      * @param currentDirectory Directory to use as the base directory
      * @param fsv The FileSystemView to use
      */
-    private KFileChooser(final DCCPlugin plugin, final File currentDirectory, final FileSystemView fsv) {
+    private KFileChooser(final ConfigManager config, final DCCPlugin plugin, final File currentDirectory, final FileSystemView fsv) {
         super(currentDirectory, fsv);
 
         this.plugin = plugin;
+        this.config = config;
     }
 
     /**
@@ -111,10 +115,11 @@ public final class KFileChooser extends JFileChooser {
      * @param plugin The plugin that owns this KFileChooser
      * @param fsv The FileSystemView to use
      */
-    private KFileChooser(final DCCPlugin plugin, final FileSystemView fsv) {
+    private KFileChooser(final ConfigManager config, final DCCPlugin plugin, final FileSystemView fsv) {
         super(fsv);
 
         this.plugin = plugin;
+        this.config = config;
     }
 
     /**
@@ -123,10 +128,11 @@ public final class KFileChooser extends JFileChooser {
      * @param plugin The plugin that owns this KFileChooser
      * @param currentDirectoryPath Directory to use as the base directory
      */
-    private KFileChooser(final DCCPlugin plugin, final String currentDirectoryPath) {
+    private KFileChooser(final ConfigManager config, final DCCPlugin plugin, final String currentDirectoryPath) {
         super(currentDirectoryPath);
 
         this.plugin = plugin;
+        this.config = config;
     }
 
     /**
@@ -136,21 +142,23 @@ public final class KFileChooser extends JFileChooser {
      * @param currentDirectoryPath Directory to use as the base directory
      * @param fsv The FileSystemView to use
      */
-    private KFileChooser(final DCCPlugin plugin, final String currentDirectoryPath, final FileSystemView fsv) {
+    private KFileChooser(final ConfigManager config, final DCCPlugin plugin, final String currentDirectoryPath, final FileSystemView fsv) {
         super(currentDirectoryPath, fsv);
 
         this.plugin = plugin;
+        this.config = config;
     }
 
     /**
      * Should a KFileChooser be used rather than a JFileChooser?
      *
+     * @param config Config manager
      * @param plugin The DCC Plugin that is requesting a chooser
      * @return return true if getFileChooser() will return a KFileChooser not a
      *         JFileChooser
      */
-    public static boolean useKFileChooser(final DCCPlugin plugin) {
-        return KDialogProcess.hasKDialog() && IdentityManager.getGlobalConfig().getOptionBool(plugin.getDomain(), "general.useKFileChooser");
+    public static boolean useKFileChooser(final ConfigManager config, final DCCPlugin plugin) {
+        return KDialogProcess.hasKDialog() && config.getOptionBool(plugin.getDomain(), "general.useKFileChooser");
     }
 
     /**
@@ -159,8 +167,8 @@ public final class KFileChooser extends JFileChooser {
      * @param plugin The DCC Plugin that is requesting a chooser
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final DCCPlugin plugin) {
-        return useKFileChooser(plugin) ? new KFileChooser(plugin) : new JFileChooser();
+    public static JFileChooser getFileChooser(final ConfigManager config, final DCCPlugin plugin) {
+        return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin) : new JFileChooser();
     }
 
     /**
@@ -170,8 +178,8 @@ public final class KFileChooser extends JFileChooser {
      * @param currentDirectory Directory to use as the base directory
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final DCCPlugin plugin, final File currentDirectory) {
-        return useKFileChooser(plugin) ? new KFileChooser(plugin, currentDirectory) : new JFileChooser(currentDirectory);
+    public static JFileChooser getFileChooser(final ConfigManager config, final DCCPlugin plugin, final File currentDirectory) {
+        return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin, currentDirectory) : new JFileChooser(currentDirectory);
     }
 
     /**
@@ -182,8 +190,8 @@ public final class KFileChooser extends JFileChooser {
      * @param fsv The FileSystemView to use
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final DCCPlugin plugin, final File currentDirectory, final FileSystemView fsv) {
-        return useKFileChooser(plugin) ? new KFileChooser(plugin, currentDirectory, fsv) : new JFileChooser(currentDirectory, fsv);
+    public static JFileChooser getFileChooser(final ConfigManager config, final DCCPlugin plugin, final File currentDirectory, final FileSystemView fsv) {
+        return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin, currentDirectory, fsv) : new JFileChooser(currentDirectory, fsv);
     }
 
     /**
@@ -193,8 +201,8 @@ public final class KFileChooser extends JFileChooser {
      * @param fsv The FileSystemView to use
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final DCCPlugin plugin, final FileSystemView fsv) {
-        return useKFileChooser(plugin) ? new KFileChooser(plugin, fsv) : new JFileChooser(fsv);
+    public static JFileChooser getFileChooser(final ConfigManager config, final DCCPlugin plugin, final FileSystemView fsv) {
+        return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin, fsv) : new JFileChooser(fsv);
     }
 
     /**
@@ -204,8 +212,8 @@ public final class KFileChooser extends JFileChooser {
      * @param currentDirectoryPath Directory to use as the base directory
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final DCCPlugin plugin, final String currentDirectoryPath) {
-        return useKFileChooser(plugin) ? new KFileChooser(plugin, currentDirectoryPath) : new JFileChooser(currentDirectoryPath);
+    public static JFileChooser getFileChooser(final ConfigManager config, final DCCPlugin plugin, final String currentDirectoryPath) {
+        return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin, currentDirectoryPath) : new JFileChooser(currentDirectoryPath);
     }
 
     /**
@@ -216,8 +224,8 @@ public final class KFileChooser extends JFileChooser {
      * @param fsv The FileSystemView to use
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final DCCPlugin plugin, final String currentDirectoryPath, final FileSystemView fsv) {
-        return useKFileChooser(plugin) ? new KFileChooser(plugin, currentDirectoryPath, fsv) : new JFileChooser(currentDirectoryPath, fsv);
+    public static JFileChooser getFileChooser(final ConfigManager config, final DCCPlugin plugin, final String currentDirectoryPath, final FileSystemView fsv) {
+        return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin, currentDirectoryPath, fsv) : new JFileChooser(currentDirectoryPath, fsv);
     }
 
     /**
@@ -241,7 +249,7 @@ public final class KFileChooser extends JFileChooser {
     /** {@inheritDoc} */
     @Override
     public int showOpenDialog(final Component parent) throws HeadlessException {
-        if (!useKFileChooser(plugin)) {
+        if (!useKFileChooser(config, plugin)) {
             return super.showOpenDialog(parent);
         }
 
@@ -304,7 +312,7 @@ public final class KFileChooser extends JFileChooser {
     /** {@inheritDoc} */
     @Override
     public int showSaveDialog(final Component parent) throws HeadlessException {
-        if (!useKFileChooser(plugin)) {
+        if (!useKFileChooser(config, plugin)) {
             return super.showSaveDialog(parent);
         }