Daggerify the DCC plugin.

Rename old DCCPlugin to DCCManager and inflate it using dagger.

Also remove unused method in OsdPlugin.

Change-Id: Ie8eb84b187ff9bc9379bdae41fcc4ecec85b6964
Depends-On: I99ebc7d10f558008a7889252cc3c96f39747303e
Reviewed-on: http://gerrit.dmdirc.com/2861
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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

@@ -50,6 +50,7 @@ import com.dmdirc.ui.input.TabCompletionType;
 import java.io.File;
 import java.util.concurrent.Callable;
 
+import javax.inject.Inject;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 
@@ -64,7 +65,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
             CommandType.TYPE_SERVER);
 
     /** My Plugin. */
-    private final DCCPlugin myPlugin;
+    private final DCCManager myPlugin;
     /** Main frame instance used as the parent for dialogs. */
     private final MainFrame mainFrame;
     /** Window management. */
@@ -81,10 +82,11 @@ public class DCCCommand extends Command implements IntelligentCommand {
      * @param messageSinkManager The sink manager to use to despatch messages.
      * @param windowManager Window management
      */
+    @Inject
     public DCCCommand(
             final CommandController controller,
             final MainFrame mainFrame,
-            final DCCPlugin plugin,
+            final DCCManager plugin,
             final MessageSinkManager messageSinkManager,
             final WindowManager windowManager) {
         super(controller);

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

@@ -0,0 +1,812 @@
+/*
+ * Copyright (c) 2006-2013 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.dcc;
+
+import com.dmdirc.Server;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.addons.dcc.actions.DCCActions;
+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.SwingWindowFactory;
+import com.dmdirc.addons.ui_swing.components.frames.ComponentFrame;
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesCategory;
+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.CommandController;
+import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.interfaces.config.IdentityController;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.messages.MessageSinkManager;
+import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.ui.WindowManager;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.HashSet;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+
+import lombok.Getter;
+
+/**
+ * This plugin adds DCC to DMDirc.
+ */
+@Singleton
+public class DCCManager implements ActionListener {
+
+    /** Our DCC Container window. */
+    private PlaceholderContainer container;
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
+    /** Config manager to read settings from. */
+    private final AggregateConfigProvider config;
+    /** Parent swing controller. */
+    private final SwingController controller;
+    /** Identity controller to read settings from. */
+    private final IdentityController identityController;
+    /** The sink manager to use to despatch messages. */
+    private final MessageSinkManager messageSinkManager;
+    /** Window Management. */
+    private final WindowManager windowManager;
+    /** The command controller to use. */
+    private final CommandController commandController;
+    /** The configuration domain to use. */
+    @Getter
+    private final String domain;
+
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param controller The controller to register UI implementations with
+     * @param pluginInfo This plugin's plugin info
+     * @param identityController The Identity controller that provides the current config
+     * @param commandController Command controller to register commands
+     * @param messageSinkManager The sink manager to use to despatch messages.
+     * @param windowManager Window Management
+     */
+    @Inject
+    public DCCManager(
+            final SwingController controller,
+            final PluginInfo pluginInfo,
+            final IdentityController identityController,
+            final CommandController commandController,
+            final MessageSinkManager messageSinkManager,
+            final WindowManager windowManager) {
+        this.identityController = identityController;
+        this.controller = controller;
+        this.messageSinkManager = messageSinkManager;
+        this.windowManager = windowManager;
+        this.commandController = commandController;
+        this.domain = pluginInfo.getDomain();
+        config = controller.getGlobalConfig();
+        this.pluginInfo = pluginInfo;
+        final SwingWindowFactory factory = controller.getWindowFactory();
+        factory.registerImplementation(new HashSet<>(Arrays.asList(
+                "com.dmdirc.addons.dcc.ui.PlaceholderPanel")),
+                ComponentFrame.class);
+        factory.registerImplementation(new HashSet<>(Arrays.asList(
+                "com.dmdirc.addons.dcc.ui.TransferPanel")),
+                ComponentFrame.class);
+
+        final ConfigProvider defaults = identityController.getAddonSettings();
+        defaults.setOption(getDomain(), "receive.savelocation",
+                identityController.getConfigurationDirectory() + "downloads"
+                + System.getProperty("file.separator"));
+    }
+
+    /**
+     * Ask a question, if the answer is the answer required, then recall
+     * handleProcessEvent.
+     *
+     * @param question Question to ask
+     * @param title Title of question dialog
+     * @param desiredAnswer Answer required
+     * @param type Actiontype to pass back
+     * @param format StringBuffer to pass back
+     * @param arguments arguments to pass back
+     */
+    public void askQuestion(final String question, final String title,
+            final int desiredAnswer, final ActionType type,
+            final StringBuffer format, final Object... arguments) {
+        // New thread to ask the question in to stop us locking the UI
+        new Thread(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                final int result = JOptionPane.showConfirmDialog(null, question,
+                        title, JOptionPane.YES_NO_OPTION);
+                if (result == desiredAnswer) {
+                    handleProcessEvent(type, format, true, arguments);
+                }
+            }
+
+        }, "QuestionThread: " + title).start();
+    }
+
+    /**
+     * Ask the location to save a file, then start the download.
+     *
+     * @param nickname Person this dcc is from.
+     * @param send The DCCSend to save for.
+     * @param parser The parser this send was received on
+     * @param reverse Is this a reverse dcc?
+     * @param token Token used in reverse dcc.
+     */
+    public void saveFile(final String nickname, final DCCTransfer send,
+            final Parser parser, final boolean reverse, final String token) {
+        // New thread to ask the user where to save in to stop us locking the UI
+        new Thread(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                final JFileChooser jc = KFileChooser.getFileChooser(config,
+                        DCCManager.this,
+                        config.getOption(getDomain(), "receive.savelocation"));
+                int result;
+                if (config.getOptionBool(getDomain(), "receive.autoaccept")) {
+                    result = JFileChooser.APPROVE_OPTION;
+                } else {
+                    result = showFileChooser(send, jc);
+                }
+                if (result != JFileChooser.APPROVE_OPTION) {
+                    return;
+                }
+                send.setFileName(jc.getSelectedFile().getPath());
+                if (!handleExists(send, jc, nickname, parser,reverse, token)) {
+                    return;
+                }
+                final boolean resume = handleResume(jc);
+                if (reverse && !token.isEmpty()) {
+                    TransferContainer container = new TransferContainer(DCCManager.this, send,
+                            config, "*Receive: " + nickname, nickname, null);
+                    windowManager.addWindow(getContainer(), container);
+                    send.setToken(token);
+                    if (resume) {
+                        if (config.getOptionBool(getDomain(),
+                                "receive.reverse.sendtoken")) {
+                            parser.sendCTCP(nickname, "DCC", "RESUME "
+                                    + send.getShortFileName() + " 0 "
+                                    + jc.getSelectedFile().length() + " "
+                                    + token);
+                        } else {
+                            parser.sendCTCP(nickname, "DCC", "RESUME "
+                                    + send.getShortFileName() + " 0 "
+                                    + jc.getSelectedFile().length());
+                        }
+                    } else {
+                        if (listen(send)) {
+                            parser.sendCTCP(nickname, "DCC", "SEND "
+                                    + send.getShortFileName() + " "
+                                    + DCC.ipToLong(getListenIP(parser))
+                                    + " " + send.getPort() + " "
+                                    + send.getFileSize() + " " + token);
+                        }
+                    }
+                } else {
+                    TransferContainer container = new TransferContainer(DCCManager.this, send,
+                            config, "Receive: " + nickname, nickname, null);
+                    windowManager.addWindow(getContainer(), container);
+                    if (resume) {
+                        parser.sendCTCP(nickname, "DCC", "RESUME "
+                                + send.getShortFileName() + " "
+                                + send.getPort() + " "
+                                + jc.getSelectedFile().length());
+                    } else {
+                        send.connect();
+                    }
+                }
+            }
+
+        }, "saveFileThread: " + send.getShortFileName()).start();
+    }
+
+    /**
+     * Checks if the selected file exists and prompts the user as required.
+     *
+     * @param send DCC Transfer
+     * @param jc File chooser
+     * @param nickname Remote nickname
+     * @param parser Parser
+     * @param reverse Reverse DCC?
+     * @param token DCC token
+     *
+     * @return true if the user wants to continue, false if they wish to abort
+     */
+    private boolean handleExists(final DCCTransfer send, final JFileChooser jc,
+            final String nickname, final Parser parser, final boolean reverse,
+            final String token) {
+        if (jc.getSelectedFile().exists() && send.getFileSize() > -1
+                && send.getFileSize() <= jc.getSelectedFile().length()) {
+            if (config.getOptionBool(getDomain(), "receive.autoaccept")) {
+                return false;
+            } else {
+                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",
+                        JOptionPane.ERROR_MESSAGE);
+                saveFile(nickname, send, parser, reverse, token);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Prompts the user to resume a transfer if required.
+     *
+     * @param jc File chooser
+     *
+     * @return true if the user wants to continue the transfer false otherwise
+     */
+    private boolean handleResume(final JFileChooser jc) {
+        if (jc.getSelectedFile().exists()) {
+            if (config.getOptionBool(getDomain(), "receive.autoaccept")) {
+                return true;
+            } else {
+                final int result = JOptionPane.showConfirmDialog(
+                        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);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Sets up and display a file chooser.
+     *
+     * @param send DCCTransfer object sending the file
+     * @param jc File chooser
+     *
+     * @return   the return state of the file chooser on popdown:
+     * <ul>
+     * <li>JFileChooser.CANCEL_OPTION
+     * <li>JFileChooser.APPROVE_OPTION
+     * <li>JFileChooser.ERROR_OPTION if an error occurs or the
+     *                               dialog is dismissed
+     * </ul>
+     */
+    private int showFileChooser(final DCCTransfer send, final JFileChooser jc) {
+        jc.setDialogTitle("Save " + send.getShortFileName() + " As - DMDirc");
+                jc.setFileSelectionMode(JFileChooser.FILES_ONLY);
+                jc.setMultiSelectionEnabled(false);
+                jc.setSelectedFile(new File(send.getFileName()));
+        return jc.showSaveDialog(controller.getMainFrame());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void processEvent(final ActionType type, final StringBuffer format,
+            final Object... arguments) {
+        handleProcessEvent(type, format, false, arguments);
+    }
+
+    /**
+     * Make the given DCC start listening.
+     * This will either call dcc.listen() or dcc.listen(startPort, endPort)
+     * depending on config.
+     *
+     * @param dcc DCC to start listening.
+     * @return True if Socket was opened.
+     */
+    protected boolean listen(final DCC dcc) {
+        final boolean usePortRange = config.getOptionBool(getDomain(),
+                "firewall.ports.usePortRange");
+        try {
+            if (usePortRange) {
+                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();
+            }
+            return true;
+        } catch (IOException ioe) {
+            return false;
+        }
+    }
+
+    /**
+     * Process an event of the specified type.
+     *
+     * @param type The type of the event to process
+     * @param format Format of messages that are about to be sent. (May be null)
+     * @param dontAsk Don't ask any questions, assume yes.
+     * @param arguments The arguments for the event
+     */
+    public void handleProcessEvent(final ActionType type,
+            final StringBuffer format, final boolean dontAsk,
+            final Object... arguments) {
+        if (config.getOptionBool(getDomain(), "receive.autoaccept") && !dontAsk) {
+            handleProcessEvent(type, format, true, arguments);
+            return;
+        }
+
+        if (type == CoreActionType.SERVER_CTCP) {
+            final String[] ctcpData = ((String) arguments[3]).split(" ");
+            if ("DCC".equalsIgnoreCase((String) arguments[2])) {
+                if ("chat".equalsIgnoreCase(ctcpData[0])
+                        && ctcpData.length > 3) {
+                    handleChat(type, format, dontAsk, ctcpData, arguments);
+                } else if ("send".equalsIgnoreCase(ctcpData[0])
+                        && ctcpData.length > 3) {
+                    handleSend(type, format, dontAsk, ctcpData, arguments);
+                } else if (("resume".equalsIgnoreCase(ctcpData[0])
+                        || "accept".equalsIgnoreCase(ctcpData[0]))
+                        && ctcpData.length > 2) {
+                    handleReceive(ctcpData, arguments);
+                }
+            }
+        }
+    }
+
+    /**
+     * Handles a DCC chat request.
+     *
+     * @param type The type of the event to process
+     * @param format Format of messages that are about to be sent. (May be null)
+     * @param dontAsk Don't ask any questions, assume yes.
+     * @param ctcpData CTCP data bits
+     * @param arguments The arguments for the event
+     */
+    private void handleChat(final ActionType type, final StringBuffer format,
+            final boolean dontAsk, final String[] ctcpData,
+            final Object... arguments) {
+        final String nickname = ((ClientInfo) arguments[1]).getNickname();
+        if (dontAsk) {
+            final DCCChat chat = new DCCChat();
+            try {
+                chat.setAddress(Long.parseLong(ctcpData[2]),
+                        Integer.parseInt(ctcpData[3]));
+            } catch (NumberFormatException nfe) {
+                return;
+            }
+            final String myNickname = ((Server) arguments[0]).getParser()
+                    .getLocalClient().getNickname();
+            final DCCFrameContainer f = new ChatContainer(chat, config, commandController,
+                    "Chat: " + nickname, myNickname, nickname, messageSinkManager);
+            windowManager.addWindow(getContainer(), f);
+            f.addLine("DCCChatStarting", nickname, chat.getHost(),
+                    chat.getPort());
+            chat.connect();
+        } else {
+            ActionManager.getActionManager().triggerEvent(
+                    DCCActions.DCC_CHAT_REQUEST, null, arguments[0],
+                    nickname);
+            askQuestion("User " + nickname + " on "
+                    + ((Server) arguments[0]).getName()
+                    + " would like to start a DCC Chat with you.\n\n"
+                    + "Do you want to continue?",
+                    "DCC Chat Request", JOptionPane.YES_OPTION,
+                    type, format, arguments);
+        }
+    }
+
+    /**
+     * Handles a DCC send request.
+     *
+     * @param type The type of the event to process
+     * @param format Format of messages that are about to be sent. (May be null)
+     * @param dontAsk Don't ask any questions, assume yes.
+     * @param ctcpData CTCP data bits
+     * @param arguments The arguments for the event
+     */
+    private void handleSend(final ActionType type, final StringBuffer format,
+            final boolean dontAsk, final String[] ctcpData,
+            final Object... arguments) {
+        final String nickname = ((ClientInfo) arguments[1]).getNickname();
+        final String filename;
+        String tmpFilename;
+        // Clients tend to put files with spaces in the name in ""
+        final StringBuilder filenameBits = new StringBuilder();
+        int i;
+        final boolean quoted = ctcpData[1].startsWith("\"");
+        if (quoted) {
+            for (i = 1; i < ctcpData.length; i++) {
+                String bit = ctcpData[i];
+                if (i == 1) {
+                    bit = bit.substring(1);
+                }
+                if (bit.endsWith("\"")) {
+                    filenameBits.append(" ")
+                            .append(bit.substring(0, bit.length() - 1));
+                    break;
+                } else {
+                    filenameBits.append(" ").append(bit);
+                }
+            }
+            tmpFilename = filenameBits.toString().trim();
+        } else {
+            tmpFilename = ctcpData[1];
+            i = 1;
+        }
+
+        // Try to remove path names if sent.
+        // Change file separatorChar from other OSs first
+        if (File.separatorChar == '/') {
+            tmpFilename = tmpFilename.replace('\\', File.separatorChar);
+        } else {
+            tmpFilename = tmpFilename.replace('/', File.separatorChar);
+        }
+        // Then get just the name of the file.
+        filename = new File(tmpFilename).getName();
+
+        final String ip = ctcpData[++i];
+        final String port = ctcpData[++i];
+        long size;
+        if (ctcpData.length + 1 > i) {
+            try {
+                size = Integer.parseInt(ctcpData[++i]);
+            } catch (NumberFormatException nfe) {
+                size = -1;
+            }
+        } else {
+            size = -1;
+        }
+        final String token = (ctcpData.length - 1 > i
+                && !ctcpData[i + 1].equals("T")) ? ctcpData[++i] : "";
+
+        // Ignore incorrect ports, or non-numeric IP/Port
+        try {
+            final int portInt = Integer.parseInt(port);
+            if (portInt > 65535 || portInt < 0) {
+                return;
+            }
+            Long.parseLong(ip);
+        } catch (NumberFormatException nfe) {
+            return;
+        }
+
+        DCCTransfer send = DCCTransfer.findByToken(token);
+
+        if (send == null && !dontAsk) {
+            if (!token.isEmpty() && !port.equals("0")) {
+                // This is a reverse DCC Send that we no longer care about.
+            } else {
+                ActionManager.getActionManager().triggerEvent(
+                        DCCActions.DCC_SEND_REQUEST, null,
+                        arguments[0], nickname, filename);
+                askQuestion("User " + nickname + " on "
+                        + ((Server) arguments[0]).getName()
+                        + " would like to send you a file over DCC.\n\nFile: "
+                        + filename + "\n\nDo you want to continue?",
+                        "DCC Send Request", JOptionPane.YES_OPTION, type,
+                        format, arguments);
+            }
+        } else {
+            final boolean newSend = send == null;
+            if (newSend) {
+                send = new DCCTransfer(config.getOptionInt(getDomain(),
+                        "send.blocksize"));
+                send.setTurbo(config.getOptionBool(getDomain(), "send.forceturbo"));
+            }
+            try {
+                send.setAddress(Long.parseLong(ip), Integer.parseInt(port));
+            } catch (NumberFormatException nfe) {
+                return;
+            }
+            if (newSend) {
+                send.setFileName(filename);
+                send.setFileSize(size);
+                saveFile(nickname, send, ((Server) arguments[0]).getParser(),
+                        "0".equals(port), token);
+            } else {
+                send.connect();
+            }
+        }
+    }
+
+    /**
+     * Handles a DCC chat request.
+     *
+     * @param ctcpData CTCP data bits
+     * @param arguments The arguments for the event
+     */
+    private void handleReceive(final String[] ctcpData,
+            final Object... arguments) {
+        final String filename;
+        // Clients tend to put files with spaces in the name in ""
+        final StringBuilder filenameBits = new StringBuilder();
+        int i;
+        final boolean quoted = ctcpData[1].startsWith("\"");
+        if (quoted) {
+            for (i = 1; i < ctcpData.length; i++) {
+                String bit = ctcpData[i];
+                if (i == 1) {
+                    bit = bit.substring(1);
+                }
+                if (bit.endsWith("\"")) {
+                    filenameBits.append(" ")
+                            .append(bit.substring(0, bit.length() - 1));
+                    break;
+                } else {
+                    filenameBits.append(" ").append(bit);
+                }
+            }
+            filename = filenameBits.toString().trim();
+        } else {
+            filename = ctcpData[1];
+            i = 1;
+        }
+
+        final int port;
+        final int position;
+        try {
+            port = Integer.parseInt(ctcpData[++i]);
+            position = Integer.parseInt(ctcpData[++i]);
+            } catch (NumberFormatException nfe) {
+                return;
+        }
+        final String token = (ctcpData.length - 1 > i) ? " "
+                + ctcpData[++i] : "";
+
+        // Now look for a dcc that matches.
+        for (DCCTransfer send : DCCTransfer.getTransfers()) {
+            if (send.getPort() == port && (new File(send.getFileName()))
+                    .getName().equalsIgnoreCase(filename)) {
+                if ((!token.isEmpty() && !send.getToken().isEmpty())
+                        && (!token.equals(send.getToken()))) {
+                    continue;
+                }
+                final Parser parser = ((Server) arguments[0]).getParser();
+                final String nick = ((ClientInfo) arguments[1]).getNickname();
+                if (ctcpData[0].equalsIgnoreCase("resume")) {
+                    parser.sendCTCP(nick, "DCC", "ACCEPT "+ ((quoted) ? "\""
+                            + filename + "\"" : filename) + " " + port + " "
+                            + send.setFileStart(position) + token);
+                } else {
+                    send.setFileStart(position);
+                    if (port == 0) {
+                        // Reverse dcc
+                        if (listen(send)) {
+                            if (send.getToken().isEmpty()) {
+                                parser.sendCTCP(nick, "DCC", "SEND "
+                                        + ((quoted) ? "\"" + filename
+                                        + "\"" : filename) + " "
+                                        + DCC.ipToLong(send.getHost())
+                                        + " " + send.getPort()
+                                        + " " + send.getFileSize());
+                            } else {
+                                parser.sendCTCP(nick, "DCC", "SEND "
+                                        + ((quoted) ? "\"" + filename
+                                        + "\"" : filename)
+                                        + " " + DCC.ipToLong(send.getHost())
+                                        + " " + send.getPort()
+                                        + " " + send.getFileSize() + " "
+                                        + send.getToken());
+                            }
+                        }
+                    } else {
+                        send.connect();
+                    }
+                }
+            }
+        }
+    }
+
+
+
+    /**
+     * Retrieves the container for the placeholder.
+     *
+     * @since 0.6.4
+     * @return This plugin's placeholder container
+     */
+    public synchronized PlaceholderContainer getContainer() {
+        if (container == null) {
+            createContainer();
+        }
+
+        return container;
+    }
+
+    /**
+     * Removes the cached container.
+     *
+     * @since 0.6.4
+     */
+    public synchronized void removeContainer() {
+        container = null;
+    }
+
+    /**
+     * Create the container window.
+     */
+    protected void createContainer() {
+        container = new PlaceholderContainer(this, config, controller);
+        windowManager.addWindow(container);
+    }
+
+    /**
+     * Called when the plugin is loaded.
+     */
+    public void onLoad() {
+        final File dir = new File(config.getOption(getDomain(),
+                "receive.savelocation"));
+        if (dir.exists()) {
+            if (!dir.isDirectory()) {
+                Logger.userError(ErrorLevel.LOW,
+                        "Unable to create download dir (file exists instead)");
+            }
+        } else {
+            try {
+                dir.mkdirs();
+                dir.createNewFile();
+            } catch (IOException ex) {
+                Logger.userError(ErrorLevel.LOW,
+                        "Unable to create download dir");
+            }
+        }
+
+        ActionManager.getActionManager().registerTypes(DCCActions.values());
+        ActionManager.getActionManager().registerListener(this,
+                CoreActionType.SERVER_CTCP);
+    }
+
+    /**
+     * Called when this plugin is Unloaded.
+     */
+    public synchronized void onUnload() {
+        ActionManager.getActionManager().unregisterListener(this);
+        if (container != null) {
+            container.close();
+        }
+    }
+
+    /**
+     * Get the IP Address we should send as our listening IP.
+     *
+     * @return The IP Address we should send as our listening IP.
+     */
+    public String getListenIP() {
+        return getListenIP(null);
+    }
+
+    /**
+     * Get the IP Address we should send as our listening IP.
+     *
+     * @param parser Parser the IRC Parser where this dcc is initiated
+     * @return The IP Address we should send as our listening IP.
+     */
+    public String getListenIP(final Parser parser) {
+        final String configIP = config.getOption(getDomain(), "firewall.ip");
+        if (!configIP.isEmpty()) {
+            try {
+                return InetAddress.getByName(configIP).getHostAddress();
+            } catch (UnknownHostException ex) { //NOPMD - handled below
+                //Continue below
+            }
+        }
+        if (parser != null) {
+            final String myHost = parser.getLocalClient().getHostname();
+            if (!myHost.isEmpty()) {
+                try {
+                    return InetAddress.getByName(myHost).getHostAddress();
+                } catch (UnknownHostException e) { //NOPMD - handled below
+                    //Continue below
+                }
+            }
+        }
+        try {
+            return InetAddress.getLocalHost().getHostAddress();
+        } catch (UnknownHostException e) {
+            // This is almost certainly not what we want, but we can't work out
+            // the right one.
+            return "127.0.0.1"; //NOPMD
+        }
+    }
+
+    /**
+     * Adds configuration options for the DCC plugin.
+     *
+     * @param manager The model to add options to.
+     */
+    public void showConfig(final PreferencesDialogModel manager) {
+        final PreferencesCategory general = new PluginPreferencesCategory(
+                pluginInfo, "DCC", "", "category-dcc");
+        final PreferencesCategory firewall = new PluginPreferencesCategory(
+                pluginInfo, "Firewall", "");
+        final PreferencesCategory sending = new PluginPreferencesCategory(
+                pluginInfo, "Sending", "");
+        final PreferencesCategory receiving = new PluginPreferencesCategory(
+                pluginInfo, "Receiving", "");
+
+        manager.getCategory("Plugins").addSubCategory(general.setInlineAfter());
+        general.addSubCategory(firewall.setInline());
+        general.addSubCategory(sending.setInline());
+        general.addSubCategory(receiving.setInline());
+
+        firewall.addSetting(new PreferencesSetting(PreferencesType.TEXT,
+                getDomain(), "firewall.ip", "Forced IP",
+                "What IP should be sent as our IP (Blank = work it out)",
+                manager.getConfigManager(), manager.getIdentity()));
+        firewall.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "firewall.ports.usePortRange", "Use Port Range",
+                "Useful if you have a firewall that only forwards specific "
+                + "ports", manager.getConfigManager(), manager.getIdentity()));
+        firewall.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
+                getDomain(), "firewall.ports.startPort", "Start Port",
+                "Port to try to listen on first", manager.getConfigManager(),
+                manager.getIdentity()));
+        firewall.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
+                getDomain(), "firewall.ports.endPort", "End Port",
+                "Port to try to listen on last", manager.getConfigManager(),
+                manager.getIdentity()));
+        receiving.addSetting(new PreferencesSetting(PreferencesType.DIRECTORY,
+                getDomain(), "receive.savelocation", "Default save location",
+                "Where the save as window defaults to?",
+                manager.getConfigManager(), manager.getIdentity()));
+        sending.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "send.reverse", "Reverse DCC",
+                "With reverse DCC, the sender connects rather than "
+                + "listens like normal dcc", manager.getConfigManager(),
+                manager.getIdentity()));
+        sending.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "send.forceturbo", "Use Turbo DCC",
+                "Turbo DCC doesn't wait for ack packets. this is "
+                + "faster but not always supported.",
+                manager.getConfigManager(), manager.getIdentity()));
+        receiving.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "receive.reverse.sendtoken",
+                "Send token in reverse receive",
+                "If you have problems with reverse dcc receive resume,"
+                + " try toggling this.", manager.getConfigManager(),
+                manager.getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
+                getDomain(), "send.blocksize", "Blocksize to use for DCC",
+                "Change the block size for send/receive, this can "
+                + "sometimes speed up transfers.", manager.getConfigManager(),
+                manager.getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "general.percentageInTitle",
+                "Show percentage of transfers in the window title",
+                "Show the current percentage of transfers in the DCC window "
+                + "title", manager.getConfigManager(), manager.getIdentity()));
+    }
+
+}

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

