Minor code refactoring for clarity

ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Authentication.java

@@ -26,5 +26,4 @@
  * @author <a href="http://mina.apache.org">Apache MINA Project</a>
  */
 public interface Authentication {
-
 }

ftplet-api/src/main/java/org/apache/ftpserver/ftplet/AuthenticationFailedException.java

@@ -38,8 +38,7 @@ public AuthenticationFailedException() {
      * Constructs a <code>AuthenticationFailedException</code> object with a
      * message.
      *
-     * @param msg
-     *            A description of the exception
+     * @param msg A description of the exception
      */
     public AuthenticationFailedException(String msg) {
         super(msg);
@@ -49,8 +48,7 @@ public AuthenticationFailedException(String msg) {
      * Constructs a <code>AuthenticationFailedException</code> object with a
      * <code>Throwable</code> cause.
      *
-     * @param th
-     *            The original cause
+     * @param th The original cause
      */
     public AuthenticationFailedException(Throwable th) {
         super(th);
@@ -61,8 +59,7 @@ public AuthenticationFailedException(Throwable th) {
      * <code>Throwable</code> cause.
      * @param msg A description of the exception
      *
-     * @param th
-     *            The original cause
+     * @param th The original cause
      */
     public AuthenticationFailedException(String msg, Throwable th) {
         super(msg, th);

ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Authority.java

@@ -26,21 +26,18 @@
  * @author <a href="http://mina.apache.org">Apache MINA Project</a>
  */
 public interface Authority {
-
     /**
      * Indicates weather this Authority can authorize a certain request
      *
-     * @param request
-     *            The request to authorize
+     * @param request The request to authorize
      * @return True if the request can be authorized by this Authority
      */
     boolean canAuthorize(AuthorizationRequest request);
 
     /**
      * Authorize an {@link AuthorizationRequest}.
      *
-     * @param request
-     *            The {@link AuthorizationRequest}
+     * @param request The {@link AuthorizationRequest}
      * @return Returns a populated AuthorizationRequest as long as If
      *         {@link #canAuthorize(AuthorizationRequest)} returns <code>true</code> for the
      *         AuthorizationRequest, otherwise returns <code>null</code>.

ftplet-api/src/main/java/org/apache/ftpserver/ftplet/AuthorizationRequest.java

@@ -25,5 +25,4 @@
  * @author <a href="http://mina.apache.org">Apache MINA Project</a>
  */
 public interface AuthorizationRequest {
-
 }

ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataConnection.java

@@ -29,35 +29,32 @@
  * @author <a href="http://mina.apache.org">Apache MINA Project</a>
  */
 public interface DataConnection {
-
     /**
      * Transfer data from the client (e.g. STOR).
+     *
      * @param session The current {@link FtpSession}
-     * @param out
-     *            The {@link OutputStream} containing the destination of the
+     * @param out The {@link OutputStream} containing the destination of the
      *            data from the client.
      * @return The length of the transferred data
      * @throws IOException If the transfer failed
      */
-    long transferFromClient(FtpSession session, OutputStream out)
-            throws IOException;
+    long transferFromClient(FtpSession session, OutputStream out) throws IOException;
 
     /**
      * Transfer data to the client (e.g. RETR).
+     *
      * @param session The current {@link FtpSession}
-     * @param in
-     *            Data to be transfered to the client
+     * @param in Data to be transfered to the client
      * @return The length of the transferred data
      * @throws IOException If the transfer failed
      */
-    long transferToClient(FtpSession session, InputStream in)
-            throws IOException;
+    long transferToClient(FtpSession session, InputStream in) throws IOException;
 
     /**
      * Transfer a string to the client, e.g. during LIST
+     *
      * @param session The current {@link FtpSession}
-     * @param str
-     *            The string to transfer
+     * @param str The string to transfer
      * @throws IOException If the transfer failed
      */
     void transferToClient(FtpSession session, String str) throws IOException;

ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataConnectionFactory.java

@@ -25,7 +25,6 @@
  * @author <a href="http://mina.apache.org">Apache MINA Project</a>
  */
 public interface DataConnectionFactory {
-
     /**
      * Open an active data connection
      *
@@ -40,7 +39,6 @@ public interface DataConnectionFactory {
      *
      * @return <code>true</code> if the data socket will be secured
      */
-
     boolean isSecure();
 
     /**

ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataTransferFtpReply.java

@@ -25,7 +25,6 @@
  * etc.
  *
  * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- *
  */
 
 public interface DataTransferFtpReply extends FileActionFtpReply {

ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataType.java

@@ -25,7 +25,6 @@
  * @author <a href="http://mina.apache.org">Apache MINA Project</a>
  */
 public enum DataType {
-
     /**
      * Binary data type
      */
@@ -39,22 +38,20 @@ public enum DataType {
     /**
      * Parses the argument value from the TYPE command into the type safe class
      *
-     * @param argument
-     *            The argument value from the TYPE command. Not case sensitive
+     * @param argument The argument value from the TYPE command. Not case sensitive
      * @return The appropriate data type
-     * @throws IllegalArgumentException
-     *             If the data type is unknown
+     * @throws IllegalArgumentException If the data type is unknown
      */
     public static DataType parseArgument(char argument) {
         switch (argument) {
-        case 'A':
-        case 'a':
-            return ASCII;
-        case 'I':
-        case 'i':
-            return BINARY;
-        default:
-            throw new IllegalArgumentException("Unknown data type: " + argument);
+            case 'A':
+            case 'a':
+                return ASCII;
+            case 'I':
+            case 'i':
+                return BINARY;
+            default:
+                throw new IllegalArgumentException("Unknown data type: " + argument);
         }
     }
 }

ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtpReply.java

@@ -26,20 +26,20 @@
  * @author <a href="http://mina.apache.org">Apache MINA Project</a>
  */
 public class DefaultFtpReply implements FtpReply {
-
+    /** The reply code */
     private int code;
 
+    /** The reply message */
     private String message;
 
-    /**
-     * time when this reply was sent.
-     */
+    /** time when this reply was sent. */
     private long sentTime = 0L;
 
     private static final String CRLF = "\r\n";
 
     /**
      * Constructor for single-line messages
+     *
      * @param code The reply code
      * @param message The reply message
      */
@@ -51,17 +51,20 @@ public DefaultFtpReply(final int code, final String message) {
 
     /**
      * Constructor for multi-line replies
+     *
      * @param code The reply code
-     * @param message The reply message, one line per String
+     * @param messageLines The reply message, one line per String
      */
-    public DefaultFtpReply(final int code, final String[] message) {
+    public DefaultFtpReply(final int code, final String[] messageLines) {
         this.code = code;
 
         StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < message.length; i++) {
-            sb.append(message[i]);
+
+        for (String line:messageLines) {
+            sb.append(line);
             sb.append('\n');
         }
+
         this.message = sb.toString();
         this.sentTime = System.currentTimeMillis();
     }
@@ -89,7 +92,7 @@ public boolean isPositive() {
     }
 
     private boolean isDigit(char c) {
-        return c >= 48 && c <= 57;
+        return c >= '0' && c <= '9';
     }
 
     /*
@@ -101,6 +104,7 @@ private boolean isDigit(char c) {
     public String toString() {
         int code = getCode();
         String notNullMessage = getMessage();
+
         if (notNullMessage == null) {
             notNullMessage = "";
         }
@@ -124,7 +128,6 @@ public String toString() {
             sb.append(notNullMessage);
             sb.append(CRLF);
         } else {
-
             sb.append(code);
             sb.append("-");
 
@@ -143,10 +146,10 @@ public String toString() {
                         && line.length() > 2
                         && isDigit(line.charAt(0))
                         && isDigit(line.charAt(1))
-                        && isDigit(line.charAt(2))
-                    ) {
+                        && isDigit(line.charAt(2))) {
                     sb.append("  ");
                 }
+
                 sb.append(line);
                 sb.append(CRLF);
             }

ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileActionFtpReply.java

@@ -24,11 +24,9 @@
  * single file or directory such as MKD, DELE, RMD etc.
  *
  * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- *
  */
 
 public interface FileActionFtpReply extends FtpReply {
-
     /**
      * Returns the file (or directory) on which the action was taken
      * (e.g. uploaded, created, listed)

ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpException.java

@@ -26,7 +26,6 @@
  * @author <a href="http://mina.apache.org">Apache MINA Project</a>
  */
 public class FtpException extends Exception {
-
     private static final long serialVersionUID = -1328383839915898987L;
 
     /**
@@ -39,8 +38,7 @@ public FtpException() {
     /**
      * Constructs a <code>FtpException</code> object with a message.
      *
-     * @param msg
-     *            a description of the exception
+     * @param msg a description of the exception
      */
     public FtpException(String msg) {
         super(msg);
@@ -50,8 +48,7 @@ public FtpException(String msg) {
      * Constructs a <code>FtpException</code> object with a
      * <code>Throwable</code> cause.
      *
-     * @param th
-     *            the original cause
+     * @param th the original cause
      */
     public FtpException(Throwable th) {
         super(th.getMessage());
@@ -60,17 +57,17 @@ public FtpException(Throwable th) {
     /**
      * Constructs a <code>BaseException</code> object with a
      * <code>Throwable</code> cause.
-     * @param msg A description of the exception
      *
-     * @param th
-     *            The original cause
+     * @param msg A description of the exception
+     * @param th The original cause
      */
     public FtpException(String msg, Throwable th) {
         super(msg);
     }
 
     /**
      * Get the root cause.
+     *
      * @return The root cause
      * @deprecated Use {@link Exception#getCause()} instead
      */

ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpReply.java

@@ -25,7 +25,6 @@
  * @author <a href="http://mina.apache.org">Apache MINA Project</a>
  */
 public interface FtpReply {
-
     /**
      * 110 Restart marker reply. In this case, the text is exact and not left to
      * the particular implementation; it must read: MARK yyyy = mmmm Where yyyy
@@ -264,6 +263,7 @@ public interface FtpReply {
 
     /**
      * Tells whether or not this reply indicates a positive completion.
+     *
      * @return <code>true</code>, if this reply is a positive completion or
      * positive intermediate reply; <code>false</code>, otherwise.
      */

ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpRequest.java

@@ -25,21 +25,23 @@
  * @author <a href="http://mina.apache.org">Apache MINA Project</a>
  */
 public interface FtpRequest {
-
     /**
      * Get the client request string.
+     *
      * @return The full request line, e.g. "MKDIR newdir"
      */
     String getRequestLine();
 
     /**
      * Returns the ftp request command.
+     *
      * @return The command part of the request line, e.g. "MKDIR"
      */
     String getCommand();
 
     /**
      * Get the ftp request argument.
+     *
      * @return The argument part of the request line, e.g. "newdir"
      */
     String getArgument();