PMD Fixes for plugins

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

src/com/dmdirc/addons/calc/CalcCommand.java

@@ -47,7 +47,8 @@ public class CalcCommand extends Command implements CommandInfo {
             int offset = 0;
             boolean showexpr = false;
 
-            if (args.getArguments().length > 0 && args.getArguments()[0].equals("--showexpr")) {
+            if (args.getArguments().length > 0 && args.getArguments()[0]
+                    .equals("--showexpr")) {
                 showexpr = true;
                 offset++;
             }
@@ -60,11 +61,11 @@ public class CalcCommand extends Command implements CommandInfo {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
                     (showexpr ? input + " = " : "") + result);
         } catch (ParseException ex) {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unable to parse expression: "
-                    + ex.getMessage());
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, 
+                    "Unable to parse expression: " + ex.getMessage());
         } catch (ArithmeticException ex) {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unable to calculate expression: "
-                    + ex.getMessage());
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, 
+                    "Unable to calculate expression: " + ex.getMessage());
         }
     }
 

src/com/dmdirc/addons/calc/Parser.java

@@ -43,8 +43,10 @@ public class Parser {
     protected static final List<TokenType> TOKENS_BY_PRECEDENCE;
 
     static {
-        TOKENS_BY_PRECEDENCE = new ArrayList<TokenType>(Arrays.asList(TokenType.values()));
-        Collections.sort(TOKENS_BY_PRECEDENCE, new TokenTypePrecedenceComparator());
+        TOKENS_BY_PRECEDENCE = new ArrayList<TokenType>(Arrays.asList(
+                TokenType.values()));
+        Collections.sort(TOKENS_BY_PRECEDENCE,
+                new TokenTypePrecedenceComparator());
     }
 
     /**
@@ -82,7 +84,8 @@ public class Parser {
      * @return A single tree containing all of the specified tokens
      * @throws ParseException If the tokens contain mismatched brackets
      */
-    protected TreeToken parse(final List<TreeToken> tokens) throws ParseException {
+    protected TreeToken parse(final List<TreeToken> tokens)
+            throws ParseException {
         while (tokens.size() > 1) {
             for (TokenType type : TOKENS_BY_PRECEDENCE) {
                 final int offset = findTokenType(tokens, type);
@@ -119,10 +122,13 @@ public class Parser {
      * @throws ParseException If the operator is a bracket and that bracket is
      * mismatched
      */
-    protected void parseNullaryOperator(final List<TreeToken> tokens, final int offset)
+    protected void parseNullaryOperator(final List<TreeToken> tokens,
+            final int offset)
             throws ParseException {
-        if (tokens.get(offset).getToken().getType() == TokenType.BRACKET_CLOSE
-                || tokens.get(offset).getToken().getType() == TokenType.BRACKET_OPEN) {
+        if (tokens.get(offset).getToken().getType()
+                == TokenType.BRACKET_CLOSE
+                || tokens.get(offset).getToken().getType()
+                == TokenType.BRACKET_OPEN) {
             parseBracket(tokens, offset);
         } else {
             parseNumber(tokens, offset);
@@ -155,7 +161,8 @@ public class Parser {
             }
         }
 
-        throw new ParseException("Couldn't find matching opening bracket", offset);
+        throw new ParseException("Couldn't find matching opening bracket",
+                offset);
     }
 
     /**
@@ -164,7 +171,8 @@ public class Parser {
      * @param tokens The supply of tokens from which the operator will be parsed
      * @param offset The offset at which the operator occurs
      */
-    protected void parseBinaryOperator(final List<TreeToken> tokens, final int offset) {
+    protected void parseBinaryOperator(final List<TreeToken> tokens,
+            final int offset) {
         tokens.get(offset).addChild(tokens.get(offset - 1));
         tokens.get(offset).addChild(tokens.get(offset + 1));
         tokens.get(offset).setProcessed();
@@ -179,7 +187,8 @@ public class Parser {
      * @param tokens The supply of tokens from which the operator will be parsed
      * @param offset The offset at which the operator occurs
      */
-    protected void parseUnaryOperator(final List<TreeToken> tokens, final int offset) {
+    protected void parseUnaryOperator(final List<TreeToken> tokens,
+            final int offset) {
         tokens.get(offset).addChild(tokens.get(offset + 1));
         tokens.get(offset).setProcessed();
         tokens.remove(offset + 1);
@@ -192,7 +201,8 @@ public class Parser {
      * @param tokens The supply of tokens from which the operator will be parsed
      * @param offset The offset at which the operator occurs
      */
-    protected void parseHiddenOperator(final List<TreeToken> tokens, final int offset) {
+    protected void parseHiddenOperator(final List<TreeToken> tokens,
+            final int offset) {
         tokens.remove(offset);
     }
 
@@ -214,9 +224,11 @@ public class Parser {
      * @param type The desired token type
      * @return The index of the first token with that type, or -1 if none found
      */
-    protected static int findTokenType(final List<TreeToken> tokens, final TokenType type) {
+    protected static int findTokenType(final List<TreeToken> tokens,
+            final TokenType type) {
         for (int i = 0; i < tokens.size(); i++) {
-            if (tokens.get(i).getToken().getType() == type && !tokens.get(i).isProcessed()) {
+            if (tokens.get(i).getToken().getType() == type && !tokens.get(i)
+                    .isProcessed()) {
                 return i;
             }
         }
@@ -227,7 +239,8 @@ public class Parser {
     /**
      * A class which compares token types based on their precendence.
      */
-    protected static class TokenTypePrecedenceComparator implements Comparator<TokenType> {
+    protected static class TokenTypePrecedenceComparator implements
+            Comparator<TokenType> {
 
         /** {@inheritDoc} */
         @Override

src/com/dmdirc/addons/calc/TokenType.java

@@ -41,12 +41,15 @@ public enum TokenType {
     END(TokenTypeArity.HIDDEN, "$", 0),
 
     /** An opening bracket. */
-    BRACKET_OPEN(TokenTypeArity.NULLARY, "\\(", 0, "NUMBER_*", "MOD_*", "BRACKET_OPEN"),
+    BRACKET_OPEN(TokenTypeArity.NULLARY, "\\(", 0, "NUMBER_*", "MOD_*",
+                "BRACKET_OPEN"),
     /** A closing bracket. */
-    BRACKET_CLOSE(TokenTypeArity.NULLARY, "\\)", 50, "OP_*", "BRACKET_*", "END"),
+    BRACKET_CLOSE(TokenTypeArity.NULLARY, "\\)", 50, "OP_*", "BRACKET_*",
+                "END"),
 
     /** A floating point number. */
-    NUMBER_FLOAT(TokenTypeArity.NULLARY, "[0-9]+\\.[0-9]+", 1, "OP_*", "BRACKET_*", "END") {
+    NUMBER_FLOAT(TokenTypeArity.NULLARY, "[0-9]+\\.[0-9]+", 1, "OP_*",
+                "BRACKET_*", "END") {
         /** {@inheritDoc} */
         @Override
         public Number evaluate(final TreeToken token) {
@@ -55,7 +58,8 @@ public enum TokenType {
     },
 
     /** An integer. */
-    NUMBER_INT(TokenTypeArity.NULLARY, "[0-9]+", 1, "OP_*", "BRACKET_*", "END") {
+    NUMBER_INT(TokenTypeArity.NULLARY, "[0-9]+", 1, "OP_*",
+                "BRACKET_*", "END") {
         /** {@inheritDoc} */
         @Override
         public Number evaluate(final TreeToken token) {
@@ -102,7 +106,8 @@ public enum TokenType {
     },
 
     /** The multiplication operator. */
-    OP_MULT(TokenTypeArity.BINARY, "(?=\\()|\\*", 9, "NUMBER_*", "BRACKET_OPEN") {
+    OP_MULT(TokenTypeArity.BINARY, "(?=\\()|\\*", 9, "NUMBER_*",
+            "BRACKET_OPEN") {
         /** {@inheritDoc} */
         @Override
         public Number evaluate(final TreeToken token) {
@@ -136,7 +141,8 @@ public enum TokenType {
         /** {@inheritDoc} */
         @Override
         public Number evaluate(final TreeToken token) {
-            return new Float(Math.pow(token.getChildren().get(0).evaluate().doubleValue(),
+            return new Float(Math.pow(token.getChildren().get(0).evaluate()
+                    .doubleValue(),
                     token.getChildren().get(1).evaluate().doubleValue()));
         }
     };
@@ -217,7 +223,8 @@ public enum TokenType {
         matcher.useAnchoringBounds(false);
         matcher.useTransparentBounds(true);
 
-        return matcher.find(offset) && matcher.start() == offset ? matcher.end() : -1;
+        return matcher.find(offset) && matcher.start() == offset
+                ? matcher.end() : -1;
     }
 
     /**
@@ -241,9 +248,8 @@ public enum TokenType {
         final List<TokenType> res = new ArrayList<TokenType>();
 
         for (TokenType token : values()) {
-            if ((name.endsWith("*")
-                    && token.name().startsWith(name.substring(0, name.length() - 1)))
-                    || name.equals(token.name())) {
+            if ((name.endsWith("*") && token.name().startsWith(name.substring(0,
+                    name.length() - 1))) || name.equals(token.name())) {
                 res.add(token);
             }
         }

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

@@ -30,18 +30,14 @@ import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * This class links DCC Chat objects to a window.
- *
- * @author Shane 'Dataforce' McCormack
  */
 public class ChatContainer extends DCCFrameContainer<InputWindow> implements DCCChatHandler {
 
-    /** The DCCChat object we are a window for */
-    private final DCCChat dcc;
-
-    /** My Nickname */
+    /** The DCCChat object we are a window for. */
+    private final DCCChat dccChat;
+    /** My Nickname. */
     private final String nickname;
-
-    /** Other Nickname */
+    /** Other Nickname. */
     private final String otherNickname;
 
     /**
@@ -55,9 +51,9 @@ public class ChatContainer extends DCCFrameContainer<InputWindow> implements DCC
      */
     public ChatContainer(final DCCPlugin plugin, final DCCChat dcc,
             final String title, final String nick, final String targetNick) {
-        super(plugin, title, "dcc-chat-inactive", InputWindow.class,
+        super(title, "dcc-chat-inactive", InputWindow.class,
                 DCCCommandParser.getDCCCommandParser());
-        this.dcc = dcc;
+        this.dccChat = dcc;
         dcc.setHandler(this);
         nickname = nick;
         otherNickname = targetNick;
@@ -66,22 +62,23 @@ public class ChatContainer extends DCCFrameContainer<InputWindow> implements DCC
     }
 
     /**
-     * Get the DCCChat Object associated with this window
+     * Get the DCCChat Object associated with this window.
      *
      * @return The DCCChat Object associated with this window
      */
     public DCCChat getDCC() {
-        return dcc;
+        return dccChat;
     }
 
     /** {@inheritDoc} */
     @Override
     public void sendLine(final String line) {
-        if (dcc.isWriteable()) {
+        if (dccChat.isWriteable()) {
             final StringBuffer buff = new StringBuffer("DCCChatSelfMessage");
-            ActionManager.processEvent(DCCActions.DCC_CHAT_SELFMESSAGE, buff, this, line);
+            ActionManager.processEvent(DCCActions.DCC_CHAT_SELFMESSAGE, buff,
+                    this, line);
             addLine(buff, nickname, getTranscoder().encode(line));
-            dcc.sendLine(line);
+            dccChat.sendLine(line);
         } else {
             final StringBuffer buff = new StringBuffer("DCCChatError");
             addLine(buff, "Socket is closed.", getTranscoder().encode(line));
@@ -121,7 +118,7 @@ public class ChatContainer extends DCCFrameContainer<InputWindow> implements DCC
     @Override
     public void windowClosing() {
         super.windowClosing();
-        dcc.close();
+        dccChat.close();
     }
 
 }

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

@@ -25,32 +25,30 @@ package com.dmdirc.addons.dcc;
 import com.dmdirc.addons.dcc.io.DCCChat;
 
 /**
- * This interfaces allows DCC Chat Windows to receive data from a DCCChat
- *
- * @author Shane 'Dataforce' McCormack
+ * This interfaces allows DCC Chat Windows to receive data from a DCCChat.
  */
 public interface DCCChatHandler {
 
     /**
-     * Handle a received message
+     * Handle a received message.
      *
      * @param dcc The DCCChat that this message is from
      * @param message The message
      */
-    void handleChatMessage(final DCCChat dcc, final String message);
+    void handleChatMessage(DCCChat dcc, String message);
 
     /**
-     * Called when the socket is closed
+     * Called when the socket is closed.
      *
      * @param dcc The DCCChat that this message is from
      */
-    void socketClosed(final DCCChat dcc);
+    void socketClosed(DCCChat dcc);
 
     /**
-     * Called when the socket is opened
+     * Called when the socket is opened.
      *
      * @param dcc The DCCChat that this message is from
      */
-    void socketOpened(final DCCChat dcc);
+    void socketOpened(DCCChat dcc);
 
 }

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

@@ -50,14 +50,12 @@ import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 
 /**
- * This command allows starting dcc chats/file transfers
- *
- * @author Shane "Dataforce" Mc Cormack
+ * This command allows starting dcc chats/file transfers.
  */
 public final class DCCCommand extends Command implements IntelligentCommand,
         CommandInfo {
 
-    /** My Plugin */
+    /** My Plugin. */
     private final DCCPlugin myPlugin;
 
     /**
@@ -74,63 +72,79 @@ public final class DCCCommand extends Command implements IntelligentCommand,
     @Override
     public void execute(final FrameContainer<?> origin,
             final CommandArguments args, final CommandContext context) {
-        final Server server = ((ServerCommandContext) context).getServer();
-        
         if (args.getArguments().length > 1) {
-            final String type = args.getArguments()[0];
             final String target = args.getArguments()[1];
+            final Server server = ((ServerCommandContext) context).getServer();
             final Parser parser = server.getParser();
             final String myNickname = parser.getLocalClient().getNickname();
 
             if (parser.isValidChannelName(target)
-                    || parser.getStringConverter().equalsIgnoreCase(target, myNickname)) {
-                final Thread errorThread = new Thread(new Runnable() {
+                    || parser.getStringConverter().equalsIgnoreCase(target,
+                    myNickname)) {
+                new Thread(new Runnable() {
 
                     /** {@inheritDoc} */
                     @Override
                     public void run() {
-                        if (parser.getStringConverter().equalsIgnoreCase(target, myNickname)) {
-                            JOptionPane.showMessageDialog(null, "You can't DCC yourself.",
-                                    "DCC Error", JOptionPane.ERROR_MESSAGE);
+                        if (parser.getStringConverter().equalsIgnoreCase(target,
+                                myNickname)) {
+                            JOptionPane.showMessageDialog(null,
+                                    "You can't DCC yourself.", "DCC Error",
+                                    JOptionPane.ERROR_MESSAGE);
                         } else {
-                            JOptionPane.showMessageDialog(null, "You can't DCC a channel.",
-                                    "DCC Error", JOptionPane.ERROR_MESSAGE);
+                            JOptionPane.showMessageDialog(null,
+                                    "You can't DCC a channel.", "DCC Error",
+                                    JOptionPane.ERROR_MESSAGE);
                         }
                     }
 
-                });
-                errorThread.start();
+                }).start();
                 return;
             }
+            final String type = args.getArguments()[0];
             if (type.equalsIgnoreCase("chat")) {
-                final DCCChat chat = new DCCChat();
-                if (myPlugin.listen(chat)) {
-                    final ChatContainer window = new ChatContainer(myPlugin, chat,
-                            "*Chat: " + target, myNickname, target);
-
-                    parser.sendCTCP(target, "DCC", "CHAT chat "
-                            + DCC.ipToLong(myPlugin.getListenIP(parser)) + " "
-                            + chat.getPort());
-
-                    ActionManager.processEvent(DCCActions.DCC_CHAT_REQUEST_SENT,
-                            null, server, target);
-
-                    sendLine(origin, args.isSilent(), "DCCChatStarting", target,
-                            chat.getHost(), chat.getPort());
-                    window.addLine("DCCChatStarting", target,
-                            chat.getHost(), chat.getPort());
-                } else {
-                    sendLine(origin, args.isSilent(), "DCCChatError",
-                            "Unable to start chat with " + target
-                            + " - unable to create listen socket");
-                }
+                startChat(parser, server, origin, myNickname, target, true);
             } else if (type.equalsIgnoreCase("send")) {
-                sendFile(target, origin, server, args.isSilent(), args.getArgumentsAsString(2));
+                sendFile(target, origin, server, true,
+                        args.getArgumentsAsString(2));
             } else {
-                sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unknown DCC Type: '" + type + "'");
+                sendLine(origin, args.isSilent(), FORMAT_ERROR,
+                        "Unknown DCC Type: '" + type + "'");
             }
         } else {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Syntax: dcc <type> <target> [params]");
+            showUsage(origin, true, getName(), getHelp());
+        }
+    }
+
+    /**
+     * Starts a DCC Chat.
+     *
+     * @param parser Parser from which command originated
+     * @param server Server from which command originated
+     * @param origin Frame container from which command originated
+     * @param myNickname My current nickname
+     * @param target Target of the command
+     * @param isSilent Is this a silent command
+     */
+    private void startChat(final Parser parser, final Server server,
+            final FrameContainer<?> origin, final String myNickname,
+            final String target, final boolean isSilent) {
+        final DCCChat chat = new DCCChat();
+        if (myPlugin.listen(chat)) {
+            final ChatContainer window = new ChatContainer(myPlugin, chat,
+                    "*Chat: " + target, myNickname, target);
+            parser.sendCTCP(target, "DCC", "CHAT chat " + DCC.ipToLong(
+                    myPlugin.getListenIP(parser)) + " " + chat.getPort());
+            ActionManager.processEvent(DCCActions.DCC_CHAT_REQUEST_SENT, null,
+                    server, target);
+            sendLine(origin, isSilent, "DCCChatStarting", target,
+                    chat.getHost(), chat.getPort());
+            window.addLine("DCCChatStarting", target, chat.getHost(),
+                    chat.getPort());
+        } else {
+            sendLine(origin, isSilent, "DCCChatError",
+                    "Unable to start chat with " + target
+                    + " - unable to create listen socket");
         }
     }
 
@@ -148,7 +162,7 @@ public final class DCCCommand extends Command implements IntelligentCommand,
             final Server server, final boolean isSilent, final String filename) {
         // New thread to ask the user what file to send
         final File givenFile = new File(filename);
-        final Thread dccThread = new Thread(new Runnable() {
+        new Thread(new Runnable() {
 
             /** {@inheritDoc} */
             @Override
@@ -156,77 +170,108 @@ public final class DCCCommand extends Command implements IntelligentCommand,
                 final JFileChooser jc = givenFile.exists()
                         ? KFileChooser.getFileChooser(myPlugin, givenFile)
                         : KFileChooser.getFileChooser(myPlugin);
-                int result;
-                if (!givenFile.exists() || !givenFile.isFile()) {
-                    jc.setDialogTitle("Send file to " + target + " - DMDirc ");
-                    jc.setFileSelectionMode(JFileChooser.FILES_ONLY);
-                    jc.setMultiSelectionEnabled(false);
-                    result = jc.showOpenDialog(((SwingController) PluginManager
-                            .getPluginManager().getPluginInfoByName("ui_swing")
-                            .getPlugin()).getMainFrame());
-                } else {
-                    jc.setSelectedFile(givenFile);
-                    result = JFileChooser.APPROVE_OPTION;
+                final int result = showFileChooser(givenFile, target, jc);
+                if (result != JFileChooser.APPROVE_OPTION
+                        || !handleInvalidItems(jc)) {
+                    return;
                 }
-                if (result == JFileChooser.APPROVE_OPTION) {
-                    if (jc.getSelectedFile().length() == 0) {
-                        JOptionPane.showMessageDialog(null,
-                                "You can't send empty files over DCC.", "DCC Error",
-                                JOptionPane.ERROR_MESSAGE);
-                        return;
-                    } else if (!jc.getSelectedFile().exists()) {
-                        JOptionPane.showMessageDialog(null,
-                                "Invalid file specified", "DCC Error",
-                                JOptionPane.ERROR_MESSAGE);
-                        return;
-                    }
-                    final Parser parser = server.getParser();
-                    DCCTransfer send = new DCCTransfer(IdentityManager
-                            .getGlobalConfig().getOptionInt(myPlugin.getDomain(),
-                            "send.blocksize"));
-                    send.setTurbo(IdentityManager.getGlobalConfig()
-                            .getOptionBool(myPlugin.getDomain(), "send.forceturbo"));
-                    send.setType(DCCTransfer.TransferType.SEND);
+                final DCCTransfer send = new DCCTransfer(IdentityManager
+                        .getGlobalConfig().getOptionInt(myPlugin.getDomain(),
+                        "send.blocksize"));
+                send.setTurbo(IdentityManager.getGlobalConfig().getOptionBool(
+                        myPlugin.getDomain(), "send.forceturbo"));
+                send.setType(DCCTransfer.TransferType.SEND);
 
-                    ActionManager.processEvent(DCCActions.DCC_SEND_REQUEST_SENT,
-                            null, server, target, jc.getSelectedFile());
+                ActionManager.processEvent(DCCActions.DCC_SEND_REQUEST_SENT,
+                        null, server, target, jc.getSelectedFile());
 
-                    sendLine(origin, isSilent, FORMAT_OUTPUT,
-                            "Starting DCC Send with: " + target);
+                sendLine(origin, isSilent, FORMAT_OUTPUT,
+                        "Starting DCC Send with: " + target);
 
-                    send.setFileName(jc.getSelectedFile().getAbsolutePath());
-                    send.setFileSize(jc.getSelectedFile().length());
+                send.setFileName(jc.getSelectedFile().getAbsolutePath());
+                send.setFileSize(jc.getSelectedFile().length());
 
-                    if (IdentityManager.getGlobalConfig().getOptionBool(
-                            myPlugin.getDomain(), "send.reverse")) {
-                        new TransferContainer(myPlugin, send, "Send: "
+                if (IdentityManager.getGlobalConfig().getOptionBool(
+                        myPlugin.getDomain(), "send.reverse")) {
+                    final Parser parser = server.getParser();
+                    new TransferContainer(myPlugin, send, "Send: " + target,
+                            target, server);
+                    parser.sendCTCP(target, "DCC", "SEND \""
+                            + jc.getSelectedFile().getName() + "\" "
+                            + DCC.ipToLong(myPlugin.getListenIP(parser))
+                            + " 0 " + send.getFileSize() + " "
+                            + send.makeToken()
+                            + (send.isTurbo() ? " T" : ""));
+                } else {
+                    final Parser parser = server.getParser();
+                    if (myPlugin.listen(send)) {
+                        new TransferContainer(myPlugin, send, "*Send: "
                                 + target, target, server);
                         parser.sendCTCP(target, "DCC", "SEND \""
                                 + jc.getSelectedFile().getName() + "\" "
                                 + DCC.ipToLong(myPlugin.getListenIP(parser))
-                                + " 0 " + send.getFileSize() + " " + send.makeToken()
+                                + " " + send.getPort() + " " + send.getFileSize()
                                 + (send.isTurbo() ? " T" : ""));
                     } else {
-                        if (myPlugin.listen(send)) {
-                            new TransferContainer(myPlugin, send, "*Send: "
-                                    + target, target, server);
-                            parser.sendCTCP(target, "DCC", "SEND \""
-                                    + jc.getSelectedFile().getName() + "\" "
-                                    + DCC.ipToLong(myPlugin.getListenIP(parser))
-                                    + " " + send.getPort() + " " + send.getFileSize()
-                                    + (send.isTurbo() ? " T" : ""));
-                        } else {
-                            sendLine(origin, isSilent, "DCCSendError",
-                                    "Unable to start dcc send with " + target
-                                    + " - unable to create listen socket");
-                        }
+                        sendLine(origin, isSilent, "DCCSendError",
+                                "Unable to start dcc send with " + target
+                                + " - unable to create listen socket");
                     }
                 }
             }
 
-        }, "openFileThread");
-        // Start the thread
-        dccThread.start();
+        }, "openFileThread").start();
+    }
+
+    /**
+     * Checks for invalid items.
+     *
+     * @param jc File chooser to check
+     *
+     * @return true iif the selection was valid
+     */
+    private boolean handleInvalidItems(final JFileChooser jc) {
+        if (jc.getSelectedFile().length() == 0) {
+            JOptionPane.showMessageDialog(null,
+                    "You can't send empty files over DCC.", "DCC Error",
+                    JOptionPane.ERROR_MESSAGE);
+            return false;
+        } else if (!jc.getSelectedFile().exists()) {
+            JOptionPane.showMessageDialog(null, "Invalid file specified",
+                    "DCC Error", JOptionPane.ERROR_MESSAGE);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Sets up and display a file chooser.
+     *
+     * @param givenFile File to display
+     * @param target DCC target
+     * @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 File givenFile, final String target,
+            final JFileChooser jc) {
+        if (givenFile.exists() && givenFile.isFile()) {
+            jc.setSelectedFile(givenFile);
+            return JFileChooser.APPROVE_OPTION;
+        } else {
+        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());
+        }
     }
 
     /** {@inheritDoc} */

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

@@ -29,7 +29,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 
 /**
- * DCC CommandParser
+ * DCC CommandParser.
  */
 public final class DCCCommandParser extends GlobalCommandParser {
 
@@ -74,7 +74,8 @@ public final class DCCCommandParser extends GlobalCommandParser {
      * @param line The line input by the user
      */
     @Override
-    protected void handleNonCommand(final FrameContainer<?> origin, final String line) {
+    protected void handleNonCommand(final FrameContainer<?> origin,
+            final String line) {
         ((WritableFrameContainer<?>) origin).sendLine(line);
     }
 

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

@@ -26,67 +26,42 @@ import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.ui.interfaces.Window;
 
 /**
  * This class links DCC objects to a window.
  *
  * @param <T> The type of window which corresponds to this DCC frame
- * @author Shane 'Dataforce' McCormack
  */
 public abstract class DCCFrameContainer<T extends InputWindow> extends WritableFrameContainer<T> {
 
-    /** The dcc plugin that owns this frame */
-    protected final DCCPlugin plugin;
-
     /** The Window we're using. */
     private boolean windowClosing = false;
 
     /**
      * Creates a new instance of DCCFrame.
      *
-     * @param plugin The DCCPlugin that owns this frame
      * @param title The title of this window
      * @param icon The icon to use
      * @param windowClass The class of window to use for this container
      * @param parser Command parser to use for this window
      */
-    public DCCFrameContainer(final DCCPlugin plugin, final String title, final String icon,
+    public DCCFrameContainer(final String title, final String icon,
             final Class<T> windowClass, final CommandParser parser) {
-        super(icon, title, title, windowClass, IdentityManager.getGlobalConfig(), parser);
-        this.plugin = plugin;
-    }
-
-    /**
-     * Sends a line of text to this container's source.
-     *
-     * @param line The line to be sent
-     */
-    @Override
-    public void sendLine(final String line) {
+        super(icon, title, title, windowClass,
+                IdentityManager.getGlobalConfig(), parser);
     }
 
-    /**
-     * Returns the maximum length that a line passed to sendLine() should be,
-     * in order to prevent it being truncated or causing protocol violations.
-     *
-     * @return The maximum line length for this container
-     */
+    /** {@inheritDoc} */
     @Override
     public int getMaxLineLength() {
         return 512;
     }
 
-    /**
-     * Returns the server instance associated with this container.
-     *
-     * @return the associated server connection
-     */
+    /** {@inheritDoc} */
     @Override
-    public Server getServer() {
+    public Server getServer() { //NOPMD - server will always be null
         return null;
     }
 

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

@@ -60,26 +60,17 @@ import javax.swing.JOptionPane;
 
 /**
  * This plugin adds DCC to dmdirc.
- *
- * @author Shane 'Dataforce' McCormack
  */
 public final class DCCPlugin extends Plugin implements ActionListener {
 
     /** The DCCCommand we created. */
     private DCCCommand command;
-
     /** Our DCC Container window. */
     private PlaceholderContainer container;
 
     /**
-     * Creates a new instance of the DCC Plugin.
-     */
-    public DCCPlugin() {
-        super();
-    }
-
-    /**
-     * Ask a question, if the answer is the answer required, then recall handleProcessEvent.
+     * Ask a question, if the answer is the answer required, then recall
+     * handleProcessEvent.
      *
      * @param question Question to ask
      * @param title Title of question dialog
@@ -88,22 +79,23 @@ public final class DCCPlugin extends Plugin implements ActionListener {
      * @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) {
+    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
-        final Thread questionThread = new Thread(new Runnable() {
+        new Thread(new Runnable() {
 
             /** {@inheritDoc} */
             @Override
             public void run() {
-                int result = JOptionPane.showConfirmDialog(null, question, title, JOptionPane.YES_NO_OPTION);
+                final int result = JOptionPane.showConfirmDialog(null, question,
+                        title, JOptionPane.YES_NO_OPTION);
                 if (result == desiredAnswer) {
                     handleProcessEvent(type, format, true, arguments);
                 }
             }
 
-        }, "QuestionThread: " + title);
-        // Start the thread
-        questionThread.start();
+        }, "QuestionThread: " + title).start();
     }
 
     /**
@@ -113,97 +105,164 @@ public final class DCCPlugin extends Plugin implements ActionListener {
      * @param send The DCCSend to save for.
      * @param parser The parser this send was received on
      * @param reverse Is this a reverse dcc?
-     * @param sendFilename The name of the file which is being received
      * @param token Token used in reverse dcc.
      */
-    public void saveFile(final String nickname, final DCCTransfer send, final Parser parser, final boolean reverse, final String sendFilename, final String token) {
+    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
-        final Thread dccThread = new Thread(new Runnable() {
+        new Thread(new Runnable() {
 
             /** {@inheritDoc} */
             @Override
             public void run() {
-                final JFileChooser jc = KFileChooser.getFileChooser(DCCPlugin.this, IdentityManager.getGlobalConfig().getOption(getDomain(), "receive.savelocation"));
-                jc.setDialogTitle("Save " + sendFilename + " As - DMDirc");
-                jc.setFileSelectionMode(JFileChooser.FILES_ONLY);
-                jc.setMultiSelectionEnabled(false);
-                jc.setSelectedFile(new File(send.getFileName()));
+                final JFileChooser jc = KFileChooser.getFileChooser(
+                        DCCPlugin.this, IdentityManager.getGlobalConfig()
+                        .getOption(getDomain(), "receive.savelocation"));
                 int result;
-                if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.autoaccept")) {
+                if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(),
+                        "receive.autoaccept")) {
                     result = JFileChooser.APPROVE_OPTION;
                 } else {
-                    result = jc.showSaveDialog(((SwingController) PluginManager
-                            .getPluginManager().getPluginInfoByName("ui_swing")
-                            .getPlugin()).getMainFrame());
+                    result = showFileChooser(send, jc);
                 }
-                if (result == JFileChooser.APPROVE_OPTION) {
-                    send.setFileName(jc.getSelectedFile().getPath());
-                    boolean resume = false;
-                    if (jc.getSelectedFile().exists()) {
-                        if (send.getFileSize() > -1 && send.getFileSize() <= jc.getSelectedFile().length()) {
-                            if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.autoaccept")) {
-                                return;
-                            } else {
-                                JOptionPane.showMessageDialog(
-                                        ((SwingController) PluginManager
-                                        .getPluginManager().getPluginInfoByName("ui_swing")
-                                        .getPlugin()).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, sendFilename, token);
-                                return;
-                            }
-                        } else {
-                            if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.autoaccept")) {
-                                resume = true;
-                            } else {
-                                result = JOptionPane.showConfirmDialog(
-                                        ((SwingController) PluginManager
-                                        .getPluginManager().getPluginInfoByName("ui_swing")
-                                        .getPlugin()).getMainFrame(), "This file exists already, do you want to resume an exisiting download?", "Resume Download?", JOptionPane.YES_NO_OPTION);
-                                resume = (result == JOptionPane.YES_OPTION);
-                            }
-                        }
-                    }
+                if (result != JFileChooser.APPROVE_OPTION) {
+                    return;
+                }
+                send.setFileName(jc.getSelectedFile().getPath());
+                if (!handleExists(send, jc, nickname, parser,reverse, token)) {
+                    return;
+                }
+                boolean resume = handleResume(jc);
                     if (reverse && !token.isEmpty()) {
-                        new TransferContainer(DCCPlugin.this, send, "*Receive: " + nickname, nickname, null);
+                        new TransferContainer(DCCPlugin.this, send,
+                                "*Receive: " + nickname, nickname, null);
                         send.setToken(token);
                         if (resume) {
-                            if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.reverse.sendtoken")) {
-                                parser.sendCTCP(nickname, "DCC", "RESUME " + sendFilename + " 0 " + jc.getSelectedFile().length() + " " + token);
+                            if (IdentityManager.getGlobalConfig().getOptionBool(
+                                    getDomain(), "receive.reverse.sendtoken")) {
+                                parser.sendCTCP(nickname, "DCC", "RESUME "
+                                        + send.getShortFileName() + " 0 "
+                                        + jc.getSelectedFile().length() + " "
+                                        + token);
                             } else {
-                                parser.sendCTCP(nickname, "DCC", "RESUME " + sendFilename + " 0 " + jc.getSelectedFile().length());
+                                parser.sendCTCP(nickname, "DCC", "RESUME " 
+                                        + send.getShortFileName() + " 0 "
+                                        + jc.getSelectedFile().length());
                             }
                         } else {
                             if (listen(send)) {
-                                parser.sendCTCP(nickname, "DCC", "SEND " + sendFilename + " " + DCC.ipToLong(getListenIP(parser)) + " " + send.getPort() + " " + send.getFileSize() + " " + token);
-                            } else {
-                                // Listen failed.
+                                parser.sendCTCP(nickname, "DCC", "SEND " 
+                                        + send.getShortFileName() + " "
+                                        + DCC.ipToLong(getListenIP(parser))
+                                        + " " + send.getPort() + " "
+                                        + send.getFileSize() + " " + token);
                             }
                         }
                     } else {
-                        new TransferContainer(DCCPlugin.this, send, "Receive: " + nickname, nickname, null);
+                        new TransferContainer(DCCPlugin.this, send, "Receive: "
+                                + nickname, nickname, null);
                         if (resume) {
-                            parser.sendCTCP(nickname, "DCC", "RESUME " + sendFilename + " " + send.getPort() + " " + jc.getSelectedFile().length());
+                            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 (IdentityManager.getGlobalConfig().getOptionBool(getDomain(),
+                    "receive.autoaccept")) {
+                return false;
+            } else {
+                JOptionPane.showMessageDialog(((SwingController) PluginManager
+                        .getPluginManager().getPluginInfoByName("ui_swing")
+                        .getPlugin()).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;
+    }
 
-        }, "saveFileThread: " + sendFilename);
-        // Start the thread
-        dccThread.start();
+    /**
+     * 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 (IdentityManager.getGlobalConfig().getOptionBool(getDomain(),
+                    "receive.autoaccept")) {
+                return true;
+            } else {
+                final int result = JOptionPane.showConfirmDialog(
+                        ((SwingController) PluginManager
+                        .getPluginManager().getPluginInfoByName("ui_swing")
+                        .getPlugin()).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;
     }
 
     /**
-     * Process an event of the specified type.
+     * Sets up and display a file chooser.
      *
-     * @param type The type of the event to process
-     * @param format Format of messages that are about to be sent. (May be null)
-     * @param arguments The arguments for the event
+     * @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(((SwingController) PluginManager
+                .getPluginManager().getPluginInfoByName("ui_swing")
+                .getPlugin()).getMainFrame());
+    }
+
+    /** {@inheritDoc} */
     @Override
-    public void processEvent(final ActionType type, final StringBuffer format, final Object... arguments) {
+    public void processEvent(final ActionType type, final StringBuffer format,
+            final Object... arguments) {
         handleProcessEvent(type, format, false, arguments);
     }
 
@@ -216,13 +275,14 @@ public final class DCCPlugin extends Plugin 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 int startPort = IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "firewall.ports.startPort");
-        final int endPort = IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "firewall.ports.endPort");
-
+        final boolean usePortRange = IdentityManager.getGlobalConfig()
+                .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");
                 dcc.listen(startPort, endPort);
             } else {
                 dcc.listen();
@@ -241,193 +301,280 @@ public final class DCCPlugin extends Plugin implements ActionListener {
      * @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 (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.autoaccept") && !dontAsk) {
+    public void handleProcessEvent(final ActionType type, 
+            final StringBuffer format, final boolean dontAsk,
+            final Object... arguments) {
+        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(),
+                "receive.autoaccept") && !dontAsk) {
             handleProcessEvent(type, format, true, arguments);
             return;
         }
 
         if (type == CoreActionType.SERVER_CTCP) {
-            final String ctcpType = (String) arguments[2];
             final String[] ctcpData = ((String) arguments[3]).split(" ");
-            if (ctcpType.equalsIgnoreCase("DCC")) {
-                if (ctcpData[0].equalsIgnoreCase("chat") && ctcpData.length > 3) {
-                    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(this, chat, "Chat: " + nickname, myNickname, nickname);
-                        f.addLine("DCCChatStarting", nickname, chat.getHost(), chat.getPort());
-                        chat.connect();
-                    } else {
-                        ActionManager.processEvent(DCCActions.DCC_CHAT_REQUEST, null, ((Server) arguments[0]), nickname);
-                        askQuestion("User " + nickname + " on " + ((Server) arguments[0]).toString() + " would like to start a DCC Chat with you.\n\nDo you want to continue?", "DCC Chat Request", JOptionPane.YES_OPTION, type, format, arguments);
-                        return;
-                    }
-                } else if (ctcpData[0].equalsIgnoreCase("send") && ctcpData.length > 3) {
-                    final String nickname = ((ClientInfo) arguments[1]).getNickname();
-                    final String filename;
-                    String tmpFilename;
-                    // Clients tend to put files with spaces in the name in "" so lets look for that.
-                    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(" " + bit.substring(0, bit.length() - 1));
-                                break;
-                            } else {
-                                filenameBits.append(" " + bit);
-                            }
-                        }
-                        tmpFilename = filenameBits.toString().trim();
-                    } else {
-                        tmpFilename = ctcpData[1];
-                        i = 1;
-                    }
+            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);
+                }
+            }
+        }
+    }
 
-                    // 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] : "";
+    /**
+     * 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(this, chat,
+                    "Chat: " + nickname, myNickname, nickname);
+            f.addLine("DCCChatStarting", nickname, chat.getHost(),
+                    chat.getPort());
+            chat.connect();
+        } else {
+            ActionManager.processEvent(DCCActions.DCC_CHAT_REQUEST, null,
+                    ((Server) arguments[0]), nickname);
+            askQuestion("User " + nickname + " on "
+                    + ((Server) arguments[0]).toString()
+                    + " 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);
+            return;
+        }
+    }
 
-                    // Ignore incorrect ports, or non-numeric IP/Port
-                    try {
-                        int portInt = Integer.parseInt(port);
-                        if (portInt > 65535 || portInt < 0) {
-                            return;
-                        }
-                        Long.parseLong(ip);
-                    } catch (NumberFormatException nfe) {
-                        return;
-                    }
+    /**
+     * 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;
+        }
 
-                    DCCTransfer send = DCCTransfer.findByToken(token);
+        // 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();
 
-                    if (send == null && !dontAsk) {
-                        if (!token.isEmpty() && !port.equals("0")) {
-                            // This is a reverse DCC Send that we no longer care about.
-                            return;
-                        } else {
-                            ActionManager.processEvent(DCCActions.DCC_SEND_REQUEST, null, ((Server) arguments[0]), nickname, filename);
-                            askQuestion("User " + nickname + " on " + ((Server) arguments[0]).toString() + " 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);
-                            return;
-                        }
-                    } 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"));
-                        }
-                        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), (quoted) ? "\"" + filename + "\"" : filename, token);
-                        } else {
-                            send.connect();
-                        }
-                    }
-                } else if ((ctcpData[0].equalsIgnoreCase("resume") || ctcpData[0].equalsIgnoreCase("accept")) && ctcpData.length > 2) {
-
-                    final String filename;
-                    // Clients tend to put files with spaces in the name in "" so lets look for that.
-                    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(" " + bit.substring(0, bit.length() - 1));
-                                break;
+        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 {
+            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.
+                return;
+            } else {
+                ActionManager.processEvent(DCCActions.DCC_SEND_REQUEST, null,
+                        ((Server) arguments[0]), nickname, filename);
+                askQuestion("User " + nickname + " on "
+                        + ((Server) arguments[0]).toString()
+                        + " 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);
+                return;
+            }
+        } 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"));
+            }
+            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 {
-                                filenameBits.append(" " + bit);
+                                parser.sendCTCP(nick, "DCC", "SEND "
+                                        + ((quoted) ? "\"" + filename
+                                        + "\"" : filename) 
+                                        + " " + DCC.ipToLong(send.getHost())
+                                        + " " + send.getPort()
+                                        + " " + send.getFileSize() + " "
+                                        + send.getToken());
                             }
                         }
-                        filename = filenameBits.toString().trim();
                     } else {
-                        filename = ctcpData[1];
-                        i = 1;
-                    }
-
-                    try {
-                        final int port = Integer.parseInt(ctcpData[++i]);
-                        final int position = Integer.parseInt(ctcpData[++i]);
-                        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 nickname = ((ClientInfo) arguments[1]).getNickname();
-                                if (ctcpData[0].equalsIgnoreCase("resume")) {
-                                    parser.sendCTCP(nickname, "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(nickname, "DCC", "SEND " + ((quoted) ? "\"" + filename + "\"" : filename) + " " + DCC.ipToLong(send.getHost()) + " " + send.getPort() + " " + send.getFileSize());
-                                            } else {
-                                                parser.sendCTCP(nickname, "DCC", "SEND " + ((quoted) ? "\"" + filename + "\"" : filename) + " " + DCC.ipToLong(send.getHost()) + " " + send.getPort() + " " + send.getFileSize() + " " + send.getToken());
-                                            }
-                                        } else {
-                                            // Listen failed.
-                                        }
-                                    } else {
-                                        send.connect();
-                                    }
-                                }
-                            }
-                        }
-                    } catch (NumberFormatException nfe) {
+                        send.connect();
                     }
                 }
             }
         }
     }
 
+
+
     /**
      * Retrieves the container for the placeholder.
      *
@@ -465,7 +612,8 @@ public final class DCCPlugin extends Plugin implements ActionListener {
         final Identity defaults = IdentityManager.getAddonIdentity();
 
         defaults.setOption(getDomain(), "receive.savelocation",
-                Main.getConfigDir() + "downloads" + System.getProperty("file.separator"));
+                Main.getConfigDir() + "downloads"
+                + System.getProperty("file.separator"));
     }
 
     /**
@@ -473,17 +621,20 @@ public final class DCCPlugin extends Plugin implements ActionListener {
      */
     @Override
     public void onLoad() {
-        final File dir = new File(IdentityManager.getGlobalConfig().getOption(getDomain(), "receive.savelocation"));
+        final File dir = new File(IdentityManager.getGlobalConfig()
+                .getOption(getDomain(), "receive.savelocation"));
         if (dir.exists()) {
             if (!dir.isDirectory()) {
-                Logger.userError(ErrorLevel.LOW, "Unable to create download dir (file exists instead)");
+                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");
+                Logger.userError(ErrorLevel.LOW,
+                        "Unable to create download dir");
             }
         }
 
@@ -522,12 +673,13 @@ public final class DCCPlugin extends Plugin 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 = IdentityManager.getGlobalConfig().getOption(
+                getDomain(), "firewall.ip");
         if (!configIP.isEmpty()) {
             try {
                 return InetAddress.getByName(configIP).getHostAddress();
-            } catch (UnknownHostException ex) {
-                //Fallthrough
+            } catch (UnknownHostException ex) { //NOPMD - handled below
+                //Continue below
             }
         }
         if (parser != null) {
@@ -535,7 +687,9 @@ public final class DCCPlugin extends Plugin implements ActionListener {
             if (!myHost.isEmpty()) {
                 try {
                     return InetAddress.getByName(myHost).getHostAddress();
-                } catch (UnknownHostException e) { /* Will return default host below */ }
+                } catch (UnknownHostException e) { //NOPMD - handled below
+                    //Continue below
+                }
             }
         }
         try {
@@ -543,17 +697,21 @@ public final class DCCPlugin extends Plugin implements ActionListener {
         } 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";
+            return "127.0.0.1"; //NOPMD
         }
     }
 
     /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
-        final PreferencesCategory general = new PluginPreferencesCategory(getPluginInfo(), "DCC", "", "category-dcc");
-        final PreferencesCategory firewall = new PluginPreferencesCategory(getPluginInfo(), "Firewall", "");
-        final PreferencesCategory sending = new PluginPreferencesCategory(getPluginInfo(), "Sending", "");
-        final PreferencesCategory receiving = new PluginPreferencesCategory(getPluginInfo(), "Receiving", "");
+        final PreferencesCategory general = new PluginPreferencesCategory(
+                getPluginInfo(), "DCC", "", "category-dcc");
+        final PreferencesCategory firewall = new PluginPreferencesCategory(
+                getPluginInfo(), "Firewall", "");
+        final PreferencesCategory sending = new PluginPreferencesCategory(
+                getPluginInfo(), "Sending", "");
+        final PreferencesCategory receiving = new PluginPreferencesCategory(
+                getPluginInfo(), "Receiving", "");
 
         manager.getCategory("Plugins").addSubCategory(general.setInlineAfter());
         general.addSubCategory(firewall.setInline());
@@ -565,7 +723,8 @@ public final class DCCPlugin extends Plugin implements ActionListener {
                 "What IP should be sent as our IP (Blank = work it out)"));
         firewall.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "firewall.ports.usePortRange", "Use Port Range",
-                "Useful if you have a firewall that only forwards specific ports"));
+                "Useful if you have a firewall that only forwards specific "
+                + "ports"));
         firewall.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
                 getDomain(), "firewall.ports.startPort", "Start Port",
                 "Port to try to listen on first"));
@@ -577,25 +736,26 @@ public final class DCCPlugin extends Plugin implements ActionListener {
                 "Where the save as window defaults to?"));
         sending.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "send.reverse", "Reverse DCC",
-                "With reverse DCC, the sender connects rather than " +
-                "listens like normal dcc"));
+                "With reverse DCC, the sender connects rather than "
+                + "listens like normal dcc"));
         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."));
+                "Turbo DCC doesn't wait for ack packets. this is "
+                + "faster but not always supported."));
         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."));
+                "If you have problems with reverse dcc receive resume,"
+                + " try toggling this."));
         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."));
+                "Change the block size for send/receive, this can "
+                + "sometimes speed up transfers."));
         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"));
+                "Show the current percentage of transfers in the DCC window "
+                + "title"));
     }
 
-}
+}

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

@@ -34,7 +34,6 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.interfaces.Window;
 
 import java.awt.Desktop;
 import java.io.File;
@@ -82,7 +81,8 @@ public class TransferContainer extends FrameContainer<TransferWindow> implements
             Desktop.getDesktop().isSupported(Desktop.Action.OPEN);
 
     /**
-     * Creates a new instance of DCCTransferWindow with a given DCCTransfer object.
+     * Creates a new instance of DCCTransferWindow with a given DCCTransfer
+     * object.
      *
      * @param plugin the DCC Plugin responsible for this window
      * @param dcc The DCCTransfer object this window wraps around
@@ -94,7 +94,8 @@ public class TransferContainer extends FrameContainer<TransferWindow> implements
             final String title, final String targetNick, final Server server) {
         super(dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
-                title, title, TransferWindow.class, IdentityManager.getGlobalConfig());
+                title, title, TransferWindow.class,
+                IdentityManager.getGlobalConfig());
         this.plugin = plugin;
         this.dcc = dcc;
         this.server = server;
@@ -102,7 +103,8 @@ public class TransferContainer extends FrameContainer<TransferWindow> implements
         this.myPlugin = plugin;
 
         if (parser != null) {
-            parser.getCallbackManager().addNonCriticalCallback(SocketCloseListener.class, this);
+            parser.getCallbackManager().addNonCriticalCallback(
+                    SocketCloseListener.class, this);
         }
         dcc.addHandler(this);
 
@@ -152,20 +154,24 @@ public class TransferContainer extends FrameContainer<TransferWindow> implements
             percent = getPercent();
         }
 
-        boolean percentageInTitle = IdentityManager.getGlobalConfig().getOptionBool(
-                            plugin.getDomain(), "general.percentageInTitle");
+        boolean percentageInTitle = IdentityManager.getGlobalConfig()
+                .getOptionBool(plugin.getDomain(), "general.percentageInTitle");
 
         if (percentageInTitle) {
             final StringBuilder title = new StringBuilder();
             if (dcc.isListenSocket()) { title.append("*"); }
-            title.append(dcc.getType() == DCCTransfer.TransferType.SEND ? "Sending: " : "Recieving: ");
+            title.append(dcc.getType() == DCCTransfer.TransferType.SEND
+                    ? "Sending: " : "Recieving: ");
             title.append(otherNickname);
-            title.append(" ("+ String.format("%.0f", Math.floor(percent)) +"%)");
+            title.append(" (")
+                    .append(String.format("%.0f", Math.floor(percent)))
+                    .append("%)");
             setName(title.toString());
             setTitle(title.toString());
         }
 
-        ActionManager.processEvent(DCCActions.DCC_SEND_DATATRANSFERED, null, this, bytes);
+        ActionManager.processEvent(DCCActions.DCC_SEND_DATATRANSFERED,
+                null, this, bytes);
     }
 
     /**
@@ -175,7 +181,8 @@ public class TransferContainer extends FrameContainer<TransferWindow> implements
      * @return The percentage of this transfer that has been completed
      */
     public double getPercent() {
-        return (100.00 / dcc.getFileSize()) * (transferCount + dcc.getFileStart());
+        return (100.00 / dcc.getFileSize()) * (transferCount
+                + dcc.getFileStart());
     }
 
     /**
@@ -203,7 +210,8 @@ public class TransferContainer extends FrameContainer<TransferWindow> implements
         final long remaningBytes;
 
         synchronized (this) {
-            remaningBytes = dcc.getFileSize() - dcc.getFileStart() - transferCount;
+            remaningBytes = dcc.getFileSize() - dcc.getFileStart()
+                    - transferCount;
         }
 
         return bytesPerSecond > 0 ? (remaningBytes / bytesPerSecond) : 1;
@@ -213,7 +221,8 @@ public class TransferContainer extends FrameContainer<TransferWindow> implements
      * Retrieves the timestamp at which this transfer started.
      *
      * @since 0.6.4
-     * @return The timestamp (milliseconds since 01/01/1970) at which this transfer started.
+     * @return The timestamp (milliseconds since 01/01/1970) at which this
+     * transfer started.
      */
     public long getStartTime() {
         return timeStarted;
@@ -257,7 +266,8 @@ public class TransferContainer extends FrameContainer<TransferWindow> implements
      */
     @Override
     public void socketClosed(final DCCTransfer dcc) {
-        ActionManager.processEvent(DCCActions.DCC_SEND_SOCKETCLOSED, null, this);
+        ActionManager.processEvent(DCCActions.DCC_SEND_SOCKETCLOSED, null,
+                this);
         if (!windowClosing) {
             synchronized (this) {
                 if (transferCount == dcc.getFileSize() - dcc.getFileStart()) {
@@ -278,7 +288,8 @@ public class TransferContainer extends FrameContainer<TransferWindow> implements
      */
     @Override
     public void socketOpened(final DCCTransfer dcc) {
-        ActionManager.processEvent(DCCActions.DCC_SEND_SOCKETOPENED, null, this);
+        ActionManager.processEvent(DCCActions.DCC_SEND_SOCKETOPENED, null,
+                this);
         timeStarted = System.currentTimeMillis();
         setIcon(dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-active" : "dcc-receive-active");
@@ -297,9 +308,10 @@ public class TransferContainer extends FrameContainer<TransferWindow> implements
         dcc.reset();
 
         if (server != null && server.getState() == ServerState.CONNECTED) {
-            final String myNickname = server.getParser().getLocalClient().getNickname();
-            // Check again incase we have changed nickname to the same nickname that
-            // this send is for.
+            final String myNickname = server.getParser().getLocalClient()
+                    .getNickname();
+            // Check again incase we have changed nickname to the same nickname
+            //that this send is for.
             if (server.getParser().getStringConverter().equalsIgnoreCase(
                     otherNickname, myNickname)) {
                 final Thread errorThread = new Thread(new Runnable() {
@@ -347,7 +359,7 @@ public class TransferContainer extends FrameContainer<TransferWindow> implements
         // 2: Remove any callbacks or listeners
         // 3: Trigger any actions neccessary
         dcc.removeFromTransfers();
-        
+
         // 4: Trigger action for the window closing
         // 5: Inform any parents that the window is closing
     }
@@ -361,7 +373,8 @@ public class TransferContainer extends FrameContainer<TransferWindow> implements
     public void addSocketCloseCallback(final SocketCloseListener listener) {
         if (server != null && server.getParser() != null) {
             server.getParser().getCallbackManager()
-                    .addNonCriticalCallback(SocketCloseListener.class, listener);
+                    .addNonCriticalCallback(SocketCloseListener.class,
+                    listener);
         }
     }
 

src/com/dmdirc/addons/mediasource_dbus/DBusMediaSource.java

@@ -24,6 +24,8 @@ package com.dmdirc.addons.mediasource_dbus;
 
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceManager;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.Plugin;
 
 import java.io.BufferedReader;
@@ -107,9 +109,7 @@ public class DBusMediaSource extends Plugin implements MediaSourceManager {
         exeArgs[2] = iface;
         exeArgs[3] = method;
 
-        for (int i = 0; i < args.length; i++) {
-            exeArgs[4 + i] = args[i]; //NOPMD
-        }
+        System.arraycopy(args, 0, exeArgs, 4, args.length);
 
         return getInfo(exeArgs);
     }
@@ -143,7 +143,7 @@ public class DBusMediaSource extends Plugin implements MediaSourceManager {
             input.close();
             process.destroy();
         } catch (IOException ex) {
-            ex.printStackTrace();
+            Logger.userError(ErrorLevel.HIGH, "Unable to get dbus info", ex);
         }
 
         return result;
@@ -155,7 +155,8 @@ public class DBusMediaSource extends Plugin implements MediaSourceManager {
      * @param lines The lines to be parsed as a dictionary
      * @return A map corresponding to the specified dictionary
      */
-    protected static Map<String, String> parseDictionary(final List<String> lines) {
+    protected static Map<String, String> parseDictionary(
+            final List<String> lines) {
         final Map<String, String> res = new HashMap<String, String>();
 
         for (String line : lines) {

src/com/dmdirc/addons/ui_swing/Apple.java

@@ -55,7 +55,8 @@ import javax.swing.UIManager;
 public final class Apple implements InvocationHandler, ActionListener {
 
     /**
-     * Dummy interface for ApplicationEvent from the Apple UI on non-Apple platforms.
+     * Dummy interface for ApplicationEvent from the Apple UI on non-Apple
+     * platforms.
      * http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/ApplicationEvent.html
      */
     public interface ApplicationEvent {
@@ -108,7 +109,7 @@ public final class Apple implements InvocationHandler, ActionListener {
     /** The MenuBar for the application. */
     private MenuBar menuBar = null;
     /** Has the CLIENT_OPENED action been called? */
-    private volatile boolean clientOpened = false;
+    private boolean clientOpened = false;
     /** Store any addresses that are opened before CLIENT_OPENED. */
     private final List<URI> addresses = new ArrayList<URI>();
 
@@ -118,10 +119,12 @@ public final class Apple implements InvocationHandler, ActionListener {
      * @return Apple instance.
      */
     public static Apple getApple() {
-        if (me == null) {
-            me = new Apple();
+        synchronized (Apple.class) {
+            if (me == null) {
+                me = new Apple();
+            }
+            return me;
         }
-        return me;
     }
 
     /**
@@ -137,7 +140,7 @@ public final class Apple implements InvocationHandler, ActionListener {
     private Apple() {
         if (isApple()) {
             try {
-                System.loadLibrary("DMDirc-Apple");
+                System.loadLibrary("DMDirc-Apple"); //NOPMD
                 registerOpenURLCallback();
                 ActionManager.addListener(this, CoreActionType.CLIENT_OPENED);
             } catch (UnsatisfiedLinkError ule) {
@@ -153,27 +156,30 @@ public final class Apple implements InvocationHandler, ActionListener {
      * @return Object that on OSX will be an "Application"
      */
     public static Object getApplication() {
-        if (application == null && isApple()) {
-            try {
-                final Class<?> app = Class.forName("com.apple.eawt.Application");
-                final Method method = app.getMethod("getApplication",
-                        new Class[0]);
-                application = method.invoke(null, new Object[0]);
-            } catch (ClassNotFoundException ex) {
-                // Probably not on OS X, do nothing.
-            } catch (NoSuchMethodException ex) {
-                // Probably not on OS X, do nothing.
-            } catch (SecurityException ex) {
-                // Probably not on OS X, do nothing.
-            } catch (IllegalAccessException ex) {
-                // Probably not on OS X, do nothing.
-            } catch (IllegalArgumentException ex) {
-                // Probably not on OS X, do nothing.
-            } catch (InvocationTargetException ex) {
-                // Probably not on OS X, do nothing.
+        synchronized (Apple.class) {
+            if (isApple() && application == null) {
+                try {
+                    final Class<?> app = Class.forName(
+                            "com.apple.eawt.Application");
+                    final Method method = app.getMethod("getApplication",
+                            new Class[0]);
+                    application = method.invoke(null, new Object[0]);
+                } catch (ClassNotFoundException ex) {
+                    application = null;
+                } catch (NoSuchMethodException ex) {
+                    application = null;
+                } catch (SecurityException ex) {
+                    application = null;
+                } catch (IllegalAccessException ex) {
+                    application = null;
+                } catch (IllegalArgumentException ex) {
+                    application = null;
+                } catch (InvocationTargetException ex) {
+                    application = null;
+                }
             }
+            return application;
         }
-        return application;
     }
 
     /**
@@ -182,24 +188,26 @@ public final class Apple implements InvocationHandler, ActionListener {
      * @return Object that on OSX will be an "NSApplication"
      */
     public static Object getNSApplication() {
-        if (nsApplication == null && isApple()) {
-            try {
-                final Class<?> app = Class.forName(
-                        "com.apple.cocoa.application.NSApplication");
-                final Method method = app.getMethod("sharedApplication",
-                        new Class[0]);
-                nsApplication = method.invoke(null, new Object[0]);
-            } catch (ClassNotFoundException ex) {
-                // Probably not on OS X, do nothing.
-            } catch (NoSuchMethodException ex) {
-                // Probably not on OS X, do nothing.
-            } catch (IllegalAccessException ex) {
-                // Probably not on OS X, do nothing.
-            } catch (InvocationTargetException ex) {
-                // Probably not on OS X, do nothing.
-            }
+        synchronized (Apple.class) {
+           if (isApple() && nsApplication == null) {
+               try {
+                    final Class<?> app = Class.forName(
+                            "com.apple.cocoa.application.NSApplication");
+                    final Method method = app.getMethod("sharedApplication",
+                            new Class[0]);
+                    nsApplication = method.invoke(null, new Object[0]);
+               } catch (ClassNotFoundException ex) {
+                   nsApplication = null;
+               } catch (NoSuchMethodException ex) {
+                    nsApplication = null;
+                } catch (IllegalAccessException ex) {
+                    nsApplication = null;
+               } catch (InvocationTargetException ex) {
+                  nsApplication = null;
+               }
+          }
+         return nsApplication;
         }
-        return nsApplication;
     }
 
     /**
@@ -263,13 +271,13 @@ public final class Apple implements InvocationHandler, ActionListener {
                     "requestUserAttention", new Class[]{Integer.TYPE});
             method.invoke(getNSApplication(), new Object[]{type.get(null)});
         } catch (NoSuchFieldException ex) {
-            // Probably not on OS X, do nothing.
+            Logger.userError(ErrorLevel.LOW, "Unable to find OS X classes");
         } catch (NoSuchMethodException ex) {
-            // Probably not on OS X, do nothing.
+            Logger.userError(ErrorLevel.LOW, "Unable to find OS X classes");
         } catch (IllegalAccessException ex) {
-            // Probably not on OS X, do nothing.
+            Logger.userError(ErrorLevel.LOW, "Unable to find OS X classes");
         } catch (InvocationTargetException ex) {
-            // Probably not on OS X, do nothing.
+            Logger.userError(ErrorLevel.LOW, "Unable to find OS X classes");
         }
     }
 
@@ -305,15 +313,14 @@ public final class Apple implements InvocationHandler, ActionListener {
             method.invoke(getApplication(), new Object[]{Boolean.TRUE});
             return true;
         } catch (ClassNotFoundException ex) {
-            // Probably not on OS X, do nothing.
+            return false;
         } catch (NoSuchMethodException ex) {
-            // Probably not on OS X, do nothing.
+            return false;
         } catch (IllegalAccessException ex) {
-            // Probably not on OS X, do nothing.
+            return false;
         } catch (InvocationTargetException ex) {
-            // Probably not on OS X, do nothing.
+            return false;
         }
-        return false;
     }
 
     /**
@@ -357,21 +364,23 @@ public final class Apple implements InvocationHandler, ActionListener {
      * Set the MenuBar.
      * This will unset all menu mnemonics aswell if on the OSX ui.
      *
-     * @param menuBar MenuBar to use to send events to,
+     * @param newMenuBar MenuBar to use to send events to,
      */
-    public void setMenuBar(final MenuBar menuBar) {
-        this.menuBar = menuBar;
-        if (isAppleUI()) {
-            for (int i = 0; i < menuBar.getMenuCount(); i++) {
-                final JMenu menu = menuBar.getMenu(i);
-                if (menu != null) {
-                    menu.setMnemonic(0);
-                    for (int j = 0; j < menu.getItemCount(); j++) {
-                        final JMenuItem menuItem = menu.getItem(j);
-                        if (menuItem != null) {
-                            menuItem.setMnemonic(0);
-                        }
-                    }
+    public void setMenuBar(final MenuBar newMenuBar) {
+        this.menuBar = newMenuBar;
+        if (!isAppleUI()) {
+            return;
+        }
+        for (int i = 0; i < menuBar.getMenuCount(); i++) {
+            final JMenu menu = menuBar.getMenu(i);
+            if (menu == null) {
+                continue;
+            }
+            menu.setMnemonic(0);
+            for (int j = 0; j < menu.getItemCount(); j++) {
+                final JMenuItem menuItem = menu.getItem(j);
+                if (menuItem != null) {
+                    menuItem.setMnemonic(0);
                 }
             }
         }
@@ -429,6 +438,7 @@ public final class Apple implements InvocationHandler, ActionListener {
      * @param event an ApplicationEvent object
      */
     public void handleOpenApplication(final ApplicationEvent event) {
+        //We don't currently support this
     }
 
     /**
@@ -437,6 +447,7 @@ public final class Apple implements InvocationHandler, ActionListener {
      * @param event an ApplicationEvent object
      */
     public void handleOpenFile(final ApplicationEvent event) {
+        //We don't currently support this
     }
 
     /**
@@ -445,6 +456,7 @@ public final class Apple implements InvocationHandler, ActionListener {
      * @param event an ApplicationEvent object
      */
     public void handlePrintFile(final ApplicationEvent event) {
+        //We don't currently support this
     }
 
     /**
@@ -453,6 +465,7 @@ public final class Apple implements InvocationHandler, ActionListener {
      * @param event an ApplicationEvent object
      */
     public void handleReopenApplication(final ApplicationEvent event) {
+        //We don't currently support this
     }
 
     /** {@inheritDoc} */
@@ -479,25 +492,27 @@ public final class Apple implements InvocationHandler, ActionListener {
      * @param url The irc url to connect to.
      */
     public void handleOpenURL(final String url) {
-        if (isApple()) {
+        if (!isApple()) {
+            return;
+        }
+        synchronized (addresses) {
             try {
-                synchronized (addresses) {
-                    final URI addr = NewServer.getURI(url);
-                    if (!clientOpened) {
-                        addresses.add(addr);
-                    } else {
-                        // When the JNI callback is called there is no
-                        // ContextClassLoader set, which causes an NPE in
-                        // IconManager if no servers have been connected to yet.
-                        if (Thread.currentThread().getContextClassLoader() ==
-                                null) {
-                            Thread.currentThread().setContextClassLoader(ClassLoader.
-                                    getSystemClassLoader());
-                        }
-                        ServerManager.getServerManager().connectToAddress(addr);
+                final URI addr = NewServer.getURI(url);
+                if (clientOpened) {
+                    // When the JNI callback is called there is no
+                    // ContextClassLoader set, which causes an NPE in
+                    // IconManager if no servers have been connected to yet.
+                    if (Thread.currentThread().getContextClassLoader()
+                            == null) {
+                        Thread.currentThread().setContextClassLoader(
+                                ClassLoader.getSystemClassLoader());
                     }
+                    ServerManager.getServerManager().connectToAddress(addr);
+                } else {
+                    addresses.add(addr);
                 }
             } catch (URISyntaxException iae) {
+                //Do nothing
             }
         }
     }

src/com/dmdirc/addons/ui_swing/SwingController.java

@@ -83,7 +83,6 @@ import java.awt.GraphicsEnvironment;
 import java.awt.KeyboardFocusManager;
 import java.awt.Toolkit;
 import java.awt.Dialog.ModalityType;
-import java.io.Serializable;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;

src/com/dmdirc/addons/ui_swing/dialogs/StandardDialog.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs;
 
-import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.ui.CoreUIUtils;
 
 import java.awt.Component;

src/com/dmdirc/addons/ui_swing/framemanager/tree/NodeLabel.java

@@ -37,7 +37,6 @@ import java.awt.Font;
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.JTextPane;
-import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.text.DefaultStyledDocument;
 import javax.swing.text.StyledDocument;

src/com/dmdirc/addons/ui_swing/textpane/BackgroundImageLoader.java

@@ -57,7 +57,7 @@ public class BackgroundImageLoader extends LoggingSwingWorker<Image, Void> {
 
     /** {@inheritDoc} */
     @Override
-    protected Image doInBackground() throws Exception {
+    protected Image doInBackground() {
         try {
             if (imageURL != null) {
                 return ImageIO.read(imageURL);