@@ -22,789 +22,47 @@
 
 package com.dmdirc.addons.dcc;
 
-import com.dmdirc.Server;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.addons.dcc.actions.DCCActions;
-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.SwingWindowFactory;
-import com.dmdirc.addons.ui_swing.components.frames.ComponentFrame;
-import com.dmdirc.config.prefs.PluginPreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesCategory;
 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.CommandController;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
-import com.dmdirc.messages.MessageSinkManager;
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
-import com.dmdirc.ui.WindowManager;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Arrays;
-import java.util.HashSet;
-
-import javax.swing.JFileChooser;
-import javax.swing.JOptionPane;
+import dagger.ObjectGraph;
 
 /**
- * This plugin adds DCC to DMDirc.
+ * Adds support for DCC transfers and chats.
  */
-public class DCCPlugin extends BaseCommandPlugin implements ActionListener {
-
-    /** Our DCC Container window. */
-    private PlaceholderContainer container;
-    /** This plugin's plugin info. */
-    private final PluginInfo pluginInfo;
-    /** Config manager to read settings from. */
-    private final AggregateConfigProvider config;
-    /** Parent swing controller. */
-    private final SwingController controller;
-    /** Identity controller to read settings from. */
-    private final IdentityController identityController;
-    /** The sink manager to use to despatch messages. */
-    private final MessageSinkManager messageSinkManager;
-    /** Window Management. */
-    private final WindowManager windowManager;
-
-    /**
-     * Creates a new instance of this plugin.
-     *
-     * @param controller The controller to register UI implementations with
-     * @param pluginInfo This plugin's plugin info
-     * @param identityController The Identity controller that provides the current config
-     * @param commandController Command controller to register commands
-     * @param messageSinkManager The sink manager to use to despatch messages.
-     * @param windowManager Window Management
-     */
-    public DCCPlugin(
-            final SwingController controller,
-            final PluginInfo pluginInfo,
-            final IdentityController identityController,
-            final CommandController commandController,
-            final MessageSinkManager messageSinkManager,
-            final WindowManager windowManager) {
-        super(commandController);
-        this.identityController = identityController;
-        this.controller = controller;
-        this.messageSinkManager = messageSinkManager;
-        this.windowManager = windowManager;
-        config = controller.getGlobalConfig();
-        this.pluginInfo = pluginInfo;
-        registerCommand(new DCCCommand(
-                commandController, controller.getMainFrame(), this,
-                messageSinkManager, windowManager), DCCCommand.INFO);
-        final SwingWindowFactory factory = controller.getWindowFactory();
-        factory.registerImplementation(new HashSet<>(Arrays.asList(
-                "com.dmdirc.addons.dcc.ui.PlaceholderPanel")),
-                ComponentFrame.class);
-        factory.registerImplementation(new HashSet<>(Arrays.asList(
-                "com.dmdirc.addons.dcc.ui.TransferPanel")),
-                ComponentFrame.class);
-    }
-
-    /**
-     * Ask a question, if the answer is the answer required, then recall
-     * handleProcessEvent.
-     *
-     * @param question Question to ask
-     * @param title Title of question dialog
-     * @param desiredAnswer Answer required
-     * @param type Actiontype to pass back
-     * @param format StringBuffer to pass back
-     * @param arguments arguments to pass back
-     */
-    public void askQuestion(final String question, final String title,
-            final int desiredAnswer, final ActionType type,
-            final StringBuffer format, final Object... arguments) {
-        // New thread to ask the question in to stop us locking the UI
-        new Thread(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                final int result = JOptionPane.showConfirmDialog(null, question,
-                        title, JOptionPane.YES_NO_OPTION);
-                if (result == desiredAnswer) {
-                    handleProcessEvent(type, format, true, arguments);
-                }
-            }
-
-        }, "QuestionThread: " + title).start();
-    }
-
-    /**
-     * Ask the location to save a file, then start the download.
-     *
-     * @param nickname Person this dcc is from.
-     * @param send The DCCSend to save for.
-     * @param parser The parser this send was received on
-     * @param reverse Is this a reverse dcc?
-     * @param token Token used in reverse dcc.
-     */
-    public void saveFile(final String nickname, final DCCTransfer send,
-            final Parser parser, final boolean reverse, final String token) {
-        // New thread to ask the user where to save in to stop us locking the UI
-        new Thread(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                final JFileChooser jc = KFileChooser.getFileChooser(config,
-                        DCCPlugin.this,
-                        config.getOption(getDomain(), "receive.savelocation"));
-                int result;
-                if (config.getOptionBool(getDomain(), "receive.autoaccept")) {
-                    result = JFileChooser.APPROVE_OPTION;
-                } else {
-                    result = showFileChooser(send, jc);
-                }
-                if (result != JFileChooser.APPROVE_OPTION) {
-                    return;
-                }
-                send.setFileName(jc.getSelectedFile().getPath());
-                if (!handleExists(send, jc, nickname, parser,reverse, token)) {
-                    return;
-                }
-                final boolean resume = handleResume(jc);
-                if (reverse && !token.isEmpty()) {
-                    TransferContainer container = new TransferContainer(DCCPlugin.this, send,
-                            config, "*Receive: " + nickname, nickname, null);
-                    windowManager.addWindow(getContainer(), container);
-                    send.setToken(token);
-                    if (resume) {
-                        if (config.getOptionBool(getDomain(),
-                                "receive.reverse.sendtoken")) {
-                            parser.sendCTCP(nickname, "DCC", "RESUME "
-                                    + send.getShortFileName() + " 0 "
-                                    + jc.getSelectedFile().length() + " "
-                                    + token);
-                        } else {
-                            parser.sendCTCP(nickname, "DCC", "RESUME "
-                                    + send.getShortFileName() + " 0 "
-                                    + jc.getSelectedFile().length());
-                        }
-                    } else {
-                        if (listen(send)) {
-                            parser.sendCTCP(nickname, "DCC", "SEND "
-                                    + send.getShortFileName() + " "
-                                    + DCC.ipToLong(getListenIP(parser))
-                                    + " " + send.getPort() + " "
-                                    + send.getFileSize() + " " + token);
-                        }
-                    }
-                } else {
-                    TransferContainer container = new TransferContainer(DCCPlugin.this, send,
-                            config, "Receive: " + nickname, nickname, null);
-                    windowManager.addWindow(getContainer(), container);
-                    if (resume) {
-                        parser.sendCTCP(nickname, "DCC", "RESUME "
-                                + send.getShortFileName() + " "
-                                + send.getPort() + " "
-                                + jc.getSelectedFile().length());
-                    } else {
-                        send.connect();
-                    }
-                }
-            }
-
-        }, "saveFileThread: " + send.getShortFileName()).start();
-    }
-
-    /**
-     * Checks if the selected file exists and prompts the user as required.
-     *
-     * @param send DCC Transfer
-     * @param jc File chooser
-     * @param nickname Remote nickname
-     * @param parser Parser
-     * @param reverse Reverse DCC?
-     * @param token DCC token
-     *
-     * @return true if the user wants to continue, false if they wish to abort
-     */
-    private boolean handleExists(final DCCTransfer send, final JFileChooser jc,
-            final String nickname, final Parser parser, final boolean reverse,
-            final String token) {
-        if (jc.getSelectedFile().exists() && send.getFileSize() > -1
-                && send.getFileSize() <= jc.getSelectedFile().length()) {
-            if (config.getOptionBool(getDomain(), "receive.autoaccept")) {
-                return false;
-            } else {
-                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",
-                        JOptionPane.ERROR_MESSAGE);
-                saveFile(nickname, send, parser, reverse, token);
-                return false;
-            }
-        }
-        return true;
-    }
+public class DCCPlugin extends BaseCommandPlugin {
 
-    /**
-     * Prompts the user to resume a transfer if required.
-     *
-     * @param jc File chooser
-     *
-     * @return true if the user wants to continue the transfer false otherwise
-     */
-    private boolean handleResume(final JFileChooser jc) {
-        if (jc.getSelectedFile().exists()) {
-            if (config.getOptionBool(getDomain(), "receive.autoaccept")) {
-                return true;
-            } else {
-                final int result = JOptionPane.showConfirmDialog(
-                        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);
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Sets up and display a file chooser.
-     *
-     * @param send DCCTransfer object sending the file
-     * @param jc File chooser
-     *
-     * @return   the return state of the file chooser on popdown:
-     * <ul>
-     * <li>JFileChooser.CANCEL_OPTION
-     * <li>JFileChooser.APPROVE_OPTION
-     * <li>JFileChooser.ERROR_OPTION if an error occurs or the
-     *                               dialog is dismissed
-     * </ul>
-     */
-    private int showFileChooser(final DCCTransfer send, final JFileChooser jc) {
-        jc.setDialogTitle("Save " + send.getShortFileName() + " As - DMDirc");
-                jc.setFileSelectionMode(JFileChooser.FILES_ONLY);
-                jc.setMultiSelectionEnabled(false);
-                jc.setSelectedFile(new File(send.getFileName()));
-        return jc.showSaveDialog(controller.getMainFrame());
-    }
+    private DCCManager dccManager;
 
     /** {@inheritDoc} */
     @Override
-    public void processEvent(final ActionType type, final StringBuffer format,
-            final Object... arguments) {
-        handleProcessEvent(type, format, false, arguments);
-    }
-
-    /**
-     * Make the given DCC start listening.
-     * This will either call dcc.listen() or dcc.listen(startPort, endPort)
-     * depending on config.
-     *
-     * @param dcc DCC to start listening.
-     * @return True if Socket was opened.
-     */
-    protected boolean listen(final DCC dcc) {
-        final boolean usePortRange = config.getOptionBool(getDomain(),
-                "firewall.ports.usePortRange");
-        try {
-            if (usePortRange) {
-                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();
-            }
-            return true;
-        } catch (IOException ioe) {
-            return false;
-        }
-    }
-
-    /**
-     * Process an event of the specified type.
-     *
-     * @param type The type of the event to process
-     * @param format Format of messages that are about to be sent. (May be null)
-     * @param dontAsk Don't ask any questions, assume yes.
-     * @param arguments The arguments for the event
-     */
-    public void handleProcessEvent(final ActionType type,
-            final StringBuffer format, final boolean dontAsk,
-            final Object... arguments) {
-        if (config.getOptionBool(getDomain(), "receive.autoaccept") && !dontAsk) {
-            handleProcessEvent(type, format, true, arguments);
-            return;
-        }
+    public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
+        super.load(pluginInfo, graph);
 
-        if (type == CoreActionType.SERVER_CTCP) {
-            final String[] ctcpData = ((String) arguments[3]).split(" ");
-            if ("DCC".equalsIgnoreCase((String) arguments[2])) {
-                if ("chat".equalsIgnoreCase(ctcpData[0])
-                        && ctcpData.length > 3) {
-                    handleChat(type, format, dontAsk, ctcpData, arguments);
-                } else if ("send".equalsIgnoreCase(ctcpData[0])
-                        && ctcpData.length > 3) {
-                    handleSend(type, format, dontAsk, ctcpData, arguments);
-                } else if (("resume".equalsIgnoreCase(ctcpData[0])
-                        || "accept".equalsIgnoreCase(ctcpData[0]))
-                        && ctcpData.length > 2) {
-                    handleReceive(ctcpData, arguments);
-                }
-            }
-        }
-    }
-
-    /**
-     * Handles a DCC chat request.
-     *
-     * @param type The type of the event to process
-     * @param format Format of messages that are about to be sent. (May be null)
-     * @param dontAsk Don't ask any questions, assume yes.
-     * @param ctcpData CTCP data bits
-     * @param arguments The arguments for the event
-     */
-    private void handleChat(final ActionType type, final StringBuffer format,
-            final boolean dontAsk, final String[] ctcpData,
-            final Object... arguments) {
-        final String nickname = ((ClientInfo) arguments[1]).getNickname();
-        if (dontAsk) {
-            final DCCChat chat = new DCCChat();
-            try {
-                chat.setAddress(Long.parseLong(ctcpData[2]),
-                        Integer.parseInt(ctcpData[3]));
-            } catch (NumberFormatException nfe) {
-                return;
-            }
-            final String myNickname = ((Server) arguments[0]).getParser()
-                    .getLocalClient().getNickname();
-            final DCCFrameContainer f = new ChatContainer(chat, config, getCommandController(),
-                    "Chat: " + nickname, myNickname, nickname, messageSinkManager);
-            windowManager.addWindow(getContainer(), f);
-            f.addLine("DCCChatStarting", nickname, chat.getHost(),
-                    chat.getPort());
-            chat.connect();
-        } else {
-            ActionManager.getActionManager().triggerEvent(
-                    DCCActions.DCC_CHAT_REQUEST, null, arguments[0],
-                    nickname);
-            askQuestion("User " + nickname + " on "
-                    + ((Server) arguments[0]).getName()
-                    + " would like to start a DCC Chat with you.\n\n"
-                    + "Do you want to continue?",
-                    "DCC Chat Request", JOptionPane.YES_OPTION,
-                    type, format, arguments);
-        }
-    }
-
-    /**
-     * Handles a DCC send request.
-     *
-     * @param type The type of the event to process
-     * @param format Format of messages that are about to be sent. (May be null)
-     * @param dontAsk Don't ask any questions, assume yes.
-     * @param ctcpData CTCP data bits
-     * @param arguments The arguments for the event
-     */
-    private void handleSend(final ActionType type, final StringBuffer format,
-            final boolean dontAsk, final String[] ctcpData,
-            final Object... arguments) {
-        final String nickname = ((ClientInfo) arguments[1]).getNickname();
-        final String filename;
-        String tmpFilename;
-        // Clients tend to put files with spaces in the name in ""
-        final StringBuilder filenameBits = new StringBuilder();
-        int i;
-        final boolean quoted = ctcpData[1].startsWith("\"");
-        if (quoted) {
-            for (i = 1; i < ctcpData.length; i++) {
-                String bit = ctcpData[i];
-                if (i == 1) {
-                    bit = bit.substring(1);
-                }
-                if (bit.endsWith("\"")) {
-                    filenameBits.append(" ")
-                            .append(bit.substring(0, bit.length() - 1));
-                    break;
-                } else {
-                    filenameBits.append(" ").append(bit);
-                }
-            }
-            tmpFilename = filenameBits.toString().trim();
-        } else {
-            tmpFilename = ctcpData[1];
-            i = 1;
-        }
-
-        // Try to remove path names if sent.
-        // Change file separatorChar from other OSs first
-        if (File.separatorChar == '/') {
-            tmpFilename = tmpFilename.replace('\\', File.separatorChar);
-        } else {
-            tmpFilename = tmpFilename.replace('/', File.separatorChar);
-        }
-        // Then get just the name of the file.
-        filename = new File(tmpFilename).getName();
-
-        final String ip = ctcpData[++i];
-        final String port = ctcpData[++i];
-        long size;
-        if (ctcpData.length + 1 > i) {
-            try {
-                size = Integer.parseInt(ctcpData[++i]);
-            } catch (NumberFormatException nfe) {
-                size = -1;
-            }
-        } else {
-            size = -1;
-        }
-        final String token = (ctcpData.length - 1 > i
-                && !ctcpData[i + 1].equals("T")) ? ctcpData[++i] : "";
-
-        // Ignore incorrect ports, or non-numeric IP/Port
-        try {
-            final int portInt = Integer.parseInt(port);
-            if (portInt > 65535 || portInt < 0) {
-                return;
-            }
-            Long.parseLong(ip);
-        } catch (NumberFormatException nfe) {
-            return;
-        }
-
-        DCCTransfer send = DCCTransfer.findByToken(token);
-
-        if (send == null && !dontAsk) {
-            if (!token.isEmpty() && !port.equals("0")) {
-                // This is a reverse DCC Send that we no longer care about.
-            } else {
-                ActionManager.getActionManager().triggerEvent(
-                        DCCActions.DCC_SEND_REQUEST, null,
-                        arguments[0], nickname, filename);
-                askQuestion("User " + nickname + " on "
-                        + ((Server) arguments[0]).getName()
-                        + " would like to send you a file over DCC.\n\nFile: "
-                        + filename + "\n\nDo you want to continue?",
-                        "DCC Send Request", JOptionPane.YES_OPTION, type,
-                        format, arguments);
-            }
-        } else {
-            final boolean newSend = send == null;
-            if (newSend) {
-                send = new DCCTransfer(config.getOptionInt(getDomain(),
-                        "send.blocksize"));
-                send.setTurbo(config.getOptionBool(getDomain(), "send.forceturbo"));
-            }
-            try {
-                send.setAddress(Long.parseLong(ip), Integer.parseInt(port));
-            } catch (NumberFormatException nfe) {
-                return;
-            }
-            if (newSend) {
-                send.setFileName(filename);
-                send.setFileSize(size);
-                saveFile(nickname, send, ((Server) arguments[0]).getParser(),
-                        "0".equals(port), token);
-            } else {
-                send.connect();
-            }
-        }
-    }
-
-    /**
-     * Handles a DCC chat request.
-     *
-     * @param ctcpData CTCP data bits
-     * @param arguments The arguments for the event
-     */
-    private void handleReceive(final String[] ctcpData,
-            final Object... arguments) {
-        final String filename;
-        // Clients tend to put files with spaces in the name in ""
-        final StringBuilder filenameBits = new StringBuilder();
-        int i;
-        final boolean quoted = ctcpData[1].startsWith("\"");
-        if (quoted) {
-            for (i = 1; i < ctcpData.length; i++) {
-                String bit = ctcpData[i];
-                if (i == 1) {
-                    bit = bit.substring(1);
-                }
-                if (bit.endsWith("\"")) {
-                    filenameBits.append(" ")
-                            .append(bit.substring(0, bit.length() - 1));
-                    break;
-                } else {
-                    filenameBits.append(" ").append(bit);
-                }
-            }
-            filename = filenameBits.toString().trim();
-        } else {
-            filename = ctcpData[1];
-            i = 1;
-        }
-
-        final int port;
-        final int position;
-        try {
-            port = Integer.parseInt(ctcpData[++i]);
-            position = Integer.parseInt(ctcpData[++i]);
-            } catch (NumberFormatException nfe) {
-                return;
-        }
-        final String token = (ctcpData.length - 1 > i) ? " "
-                + ctcpData[++i] : "";
-
-        // Now look for a dcc that matches.
-        for (DCCTransfer send : DCCTransfer.getTransfers()) {
-            if (send.getPort() == port && (new File(send.getFileName()))
-                    .getName().equalsIgnoreCase(filename)) {
-                if ((!token.isEmpty() && !send.getToken().isEmpty())
-                        && (!token.equals(send.getToken()))) {
-                    continue;
-                }
-                final Parser parser = ((Server) arguments[0]).getParser();
-                final String nick = ((ClientInfo) arguments[1]).getNickname();
-                if (ctcpData[0].equalsIgnoreCase("resume")) {
-                    parser.sendCTCP(nick, "DCC", "ACCEPT "+ ((quoted) ? "\""
-                            + filename + "\"" : filename) + " " + port + " "
-                            + send.setFileStart(position) + token);
-                } else {
-                    send.setFileStart(position);
-                    if (port == 0) {
-                        // Reverse dcc
-                        if (listen(send)) {
-                            if (send.getToken().isEmpty()) {
-                                parser.sendCTCP(nick, "DCC", "SEND "
-                                        + ((quoted) ? "\"" + filename
-                                        + "\"" : filename) + " "
-                                        + DCC.ipToLong(send.getHost())
-                                        + " " + send.getPort()
-                                        + " " + send.getFileSize());
-                            } else {
-                                parser.sendCTCP(nick, "DCC", "SEND "
-                                        + ((quoted) ? "\"" + filename
-                                        + "\"" : filename)
-                                        + " " + DCC.ipToLong(send.getHost())
-                                        + " " + send.getPort()
-                                        + " " + send.getFileSize() + " "
-                                        + send.getToken());
-                            }
-                        }
-                    } else {
-                        send.connect();
-                    }
-                }
-            }
-        }
-    }
-
-
-
-    /**
-     * Retrieves the container for the placeholder.
-     *
-     * @since 0.6.4
-     * @return This plugin's placeholder container
-     */
-    public synchronized PlaceholderContainer getContainer() {
-        if (container == null) {
-            createContainer();
-        }
-
-        return container;
-    }
-
-    /**
-     * Removes the cached container.
-     *
-     * @since 0.6.4
-     */
-    public synchronized void removeContainer() {
-        container = null;
-    }
-
-    /**
-     * Create the container window.
-     */
-    protected void createContainer() {
-        container = new PlaceholderContainer(this, config, controller);
-        windowManager.addWindow(container);
+        setObjectGraph(graph.plus(new DCCPluginModule(pluginInfo)));
+        dccManager = getObjectGraph().get(DCCManager.class);
+        registerCommand(DCCCommand.class, DCCCommand.INFO);
     }
 
     /** {@inheritDoc} */
     @Override
-    public void domainUpdated() {
-        final ConfigProvider defaults = identityController.getAddonSettings();
-
-        defaults.setOption(getDomain(), "receive.savelocation",
-                identityController.getConfigurationDirectory() + "downloads"
-                + System.getProperty("file.separator"));
-    }
-
-    /**
-     * Called when the plugin is loaded.
-     */
-    @Override
     public void onLoad() {
-        final File dir = new File(config.getOption(getDomain(),
-                "receive.savelocation"));
-        if (dir.exists()) {
-            if (!dir.isDirectory()) {
-                Logger.userError(ErrorLevel.LOW,
-                        "Unable to create download dir (file exists instead)");
-            }
-        } else {
-            try {
-                dir.mkdirs();
-                dir.createNewFile();
-            } catch (IOException ex) {
-                Logger.userError(ErrorLevel.LOW,
-                        "Unable to create download dir");
-            }
-        }
-
-        ActionManager.getActionManager().registerTypes(DCCActions.values());
-        ActionManager.getActionManager().registerListener(this,
-                CoreActionType.SERVER_CTCP);
         super.onLoad();
+        dccManager.onLoad();
     }
 
-    /**
-     * Called when this plugin is Unloaded.
-     */
+    /** {@inheritDoc} */
     @Override
-    public synchronized void onUnload() {
-        ActionManager.getActionManager().unregisterListener(this);
-        if (container != null) {
-            container.close();
-        }
+    public void onUnload() {
         super.onUnload();
-    }
-
-    /**
-     * Get the IP Address we should send as our listening IP.
-     *
-     * @return The IP Address we should send as our listening IP.
-     */
-    public String getListenIP() {
-        return getListenIP(null);
-    }
-
-    /**
-     * Get the IP Address we should send as our listening IP.
-     *
-     * @param parser Parser the IRC Parser where this dcc is initiated
-     * @return The IP Address we should send as our listening IP.
-     */
-    public String getListenIP(final Parser parser) {
-        final String configIP = config.getOption(getDomain(), "firewall.ip");
-        if (!configIP.isEmpty()) {
-            try {
-                return InetAddress.getByName(configIP).getHostAddress();
-            } catch (UnknownHostException ex) { //NOPMD - handled below
-                //Continue below
-            }
-        }
-        if (parser != null) {
-            final String myHost = parser.getLocalClient().getHostname();
-            if (!myHost.isEmpty()) {
-                try {
-                    return InetAddress.getByName(myHost).getHostAddress();
-                } catch (UnknownHostException e) { //NOPMD - handled below
-                    //Continue below
-                }
-            }
-        }
-        try {
-            return InetAddress.getLocalHost().getHostAddress();
-        } catch (UnknownHostException e) {
-            // This is almost certainly not what we want, but we can't work out
-            // the right one.
-            return "127.0.0.1"; //NOPMD
-        }
+        dccManager.onUnload();
     }
 
     /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
-        final PreferencesCategory general = new PluginPreferencesCategory(
-                pluginInfo, "DCC", "", "category-dcc");
-        final PreferencesCategory firewall = new PluginPreferencesCategory(
-                pluginInfo, "Firewall", "");
-        final PreferencesCategory sending = new PluginPreferencesCategory(
-                pluginInfo, "Sending", "");
-        final PreferencesCategory receiving = new PluginPreferencesCategory(
-                pluginInfo, "Receiving", "");
-
-        manager.getCategory("Plugins").addSubCategory(general.setInlineAfter());
-        general.addSubCategory(firewall.setInline());
-        general.addSubCategory(sending.setInline());
-        general.addSubCategory(receiving.setInline());
-
-        firewall.addSetting(new PreferencesSetting(PreferencesType.TEXT,
-                getDomain(), "firewall.ip", "Forced IP",
-                "What IP should be sent as our IP (Blank = work it out)",
-                manager.getConfigManager(), manager.getIdentity()));
-        firewall.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "firewall.ports.usePortRange", "Use Port Range",
-                "Useful if you have a firewall that only forwards specific "
-                + "ports", manager.getConfigManager(), manager.getIdentity()));
-        firewall.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
-                getDomain(), "firewall.ports.startPort", "Start Port",
-                "Port to try to listen on first", manager.getConfigManager(),
-                manager.getIdentity()));
-        firewall.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
-                getDomain(), "firewall.ports.endPort", "End Port",
-                "Port to try to listen on last", manager.getConfigManager(),
-                manager.getIdentity()));
-        receiving.addSetting(new PreferencesSetting(PreferencesType.DIRECTORY,
-                getDomain(), "receive.savelocation", "Default save location",
-                "Where the save as window defaults to?",
-                manager.getConfigManager(), manager.getIdentity()));
-        sending.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "send.reverse", "Reverse DCC",
-                "With reverse DCC, the sender connects rather than "
-                + "listens like normal dcc", manager.getConfigManager(),
-                manager.getIdentity()));
-        sending.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "send.forceturbo", "Use Turbo DCC",
-                "Turbo DCC doesn't wait for ack packets. this is "
-                + "faster but not always supported.",
-                manager.getConfigManager(), manager.getIdentity()));
-        receiving.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "receive.reverse.sendtoken",
-                "Send token in reverse receive",
-                "If you have problems with reverse dcc receive resume,"
-                + " try toggling this.", manager.getConfigManager(),
-                manager.getIdentity()));
-        general.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
-                getDomain(), "send.blocksize", "Blocksize to use for DCC",
-                "Change the block size for send/receive, this can "
-                + "sometimes speed up transfers.", manager.getConfigManager(),
-                manager.getIdentity()));
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "general.percentageInTitle",
-                "Show percentage of transfers in the window title",
-                "Show the current percentage of transfers in the DCC window "
-                + "title", manager.getConfigManager(), manager.getIdentity()));
+        dccManager.showConfig(manager);
     }
 
 }

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

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2006-2013 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.dcc;
+
+import com.dmdirc.addons.ui_swing.SwingModule;
+import com.dmdirc.plugins.PluginInfo;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * DI module for the DCC plugin.
+ */
+@Module(injects = {DCCManager.class, DCCCommand.class}, addsTo = SwingModule.class)
+public class DCCPluginModule {
+
+    /** The DCC plugin's plugin info. */
+    private final PluginInfo pluginInfo;
+
+    public DCCPluginModule(final PluginInfo pluginInfo) {
+        this.pluginInfo = pluginInfo;
+    }
+
+    @Provides
+    public PluginInfo getPluginInfo() {
+        return pluginInfo;
+    }
+
+}

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

