Javadoc fixes
git-svn-id: https://svn.apache.org/repos/asf/mina/ftpserver/trunk@1129717 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/src/main/java/org/apache/ftpserver/DataConnectionConfigurationFactory.java b/core/src/main/java/org/apache/ftpserver/DataConnectionConfigurationFactory.java
index 9834bfe..7349921 100644
--- a/core/src/main/java/org/apache/ftpserver/DataConnectionConfigurationFactory.java
+++ b/core/src/main/java/org/apache/ftpserver/DataConnectionConfigurationFactory.java
@@ -315,7 +315,7 @@
/**
* Set whether ssl is required for the data connection
- * @param sslMandatory True if ssl is mandatory for the data connection
+ * @param implicitSsl True if ssl is mandatory for the data connection
*/
public void setImplicitSsl(boolean implicitSsl) {
this.implicitSsl = implicitSsl;
diff --git a/core/src/main/java/org/apache/ftpserver/FtpServerFactory.java b/core/src/main/java/org/apache/ftpserver/FtpServerFactory.java
index ae3120b..70883bd 100644
--- a/core/src/main/java/org/apache/ftpserver/FtpServerFactory.java
+++ b/core/src/main/java/org/apache/ftpserver/FtpServerFactory.java
@@ -44,8 +44,6 @@
/**
* Creates a server with the default configuration
- *
- * @throws Exception
*/
public FtpServerFactory() {
serverContext = new DefaultFtpServerContext();
@@ -224,11 +222,6 @@
* Set the message resource to be used with this server
* @param connectionConfig The {@link ConnectionConfig} to be used
* by servers created by this factory
- *
- * @param messageResource
- * The {@link MessageResource}
- * @throws IllegalStateException
- * If a custom server context has been set
*/
public void setConnectionConfig(final ConnectionConfig connectionConfig) {
serverContext.setConnectionConfig(connectionConfig);
diff --git a/core/src/main/java/org/apache/ftpserver/ftpletcontainer/FtpletContainer.java b/core/src/main/java/org/apache/ftpserver/ftpletcontainer/FtpletContainer.java
index fb84971..c3366d2 100644
--- a/core/src/main/java/org/apache/ftpserver/ftpletcontainer/FtpletContainer.java
+++ b/core/src/main/java/org/apache/ftpserver/ftpletcontainer/FtpletContainer.java
@@ -33,7 +33,7 @@
public interface FtpletContainer extends Ftplet {
/**
- * Retrive the {@link Ftplet} identified by the name (as provided in the
+ * Retrieve the {@link Ftplet} identified by the name (as provided in the
* {@link #addFtplet(String, Ftplet)} method.
*
* @param name
diff --git a/core/src/main/java/org/apache/ftpserver/impl/FtpHandler.java b/core/src/main/java/org/apache/ftpserver/impl/FtpHandler.java
index 6d2ba88..9bc3963 100644
--- a/core/src/main/java/org/apache/ftpserver/impl/FtpHandler.java
+++ b/core/src/main/java/org/apache/ftpserver/impl/FtpHandler.java
@@ -49,8 +49,8 @@
/**
* Invoked when a connection has been opened. This method is invoked after
- * {@link #sessionCreated(IoSession)}. The biggest difference from
- * {@link #sessionCreated(IoSession)} is that it's invoked from other thread
+ * {@link #sessionCreated(FtpIoSession)}. The biggest difference from
+ * {@link #sessionCreated(FtpIoSession)} is that it's invoked from other thread
* than an I/O processor thread once thread modesl is configured properly.
*/
void sessionOpened(FtpIoSession session) throws Exception;
diff --git a/core/src/main/java/org/apache/ftpserver/listener/ListenerFactory.java b/core/src/main/java/org/apache/ftpserver/listener/ListenerFactory.java
index 60a689b..96168e4 100644
--- a/core/src/main/java/org/apache/ftpserver/listener/ListenerFactory.java
+++ b/core/src/main/java/org/apache/ftpserver/listener/ListenerFactory.java
@@ -270,11 +270,10 @@
}
/**
- * @deprecated Replaced by the IpFilter.
* Sets the {@link Subnet}s that listeners created by this factory will block from connecting
* @param blockedSubnets
* The list of {@link Subnet}s
- * @param blockedAddresses
+ * @deprecated Replaced by the IpFilter.
*/
@Deprecated
public void setBlockedSubnets(List<Subnet> blockedSubnets) {
diff --git a/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java b/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java
index fba9f31..278311a 100644
--- a/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java
+++ b/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java
@@ -61,7 +61,7 @@
}
/**
- * @see LoggingFilter#messageReceived(org.apache.mina.core.IoFilter.NextFilter,
+ * @see LoggingFilter#messageReceived(org.apache.mina.core.filterchain.IoFilter.NextFilter,
* IoSession, Object)
*/
@Override
diff --git a/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java b/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java
index ef52628..e00b9d0 100644
--- a/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java
+++ b/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java
@@ -49,11 +49,9 @@
*
* @param mgr
* The X509KeyManager used as a delegate
- * @param keyStore
- * @param serverKeyAlias
+ * @param keyAlias
* The alias name of the server's keypair and supporting
* certificate chain
- * @param keyAlias
*/
public AliasKeyManager(KeyManager mgr, String keyAlias) {
this.delegate = (X509KeyManager) mgr;
