Mass DCC tidying/refactoring

Change-Id: Ifd926f3603ebe9fc0a876efd6407d743766df967
Reviewed-on: http://gerrit.dmdirc.com/763
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

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

@@ -26,10 +26,11 @@ import java.net.Socket;
 import java.net.ServerSocket;
 import java.io.IOException;
 import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * This class handles the main "grunt work" of DCC, subclasses process the data
- * received by this class.
+ * This class manages the socket and low-level I/O functionality for all
+ * types of DCC. Subclasses process the data received by this class.
  *
  * @author Shane 'Dataforce' McCormack
  */
@@ -48,7 +49,7 @@ public abstract class DCC implements Runnable {
     private volatile Thread myThread;
 
     /** Are we already running? */
-    protected boolean running = false;
+    protected final AtomicBoolean running = new AtomicBoolean();
 
     /** Are we a listen socket? */
     protected boolean listen = false;
@@ -56,28 +57,28 @@ public abstract class DCC implements Runnable {
     /**
      * The current socket in use if this is a listen socket.
      * This reference may be changed if and only if exactly one permit from the
-     * <code>serverSocketSem</code> and <code>serverListenignSem</code>
-     * semaphores is held by the thread doing the modification.
+     * {@link #serverSocketSem} and {@link #serverListeningSem} semaphores is
+     * held by the thread doing the modification.
      */
     private ServerSocket serverSocket;
 
     /**
      * Semaphore to control write access to ServerSocket.
-     * If an object acquires a permit from the <code>serverSocketSem</code>, then
-     * <code>serverSocket</code> is <em>guaranteed</em> not to be externally
+     * If an object acquires a permit from the {@link #serverSocketSem}, then
+     * {@link #serverSocket} is <em>guaranteed</em> not to be externally
      * modified until that permit is released, <em>unless</em> the object also
-     * acquires a permit from the <code>serverListeningSem</code>.
+     * acquires a permit from the {@link #serverListeningSem}.
      */
     private final Semaphore serverSocketSem = new Semaphore(1);
 
     /**
      * Semaphore used when we're blocking waiting for connections.
-     * If an object acquires a permit from the <code>serverListeningSem</code>,
+     * If an object acquires a permit from the {@link #serverListeningSem},
      * then it is <em>guaranteed</em> that the {@link #run()} method is blocking
      * waiting for incoming connections. In addition, it is <em>guaranteed</em>
-     * that the {@link #run()} method is holding the <code>serverSocketSem</code>
+     * that the {@link #run()} method is holding the {@link #serverSocketSem}
      * permit, and it will continue holding that permit until it can reaquire
-     * the <code>serverListeningSem</code> permit.
+     * the {@link #serverListeningSem} permit.
      */
     private final Semaphore serverListeningSem = new Semaphore(0);
 
@@ -97,7 +98,6 @@ public abstract class DCC implements Runnable {
                 address = 0;
                 port = serverSocket.getLocalPort();
             } else {
-                // socket = new Socket(longToIP(address), port, bindIP, 0);
                 socket = new Socket(longToIP(address), port);
                 socketOpened();
             }
@@ -161,13 +161,13 @@ public abstract class DCC implements Runnable {
      */
     @Override
     public void run() {
-        if (running) {
+        if (running.getAndSet(true)) {
             return;
         }
-        running = true;
+
         // handleSocket is implemented by sub classes, and should return false
         // when the socket is closed.
-        Thread thisThread = Thread.currentThread();
+        final Thread thisThread = Thread.currentThread();
 
         while (myThread == thisThread) {
             serverSocketSem.acquireUninterruptibly();
@@ -200,8 +200,7 @@ public abstract class DCC implements Runnable {
         }
         // Socket closed
 
-        thisThread = null;
-        running = false;
+        running.set(false);
     }
 
     /**
@@ -211,11 +210,7 @@ public abstract class DCC implements Runnable {
         boolean haveSLS = false;
 
         while (!serverSocketSem.tryAcquire() && !(haveSLS = serverListeningSem.tryAcquire())) {
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException ex) {
-                // Do we care? I doubt we do! Should be unchecked damnit.
-            }
+            Thread.yield();
         }
 
         if (serverSocket != null) {
@@ -268,7 +263,16 @@ public abstract class DCC implements Runnable {
     }
 
     /**
-     * Handle the socket.
+     * Called periodically to read or write data to this DCC's socket.
+     * Implementations should attempt to send or receive one unit of data
+     * (for example one block of binary data, or one line of ASCII data) each
+     * time this method is called.
+     * <p>
+     * The return value of this method is used to determine whether the DCC
+     * has been completed. If the method returns <code>false</code>, the
+     * DCC is assumed to have finished (i.e., the socket has closed), and the
+     * method will not be called again. A return value of <code>true</code> will
+     * cause the method to be recalled.
      *
      * @return false when socket is closed, true will cause the method to be
      *         called again.
@@ -322,7 +326,8 @@ public abstract class DCC implements Runnable {
     public static long ipToLong(final String ip) {
         final String bits[] = ip.split("\\.");
         if (bits.length > 3) {
-            return (Long.parseLong(bits[0]) << 24) + (Long.parseLong(bits[1]) << 16) + (Long.parseLong(bits[2]) << 8) + Long.parseLong(bits[3]);
+            return (Long.parseLong(bits[0]) << 24) + (Long.parseLong(bits[1]) << 16)
+                    + (Long.parseLong(bits[2]) << 8) + Long.parseLong(bits[3]);
         }
         return 0;
     }
@@ -334,7 +339,8 @@ public abstract class DCC implements Runnable {
      * @return long as an IP
      */
     public static String longToIP(final long in) {
-        return ((in & 0xff000000) >> 24) + "." + ((in & 0x00ff0000) >> 16) + "." + ((in & 0x0000ff00) >> 8) + "." + (in & 0x000000ff);
+        return ((in & 0xff000000) >> 24) + "." + ((in & 0x00ff0000) >> 16) + "."
+                + ((in & 0x0000ff00) >> 8) + "." + (in & 0x000000ff);
     }
 
 }

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

@@ -35,7 +35,7 @@ import java.io.PrintWriter;
 public class DCCChat extends DCC {
 
     /** The handler for this DCCChat. */
-    private DCCChatInterface handler = null;
+    private DCCChatHandler handler = null;
 
     /** Used to send data out the socket. */
     private PrintWriter out;
@@ -56,15 +56,13 @@ public class DCCChat extends DCC {
     /**
      * Change the handler for this DCC Chat.
      *
-     * @param handler A class implementing DCCChatInterface
+     * @param handler A class implementing DCCChatHandler
      */
-    public void setHandler(final DCCChatInterface handler) {
+    public void setHandler(final DCCChatHandler handler) {
         this.handler = handler;
     }
 
-    /**
-     * Called when the socket is first opened, before any data is handled.
-     */
+    /** {@inheritDoc} */
     @Override
     protected void socketOpened() {
         active = true;
@@ -79,9 +77,7 @@ public class DCCChat extends DCC {
         }
     }
 
-    /**
-     * Called when the socket is closed, before the thread terminates.
-     */
+    /** {@inheritDoc} */
     @Override
     protected void socketClosed() {
         out = null;
@@ -92,12 +88,7 @@ public class DCCChat extends DCC {
         active = false;
     }
 
-    /**
-     * Handle the socket.
-     *
-     * @return false when socket is closed, true will cause the method to be
-     *         called again.
-     */
+    /** {@inheritDoc} */
     @Override
     protected boolean handleSocket() {
         if (out == null || in == null) {
@@ -119,9 +110,7 @@ public class DCCChat extends DCC {
         }
     }
 
-    /**
-     * Check if this socket can be written to.
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isWriteable() {
         return out != null;

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

@@ -27,7 +27,7 @@ package com.dmdirc.addons.dcc;
  *
  * @author Shane 'Dataforce' McCormack
  */
-public interface DCCChatInterface {
+public interface DCCChatHandler {
 
     /**
      * Handle a received message

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

@@ -31,7 +31,7 @@ import com.dmdirc.Main;
  *
  * @author Shane 'Dataforce' McCormack
  */
-public class DCCChatWindow extends DCCFrame implements DCCChatInterface {
+public class DCCChatWindow extends DCCFrame implements DCCChatHandler {
 
     /** The DCCChat object we are a window for */
     private final DCCChat dcc;
@@ -51,7 +51,8 @@ public class DCCChatWindow extends DCCFrame implements DCCChatInterface {
      * @param nick My Current Nickname
      * @param targetNick Nickname of target
      */
-    public DCCChatWindow(final DCCPlugin plugin, final DCCChat dcc, final String title, final String nick, final String targetNick) {
+    public DCCChatWindow(final DCCPlugin plugin, final DCCChat dcc,
+            final String title, final String nick, final String targetNick) {
         super(plugin, title, "dcc-chat-inactive", false);
         this.dcc = dcc;
         dcc.setHandler(this);
@@ -74,11 +75,7 @@ public class DCCChatWindow extends DCCFrame implements DCCChatInterface {
         return dcc;
     }
 
-    /**
-     * Sends a line of text to this container's source.
-     *
-     * @param line The line to be sent
-     */
+    /** {@inheritDoc} */
     @Override
     public void sendLine(final String line) {
         if (dcc.isWriteable()) {
@@ -92,24 +89,16 @@ public class DCCChatWindow extends DCCFrame implements DCCChatInterface {
         }
     }
 
-    /**
-     * Handle a received message
-     *
-     * @param dcc The DCCChat that this message is from
-     * @param message The message
-     */
+    /** {@inheritDoc} */
     @Override
     public void handleChatMessage(final DCCChat dcc, final String message) {
         final StringBuffer buff = new StringBuffer("DCCChatMessage");
-        ActionManager.processEvent(DCCActions.DCC_CHAT_MESSAGE, buff, this, otherNickname, message);
+        ActionManager.processEvent(DCCActions.DCC_CHAT_MESSAGE, buff, this,
+                otherNickname, message);
         addLine(buff, otherNickname, myWindow.getTranscoder().encode(message));
     }
 
-    /**
-     * Called when the socket is closed
-     *
-     * @param dcc The DCCChat that this message is from
-     */
+    /** {@inheritDoc} */
     @Override
     public void socketClosed(final DCCChat dcc) {
         final StringBuffer buff = new StringBuffer("DCCChatInfo");
@@ -120,11 +109,7 @@ public class DCCChatWindow extends DCCFrame implements DCCChatInterface {
         }
     }
 
-    /**
-     * Called when the socket is opened
-     *
-     * @param dcc The DCCChat that this message is from
-     */
+    /** {@inheritDoc} */
     @Override
     public void socketOpened(final DCCChat dcc) {
         final StringBuffer buff = new StringBuffer("DCCChatInfo");
@@ -133,9 +118,7 @@ public class DCCChatWindow extends DCCFrame implements DCCChatInterface {
         setIcon("dcc-chat-active");
     }
 
-    /**
-     * Closes this container (and it's associated frame).
-     */
+    /** {@inheritDoc} */
     @Override
     public void windowClosing() {
         super.windowClosing();

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

@@ -68,23 +68,26 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-                        final boolean isSilent, final CommandArguments args) {
+            final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length > 1) {
             final String type = args.getArguments()[0];
             final String target = args.getArguments()[1];
             final Parser parser = server.getParser();
             final String myNickname = parser.getLocalClient().getNickname();
 
-            if (parser.isValidChannelName(target) || parser.getStringConverter().equalsIgnoreCase(target, myNickname)) {
+            if (parser.isValidChannelName(target)
+                    || parser.getStringConverter().equalsIgnoreCase(target, myNickname)) {
                 final Thread errorThread = 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);
+                            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);
                         }
                     }
 
@@ -95,16 +98,24 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
             if (type.equalsIgnoreCase("chat")) {
                 final DCCChat chat = new DCCChat();
                 if (myPlugin.listen(chat)) {
-                    final DCCChatWindow window = new DCCChatWindow(myPlugin, chat, "*Chat: " + target, myNickname, target);
+                    final DCCChatWindow window = new DCCChatWindow(myPlugin, chat,
+                            "*Chat: " + target, myNickname, target);
 
-                    parser.sendCTCP(target, "DCC", "CHAT chat " + DCC.ipToLong(myPlugin.getListenIP(parser)) + " " + chat.getPort());
+                    parser.sendCTCP(target, "DCC", "CHAT chat "
+                            + DCC.ipToLong(myPlugin.getListenIP(parser)) + " "
+                            + chat.getPort());
 
-                    ActionManager.processEvent(DCCActions.DCC_CHAT_REQUEST_SENT, null, server, target);
+                    ActionManager.processEvent(DCCActions.DCC_CHAT_REQUEST_SENT,
+                            null, server, target);
 
-                    sendLine(origin, isSilent, "DCCChatStarting", target, chat.getHost(), chat.getPort());
-                    window.getFrame().addLine("DCCChatStarting", target, chat.getHost(), chat.getPort());
+                    sendLine(origin, isSilent, "DCCChatStarting", target,
+                            chat.getHost(), chat.getPort());
+                    window.getFrame().addLine("DCCChatStarting", target,
+                            chat.getHost(), chat.getPort());
                 } else {
-                    sendLine(origin, isSilent, "DCCChatError", "Unable to start chat with " + target + " - unable to create listen socket");
+                    sendLine(origin, isSilent, "DCCChatError",
+                            "Unable to start chat with " + target
+                            + " - unable to create listen socket");
                 }
             } else if (type.equalsIgnoreCase("send")) {
                 sendFile(target, origin, server, isSilent, args.getArgumentsAsString(2));
@@ -126,7 +137,8 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
      * @param filename The file to send
      * @since 0.6.3m1
      */
-    public void sendFile(final String target, final InputWindow origin, final Server server, final boolean isSilent, final String filename) {
+    public void sendFile(final String target, final InputWindow origin,
+            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() {
@@ -134,7 +146,9 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
             /** {@inheritDoc} */
             @Override
             public void run() {
-                final JFileChooser jc = (givenFile.exists()) ? KFileChooser.getFileChooser(myPlugin, givenFile) : KFileChooser.getFileChooser(myPlugin);
+                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 ");
@@ -147,33 +161,55 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
                 }
                 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);
+                        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);
+                        JOptionPane.showMessageDialog(null,
+                                "Invalid file specified", "DCC Error",
+                                JOptionPane.ERROR_MESSAGE);
                         return;
                     }
                     final Parser parser = server.getParser();
-                    DCCSend send = new DCCSend(IdentityManager.getGlobalConfig().getOptionInt(myPlugin.getDomain(), "send.blocksize"));
-                    send.setTurbo(IdentityManager.getGlobalConfig().getOptionBool(myPlugin.getDomain(), "send.forceturbo"));
-                    send.setType(DCCSend.TransferType.SEND);
+                    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());
 
-                    if (IdentityManager.getGlobalConfig().getOptionBool(myPlugin.getDomain(), "send.reverse")) {
-                        new DCCSendWindow(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" : ""));
+                    if (IdentityManager.getGlobalConfig().getOptionBool(
+                            myPlugin.getDomain(), "send.reverse")) {
+                        new DCCTransferWindow(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 {
                         if (myPlugin.listen(send)) {
-                            new DCCSendWindow(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" : ""));
+                            new DCCTransferWindow(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");
                         }
                     }
                 }
@@ -184,43 +220,25 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
         dccThread.start();
     }
 
-    /**
-     * Returns this command's name.
-     *
-     * @return The name of this command
-     */
+    /** {@inheritDoc} */
     @Override
     public String getName() {
         return "dcc";
     }
 
-    /**
-     * Returns whether or not this command should be shown in help messages.
-     *
-     * @return True iff the command should be shown, false otherwise
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
         return true;
     }
 
-    /**
-     * Returns a string representing the help message for this command.
-     *
-     * @return the help message for this command
-     */
+    /** {@inheritDoc} */
     @Override
     public String getHelp() {
-        return "dcc - Allows DCC";
+        return "dcc <SEND|CHAT> <target> [params] - Allows DCC";
     }
 
-    /**
-     * Returns a list of suggestions for the specified argument, given the list
-     * of previous arguments.
-     * @param arg The argument that is being completed
-     * @param previousArgs The contents of the previous arguments, if any
-     * @return A list of suggestions for the argument
-     */
+    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
         final AdditionalTabTargets res = new AdditionalTabTargets();

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

@@ -123,7 +123,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
      * @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 DCCSend 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 sendFilename, 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() {
 
@@ -163,7 +163,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
                         }
                     }
                     if (reverse && !token.isEmpty()) {
-                        new DCCSendWindow(DCCPlugin.this, send, "*Receive: " + nickname, nickname, null);
+                        new DCCTransferWindow(DCCPlugin.this, send, "*Receive: " + nickname, nickname, null);
                         send.setToken(token);
                         if (resume) {
                             if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.reverse.sendtoken")) {
@@ -179,7 +179,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
                             }
                         }
                     } else {
-                        new DCCSendWindow(DCCPlugin.this, send, "Receive: " + nickname, nickname, null);
+                        new DCCTransferWindow(DCCPlugin.this, send, "Receive: " + nickname, nickname, null);
                         if (resume) {
                             parser.sendCTCP(nickname, "DCC", "RESUME " + sendFilename + " " + send.getPort() + " " + jc.getSelectedFile().length());
                         } else {
@@ -330,7 +330,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
                         return;
                     }
 
-                    DCCSend send = DCCSend.findByToken(token);
+                    DCCTransfer send = DCCTransfer.findByToken(token);
 
                     if (send == null && !dontAsk) {
                         if (!token.isEmpty() && !port.equals("0")) {
@@ -344,7 +344,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
                     } else {
                         final boolean newSend = send == null;
                         if (newSend) {
-                            send = new DCCSend(IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "send.blocksize"));
+                            send = new DCCTransfer(IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "send.blocksize"));
                             send.setTurbo(IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "send.forceturbo"));
                         }
                         try {
@@ -392,7 +392,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
                         final String token = (ctcpData.length - 1 > i) ? " " + ctcpData[++i] : "";
 
                         // Now look for a dcc that matches.
-                        for (DCCSend send : DCCSend.getSends()) {
+                        for (DCCTransfer send : DCCTransfer.getTransfers()) {
                             if (send.port == port && (new File(send.getFileName())).getName().equalsIgnoreCase(filename)) {
                                 if ((!token.isEmpty() && !send.getToken().isEmpty()) && (!token.equals(send.getToken()))) {
                                     continue;
@@ -638,7 +638,7 @@ class PlaceholderDCCFrame extends DCCFrame {
         int dccs = 0;
         for (Window window : windows) {
             if (window instanceof EmptyFrame) {
-                if (((DCCSendWindow)((EmptyFrame) window).getContainer()).getDCC().isActive()) {
+                if (((DCCTransferWindow)((EmptyFrame) window).getContainer()).getDCC().isActive()) {
                     dccs++;
                 }
             } else if (window instanceof DCCChatWindow) {

src/com/dmdirc/addons/dcc/DCCSend.java → src/com/dmdirc/addons/dcc/DCCTransfer.java

@@ -33,14 +33,14 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * This class handles a DCC Send.
+ * This class handles a DCC transfer.
  *
  * @author Shane 'Dataforce' McCormack
  */
-public class DCCSend extends DCC {
+public class DCCTransfer extends DCC {
 
     /** List of active sends. */
-    private static final List<DCCSend> SENDS = new ArrayList<DCCSend>();
+    private static final List<DCCTransfer> TRANSFERS = new ArrayList<DCCTransfer>();
 
     /** File Transfer Types. */
     public enum TransferType {
@@ -53,7 +53,7 @@ public class DCCSend extends DCC {
     private TransferType transferType = TransferType.RECEIVE;
 
     /** The handler for this DCCSend. */
-    private DCCSendInterface handler;
+    private DCCTransferHandler handler;
 
     /** Used to send data out the socket. */
     private DataOutputStream out;
@@ -93,21 +93,21 @@ public class DCCSend extends DCC {
 
     private boolean active = false;
 
-    /** Creates a new instance of DCCSend with a default block size. */
-    public DCCSend() {
+    /** Creates a new instance of DCCTransfer with a default block size. */
+    public DCCTransfer() {
         this(1024);
     }
 
     /**
-     * Creates a new instance of DCCSend.
+     * Creates a new instance of DCCTransfer.
      *
      * @param blockSize Block size to use
      */
-    public DCCSend(final int blockSize) {
+    public DCCTransfer(final int blockSize) {
         super();
         this.blockSize = blockSize;
-        synchronized (SENDS) {
-            SENDS.add(this);
+        synchronized (TRANSFERS) {
+            TRANSFERS.add(this);
         }
     }
 
@@ -125,18 +125,18 @@ public class DCCSend extends DCC {
      *
      * @return A copy of the list of active sends.
      */
-    public static List<DCCSend> getSends() {
-        synchronized (SENDS) {
-            return new ArrayList<DCCSend>(SENDS);
+    public static List<DCCTransfer> getTransfers() {
+        synchronized (TRANSFERS) {
+            return new ArrayList<DCCTransfer>(TRANSFERS);
         }
     }
 
     /**
      * Called to remove this object from the sends list.
      */
-    public void removeFromSends() {
-        synchronized (SENDS) {
-            SENDS.remove(this);
+    public void removeFromTransfers() {
+        synchronized (TRANSFERS) {
+            TRANSFERS.remove(this);
         }
     }
 
@@ -150,7 +150,8 @@ public class DCCSend extends DCC {
         if (transferType == TransferType.SEND) {
             transferFile = new File(filename);
             try {
-                fileIn = new DataInputStream(new FileInputStream(transferFile.getAbsolutePath()));
+                fileIn = new DataInputStream(new FileInputStream(
+                        transferFile.getAbsolutePath()));
             } catch (FileNotFoundException e) {
                 fileIn = null;
             } catch (SecurityException e) {
@@ -174,13 +175,13 @@ public class DCCSend extends DCC {
      * @return Filename without path
      */
     public String getShortFileName() {
-        return (new File(filename)).getName();
+        return new File(filename).getName();
     }
 
     /**
      * Set dcc Type.
      *
-     * @param type Type of DCC Send this is.
+     * @param type Type of DCC transfer this is.
      */
     public void setType(final TransferType type) {
         this.transferType = type;
@@ -189,7 +190,7 @@ public class DCCSend extends DCC {
     /**
      * Get dcc Type.
      *
-     * @return Type of DCC Send this is.
+     * @return Type of DCC transfer this is.
      */
     public TransferType getType() {
         return transferType;
@@ -241,11 +242,9 @@ public class DCCSend extends DCC {
      */
     public String makeToken() {
         String myToken = "";
-        boolean unique = true;
         do {
             myToken = Integer.toString(Math.abs((myToken + filename).hashCode()));
-            unique = (findByToken(myToken) == null);
-        } while (!unique);
+        } while (findByToken(myToken) != null);
         setToken(myToken);
         return myToken;
     }
@@ -254,16 +253,16 @@ public class DCCSend extends DCC {
      * Find a send based on a given token.
      *
      * @param token Token to look for. (case sensitive)
-     * @return The first DCCSend that matches the given token.
+     * @return The first DCCTransfer that matches the given token.
      *         null if none match, or token is "" or null.
      */
-    public static DCCSend findByToken(final String token) {
+    public static DCCTransfer findByToken(final String token) {
         if (token == null || token.isEmpty()) {
             return null;
         }
-        for (DCCSend send : getSends()) {
-            if (send.getToken().equals(token)) {
-                return send;
+        for (DCCTransfer transfer : getTransfers()) {
+            if (transfer.getToken().equals(token)) {
+                return transfer;
             }
         }
         return null;
@@ -291,7 +290,8 @@ public class DCCSend extends DCC {
      * Set the starting position of the file
      *
      * @param startpos Starting position
-     * @return -1 if fileIn is null or if dcc receive, else the result of fileIn.skipBytes()
+     * @return -1 if fileIn is null or if dcc receive, else the result of
+     * fileIn.skipBytes()
      */
     public int setFileStart(final int startpos) {
         this.startpos = startpos;
@@ -318,22 +318,21 @@ public class DCCSend extends DCC {
     /**
      * Change the handler for this DCC Send
      *
-     * @param handler A class implementing DCCSendInterface
+     * @param handler A class implementing DCCTransferHandler
      */
-    public void setHandler(final DCCSendInterface handler) {
+    public void setHandler(final DCCTransferHandler handler) {
         this.handler = handler;
     }
 
-    /**
-     * Called when the socket is first opened, before any data is handled.
-     */
+    /** {@inheritDoc} */
     @Override
     protected void socketOpened() {
         try {
             active = true;
             transferFile = new File(filename);
             if (transferType == TransferType.RECEIVE) {
-                fileOut = new DataOutputStream(new FileOutputStream(transferFile.getAbsolutePath(), (startpos > 0)));
+                fileOut = new DataOutputStream(new FileOutputStream(
+                        transferFile.getAbsolutePath(), (startpos > 0)));
             }
             out = new DataOutputStream(socket.getOutputStream());
             in = new DataInputStream(socket.getInputStream());
@@ -345,9 +344,7 @@ public class DCCSend extends DCC {
         }
     }
 
-    /**
-     * Called when the socket is closed, before the thread terminates.
-     */
+    /** {@inheritDoc} */
     @Override
     protected void socketClosed() {
         // Try to close both, even if one fails.
@@ -369,21 +366,17 @@ public class DCCSend extends DCC {
             handler.socketClosed(this);
         }
         // Try to delete empty files.
-        if (transferType == TransferType.RECEIVE && transferFile != null && transferFile.length() == 0) {
+        if (transferType == TransferType.RECEIVE && transferFile != null
+                && transferFile.length() == 0) {
             transferFile.delete();
         }
-        synchronized (SENDS) {
-            SENDS.remove(this);
+        synchronized (TRANSFERS) {
+            TRANSFERS.remove(this);
         }
         active = false;
     }
 
-    /**
-     * Handle the socket.
-     *
-     * @return false when socket is closed, true will cause the method to be
-     *         called again.
-     */
+    /** {@inheritDoc} */
     @Override
     protected boolean handleSocket() {
         if (out == null || in == null) {
@@ -399,8 +392,8 @@ public class DCCSend extends DCC {
     /**
      * Handle the socket as a RECEIVE.
      *
-     * @return false when socket is closed (or should be closed), true will cause the method to be
-     *         called again.
+     * @return false when socket is closed (or should be closed), true will
+     * cause the method to be called again.
      */
     protected boolean handleReceive() {
         try {
@@ -435,8 +428,8 @@ public class DCCSend extends DCC {
     /**
      * Handle the socket as a SEND.
      *
-     * @return false when socket is closed (or should be closed), true will cause the method to be
-     *         called again.
+     * @return false when socket is closed (or should be closed), true will
+     * cause the method to be called again.
      */
     protected boolean handleSend() {
         try {

src/com/dmdirc/addons/dcc/DCCSendInterface.java → src/com/dmdirc/addons/dcc/DCCTransferHandler.java

@@ -23,32 +23,33 @@
 package com.dmdirc.addons.dcc;
 
 /**
- * This interfaces allows DCC Send Windows to receive data from a DCCSend
+ * This interfaces allows DCC Transfer Windows to receive data from a
+ * DCCTransfer.
  *
  * @author Shane 'Dataforce' McCormack
  */
-public interface DCCSendInterface {
+public interface DCCTransferHandler {
 
     /**
-     * Called when the socket is closed
+     * Called when the socket is closed.
      *
-     * @param dcc The DCCSend that this message is from
+     * @param dcc The DCCTransfer that this message is from
      */
-    void socketClosed(final DCCSend dcc);
+    void socketClosed(final DCCTransfer dcc);
 
     /**
-     * Called when the socket is opened
+     * Called when the socket is opened.
      *
-     * @param dcc The DCCSend that this message is from
+     * @param dcc The DCCTransfer that this message is from
      */
-    void socketOpened(final DCCSend dcc);
+    void socketOpened(final DCCTransfer dcc);
 
     /**
-     * Called when data is sent/recieved
+     * Called when data is sent/recieved.
      *
-     * @param dcc The DCCSend that this message is from
+     * @param dcc The DCCTransfer that this message is from
      * @param bytes The number of new bytes that were transfered
      */
-    void dataTransfered(final DCCSend dcc, final int bytes);
+    void dataTransfered(final DCCTransfer dcc, final int bytes);
 
 }

src/com/dmdirc/addons/dcc/DCCSendWindow.java → src/com/dmdirc/addons/dcc/DCCTransferWindow.java

@@ -50,10 +50,11 @@ import net.miginfocom.swing.MigLayout;
  *
  * @author Shane 'Dataforce' McCormack
  */
-public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionListener, SocketCloseListener {
+public class DCCTransferWindow extends DCCFrame implements DCCTransferHandler,
+        ActionListener, SocketCloseListener {
 
     /** The DCCSend object we are a window for */
-    private final DCCSend dcc;
+    private final DCCTransfer dcc;
 
     /** Other Nickname */
     private final String otherNickname;
@@ -99,16 +100,18 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
             Desktop.getDesktop().isSupported(Desktop.Action.OPEN);
 
     /**
-     * Creates a new instance of DCCSendWindow with a given DCCSend object.
+     * Creates a new instance of DCCTransferWindow with a given DCCTransfer object.
      *
      * @param plugin the DCC Plugin responsible for this window
-     * @param dcc The DCCSend object this window wraps around
+     * @param dcc The DCCTransfer object this window wraps around
      * @param title The title of this window
      * @param targetNick Nickname of target
      * @param server The server that initiated this send
      */
-    public DCCSendWindow(final DCCPlugin plugin, final DCCSend dcc, final String title, final String targetNick, final Server server) {
-        super(plugin, title, dcc.getType() == DCCSend.TransferType.SEND ? "dcc-send-inactive" : "dcc-receive-inactive");
+    public DCCTransferWindow(final DCCPlugin plugin, final DCCTransfer dcc,
+            final String title, final String targetNick, final Server server) {
+        super(plugin, title, dcc.getType() == DCCTransfer.TransferType.SEND
+                ? "dcc-send-inactive" : "dcc-receive-inactive");
         this.dcc = dcc;
         this.server = server;
         this.parser = server == null ? null : server.getParser();
@@ -128,7 +131,7 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
         progress.setStringPainted(true);
         progress.setValue(0);
 
-        if (dcc.getType() == DCCSend.TransferType.SEND) {
+        if (dcc.getType() == DCCTransfer.TransferType.SEND) {
             getContentPane().add(new JLabel("Sending: " + dcc.getShortFileName()), "wrap");
             getContentPane().add(new JLabel("To: " + targetNick), "wrap");
         } else {
@@ -168,7 +171,7 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
      *
      * @return The DCCSend Object associated with this window
      */
-    public DCCSend getDCC() {
+    public DCCTransfer getDCC() {
         return dcc;
     }
 
@@ -180,7 +183,7 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getActionCommand().equals("Cancel")) {
-            if (dcc.getType() == DCCSend.TransferType.SEND) {
+            if (dcc.getType() == DCCTransfer.TransferType.SEND) {
                 button.setText("Resend");
             } else {
                 button.setText("Close Window");
@@ -204,18 +207,29 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
                         /** {@inheritDoc} */
                         @Override
                         public void run() {
-                            JOptionPane.showMessageDialog(null, "You can't DCC yourself.", "DCC Error", JOptionPane.ERROR_MESSAGE);
+                            JOptionPane.showMessageDialog(null,
+                                    "You can't DCC yourself.", "DCC Error",
+                                    JOptionPane.ERROR_MESSAGE);
                         }
 
                     });
                     errorThread.start();
                     return;
                 } else {
-                    if (IdentityManager.getGlobalConfig().getOptionBool(plugin.getDomain(), "send.reverse")) {
-                        parser.sendCTCP(otherNickname, "DCC", "SEND \"" + (new File(dcc.getFileName())).getName() + "\" " + DCC.ipToLong(myPlugin.getListenIP(parser)) + " 0 " + dcc.getFileSize() + " " + dcc.makeToken() + ((dcc.isTurbo()) ? " T" : ""));
+                    if (IdentityManager.getGlobalConfig().getOptionBool(
+                            plugin.getDomain(), "send.reverse")) {
+                        parser.sendCTCP(otherNickname, "DCC", "SEND \"" +
+                                new File(dcc.getFileName()).getName() + "\" "
+                                + DCC.ipToLong(myPlugin.getListenIP(parser))
+                                + " 0 " + dcc.getFileSize() + " " + dcc.makeToken()
+                                + ((dcc.isTurbo()) ? " T" : ""));
                         return;
                     } else if (plugin.listen(dcc)) {
-                        parser.sendCTCP(otherNickname, "DCC", "SEND \"" + (new File(dcc.getFileName())).getName() + "\" " + DCC.ipToLong(myPlugin.getListenIP(parser)) + " " + dcc.getPort() + " " + dcc.getFileSize() + ((dcc.isTurbo()) ? " T" : ""));
+                        parser.sendCTCP(otherNickname, "DCC", "SEND \""
+                                + new File(dcc.getFileName()).getName() + "\" "
+                                + DCC.ipToLong(myPlugin.getListenIP(parser)) + " "
+                                + dcc.getPort() + " " + dcc.getFileSize()
+                                + ((dcc.isTurbo()) ? " T" : ""));
                         return;
                     }
                 }
@@ -256,14 +270,14 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
      * @param bytes The number of new bytes that were transfered
      */
     @Override
-    public void dataTransfered(final DCCSend dcc, final int bytes) {
+    public void dataTransfered(final DCCTransfer dcc, final int bytes) {
         final double percent;
         synchronized (this) {
             transferCount += bytes;
             percent = (100.00 / dcc.getFileSize()) * (transferCount + dcc.getFileStart());
         }
 
-        if (dcc.getType() == DCCSend.TransferType.SEND) {
+        if (dcc.getType() == DCCTransfer.TransferType.SEND) {
             status.setText("Status: Sending");
         } else {
             status.setText("Status: Recieving");
@@ -298,10 +312,13 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
         synchronized (this) {
             remaningBytes = dcc.getFileSize() - dcc.getFileStart() - transferCount;
         }
-        final double remainingSeconds = (bytesPerSecond > 0) ? (remaningBytes / bytesPerSecond) : 1;
+        final double remainingSeconds = bytesPerSecond > 0
+                ? (remaningBytes / bytesPerSecond) : 1;
 
-        remaining.setText(String.format("Time Remaining: %s", duration((int) Math.floor(remainingSeconds))));
-        taken.setText(String.format("Time Taken: %s", timeStarted == 0 ? "N/A" : duration(time)));
+        remaining.setText(String.format("Time Remaining: %s", duration(
+                (int) Math.floor(remainingSeconds))));
+        taken.setText(String.format("Time Taken: %s", timeStarted == 0
+                ? "N/A" : duration(time)));
     }
 
     /**
@@ -330,23 +347,25 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
      * @param dcc The DCCSend that this message is from
      */
     @Override
-    public void socketClosed(final DCCSend dcc) {
+    public void socketClosed(final DCCTransfer dcc) {
         ActionManager.processEvent(DCCActions.DCC_SEND_SOCKETCLOSED, null, this);
         if (!isWindowClosing()) {
             synchronized (this) {
                 if (transferCount == dcc.getFileSize()) {
                     status.setText("Status: Transfer Compelete.");
 
-                    if (showOpen && dcc.getType() == DCCSend.TransferType.RECEIVE) {
+                    if (showOpen && dcc.getType() == DCCTransfer.TransferType.RECEIVE) {
                         openButton.setVisible(true);
                     }
                     progress.setValue(100);
-                    setIcon(dcc.getType() == DCCSend.TransferType.SEND ? "dcc-send-done" : "dcc-receive-done");
+                    setIcon(dcc.getType() == DCCTransfer.TransferType.SEND
+                            ? "dcc-send-done" : "dcc-receive-done");
                     button.setText("Close Window");
                 } else {
                     status.setText("Status: Transfer Failed.");
-                    setIcon(dcc.getType() == DCCSend.TransferType.SEND ? "dcc-send-failed" : "dcc-receive-failed");
-                    if (dcc.getType() == DCCSend.TransferType.SEND) {
+                    setIcon(dcc.getType() == DCCTransfer.TransferType.SEND
+                            ? "dcc-send-failed" : "dcc-receive-failed");
+                    if (dcc.getType() == DCCTransfer.TransferType.SEND) {
                         button.setText("Resend");
                     } else {
                         button.setText("Close Window");
@@ -363,11 +382,12 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
      * @param dcc The DCCSend that this message is from
      */
     @Override
-    public void socketOpened(final DCCSend dcc) {
+    public void socketOpened(final DCCTransfer dcc) {
         ActionManager.processEvent(DCCActions.DCC_SEND_SOCKETOPENED, null, this);
         status.setText("Status: Socket Opened");
         timeStarted = System.currentTimeMillis();
-        setIcon(dcc.getType() == DCCSend.TransferType.SEND ? "dcc-send-active" : "dcc-receive-active");
+        setIcon(dcc.getType() == DCCTransfer.TransferType.SEND
+                ? "dcc-send-active" : "dcc-receive-active");
     }
 
     /**
@@ -376,7 +396,7 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
     @Override
     public void windowClosing() {
         super.windowClosing();
-        dcc.removeFromSends();
+        dcc.removeFromTransfers();
         dcc.close();
     }
 

src/com/dmdirc/addons/dcc/actions/DCCEvents.java

@@ -26,7 +26,7 @@ import com.dmdirc.Server;
 import com.dmdirc.actions.interfaces.ActionMetaType;
 
 import com.dmdirc.addons.dcc.DCCChatWindow;
-import com.dmdirc.addons.dcc.DCCSendWindow;
+import com.dmdirc.addons.dcc.DCCTransferWindow;
 
 import java.io.File;
 
@@ -50,11 +50,11 @@ public enum DCCEvents implements ActionMetaType {
     /** DCC Chat Socket Opened. */
     DCC_CHAT_SOCKETOPENED(new String[]{"DCCChatWindow"}, DCCChatWindow.class),
     /** DCC Send Socket Closed. */
-    DCC_SEND_SOCKETCLOSED(new String[]{"DCCSendWindow"}, DCCSendWindow.class),
+    DCC_SEND_SOCKETCLOSED(new String[]{"DCCSendWindow"}, DCCTransferWindow.class),
     /** DCC Send Socket Opened. */
-    DCC_SEND_SOCKETOPENED(new String[]{"DCCSendWindow"}, DCCSendWindow.class),
+    DCC_SEND_SOCKETOPENED(new String[]{"DCCSendWindow"}, DCCTransferWindow.class),
     /** DCC Send Data Transfered */
-    DCC_SEND_DATATRANSFERED(new String[]{"DCCSendWindow", "Bytes Transfered"}, DCCSendWindow.class, int.class),
+    DCC_SEND_DATATRANSFERED(new String[]{"DCCSendWindow", "Bytes Transfered"}, DCCTransferWindow.class, int.class),
     /** DCC Send Request. */
     DCC_SEND_REQUEST(new String[]{"server", "client", "file"}, Server.class, String.class, String.class),
     /** DCC Send Request Sent. */