@@ -37,7 +37,7 @@ import java.util.Arrays;
 public class PlaceholderContainer extends FrameContainer {
 
     /** The plugin which owns this placeholder. */
-    private final DCCPlugin plugin;
+    private final DCCManager plugin;
     /** Parent swing controller. */
     private final SwingController controller;
 
@@ -48,7 +48,7 @@ public class PlaceholderContainer extends FrameContainer {
      * @param config Config manager
      * @param controller Swing controller
      */
-    public PlaceholderContainer(final DCCPlugin plugin,
+    public PlaceholderContainer(final DCCManager plugin,
             final AggregateConfigProvider config, final SwingController controller) {
         super("dcc", "DCCs", "DCCs", config, Arrays.asList(
                 "com.dmdirc.addons.dcc.ui.PlaceholderPanel"));

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

@@ -47,7 +47,7 @@ public class TransferContainer extends FrameContainer implements
         DCCTransferHandler, SocketCloseListener {
 
     /** The dcc plugin that owns this frame */
-    protected final DCCPlugin plugin;
+    protected final DCCManager plugin;
 
     /** Config manager. */
     private final AggregateConfigProvider config;
@@ -68,7 +68,7 @@ public class TransferContainer extends FrameContainer implements
     private long timeStarted = 0;
 
     /** Plugin that this send belongs to. */
-    private final DCCPlugin myPlugin;
+    private final DCCManager myPlugin;
 
     /** IRC Parser that caused this send */
     private Parser parser = null;
@@ -91,7 +91,7 @@ public class TransferContainer extends FrameContainer implements
      * @param targetNick Nickname of target
      * @param server The server that initiated this send
      */
-    public TransferContainer(final DCCPlugin plugin, final DCCTransfer dcc,
+    public TransferContainer(final DCCManager plugin, final DCCTransfer dcc,
             final AggregateConfigProvider config, final String title,
             final String targetNick, final Server server) {
         super(dcc.getType() == DCCTransfer.TransferType.SEND

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.dcc.kde;
 
-import com.dmdirc.addons.dcc.DCCPlugin;
+import com.dmdirc.addons.dcc.DCCManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import java.awt.Component;
@@ -67,7 +67,7 @@ public final class KFileChooser extends JFileChooser {
     private String fileFilter = null;
 
     /** The plugin that this file chooser is for. */
-    private final DCCPlugin plugin;
+    private final DCCManager plugin;
     /** Used to read settings from. */
     private final AggregateConfigProvider config;
 
@@ -76,7 +76,7 @@ public final class KFileChooser extends JFileChooser {
      *
      * @param plugin The plugin that owns this KFileChooser
      */
-    private KFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin) {
+    private KFileChooser(final AggregateConfigProvider config, final DCCManager plugin) {
         super();
 
         this.plugin = plugin;
@@ -89,7 +89,7 @@ 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 AggregateConfigProvider config, final DCCPlugin plugin, final File currentDirectory) {
+    private KFileChooser(final AggregateConfigProvider config, final DCCManager plugin, final File currentDirectory) {
         super(currentDirectory);
 
         this.plugin = plugin;
@@ -103,7 +103,7 @@ public final class KFileChooser extends JFileChooser {
      * @param currentDirectory Directory to use as the base directory
      * @param fsv The FileSystemView to use
      */
-    private KFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin, final File currentDirectory, final FileSystemView fsv) {
+    private KFileChooser(final AggregateConfigProvider config, final DCCManager plugin, final File currentDirectory, final FileSystemView fsv) {
         super(currentDirectory, fsv);
 
         this.plugin = plugin;
@@ -116,7 +116,7 @@ public final class KFileChooser extends JFileChooser {
      * @param plugin The plugin that owns this KFileChooser
      * @param fsv The FileSystemView to use
      */
-    private KFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin, final FileSystemView fsv) {
+    private KFileChooser(final AggregateConfigProvider config, final DCCManager plugin, final FileSystemView fsv) {
         super(fsv);
 
         this.plugin = plugin;
@@ -129,7 +129,7 @@ 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 AggregateConfigProvider config, final DCCPlugin plugin, final String currentDirectoryPath) {
+    private KFileChooser(final AggregateConfigProvider config, final DCCManager plugin, final String currentDirectoryPath) {
         super(currentDirectoryPath);
 
         this.plugin = plugin;
@@ -143,7 +143,7 @@ public final class KFileChooser extends JFileChooser {
      * @param currentDirectoryPath Directory to use as the base directory
      * @param fsv The FileSystemView to use
      */
-    private KFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin, final String currentDirectoryPath, final FileSystemView fsv) {
+    private KFileChooser(final AggregateConfigProvider config, final DCCManager plugin, final String currentDirectoryPath, final FileSystemView fsv) {
         super(currentDirectoryPath, fsv);
 
         this.plugin = plugin;
@@ -158,7 +158,7 @@ public final class KFileChooser extends JFileChooser {
      * @return return true if getFileChooser() will return a KFileChooser not a
      *         JFileChooser
      */
-    public static boolean useKFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin) {
+    public static boolean useKFileChooser(final AggregateConfigProvider config, final DCCManager plugin) {
         return KDialogProcess.hasKDialog() && config.getOptionBool(plugin.getDomain(), "general.useKFileChooser");
     }
 
@@ -168,7 +168,7 @@ 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 AggregateConfigProvider config, final DCCPlugin plugin) {
+    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCManager plugin) {
         return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin) : new JFileChooser();
     }
 
@@ -179,7 +179,7 @@ public final class KFileChooser extends JFileChooser {
      * @param currentDirectory Directory to use as the base directory
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin, final File currentDirectory) {
+    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCManager plugin, final File currentDirectory) {
         return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin, currentDirectory) : new JFileChooser(currentDirectory);
     }
 
@@ -191,7 +191,7 @@ public final class KFileChooser extends JFileChooser {
      * @param fsv The FileSystemView to use
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin, final File currentDirectory, final FileSystemView fsv) {
+    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCManager plugin, final File currentDirectory, final FileSystemView fsv) {
         return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin, currentDirectory, fsv) : new JFileChooser(currentDirectory, fsv);
     }
 
@@ -202,7 +202,7 @@ public final class KFileChooser extends JFileChooser {
      * @param fsv The FileSystemView to use
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin, final FileSystemView fsv) {
+    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCManager plugin, final FileSystemView fsv) {
         return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin, fsv) : new JFileChooser(fsv);
     }
 
@@ -213,7 +213,7 @@ public final class KFileChooser extends JFileChooser {
      * @param currentDirectoryPath Directory to use as the base directory
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin, final String currentDirectoryPath) {
+    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCManager plugin, final String currentDirectoryPath) {
         return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin, currentDirectoryPath) : new JFileChooser(currentDirectoryPath);
     }
 
@@ -225,7 +225,7 @@ public final class KFileChooser extends JFileChooser {
      * @param fsv The FileSystemView to use
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin, final String currentDirectoryPath, final FileSystemView fsv) {
+    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCManager plugin, final String currentDirectoryPath, final FileSystemView fsv) {
         return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin, currentDirectoryPath, fsv) : new JFileChooser(currentDirectoryPath, fsv);
     }
 

src/com/dmdirc/addons/osd/OsdPlugin.java

@@ -92,15 +92,6 @@ public class OsdPlugin extends BaseCommandPlugin implements
         registerCommand(new OsdCommand(commandController, osdManager), OsdCommand.INFO);
     }
 
-    /**
-     * Get our PluginInfo.
-     *
-     * @return our PluginInfo.
-     */
-    public PluginInfo getPluginInfo() {
-        return pluginInfo;
-    }
-
     /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesDialogModel manager) {