You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2014/07/30 22:53:26 UTC
svn commit: r1614763 - in /commons/proper/net/trunk: ./ src/changes/
src/main/java/examples/mail/ src/main/java/org/apache/commons/net/ftp/
src/main/java/org/apache/commons/net/ftp/parser/
src/main/java/org/apache/commons/net/imap/ src/main/java/org/ap...
Author: sebb
Date: Wed Jul 30 20:53:25 2014
New Revision: 1614763
URL: http://svn.apache.org/r1614763
Log:
Trailing spaces
Modified:
commons/proper/net/trunk/pom.xml
commons/proper/net/trunk/src/changes/changes.xml
commons/proper/net/trunk/src/main/java/examples/mail/IMAPExportMbox.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAP.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAPReply.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Threader.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/nntp/TestThreader.java
Modified: commons/proper/net/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/pom.xml?rev=1614763&r1=1614762&r2=1614763&view=diff
==============================================================================
--- commons/proper/net/trunk/pom.xml (original)
+++ commons/proper/net/trunk/pom.xml Wed Jul 30 20:53:25 2014
@@ -450,7 +450,7 @@ Supported protocols include: Echo, Finge
</activation>
<properties>
<!-- Disable Xdoclint, until JavaDoc issues are fixed -->
- <additionalparam>-Xdoclint:none</additionalparam>
+ <additionalparam>-Xdoclint:none</additionalparam>
</properties>
</profile>
</profiles>
Modified: commons/proper/net/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1614763&r1=1614762&r2=1614763&view=diff
==============================================================================
--- commons/proper/net/trunk/src/changes/changes.xml [utf-8] (original)
+++ commons/proper/net/trunk/src/changes/changes.xml [utf-8] Wed Jul 30 20:53:25 2014
@@ -148,7 +148,7 @@ This is mainly a bug-fix release. See fu
</action>
<action issue="NET-501" dev="sebb" due-to="Julián Lastiri" type="fix">
Race Condition on TelnetClient.disconnect() and TelnetInputStream.run()
- java.lang.IllegalStateException: Queue is full! Cannot process another character.
+ java.lang.IllegalStateException: Queue is full! Cannot process another character.
</action>
<action issue="NET-505" dev="sebb" due-to="Sean Kelley" type="update">
User specified bufferSize reset to default when FTPClient is disconnected or reinitialized resulting in performance degradation.
Modified: commons/proper/net/trunk/src/main/java/examples/mail/IMAPExportMbox.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/examples/mail/IMAPExportMbox.java?rev=1614763&r1=1614762&r2=1614763&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/examples/mail/IMAPExportMbox.java (original)
+++ commons/proper/net/trunk/src/main/java/examples/mail/IMAPExportMbox.java Wed Jul 30 20:53:25 2014
@@ -98,11 +98,11 @@ public final class IMAPExportMbox
// suppress login details
final PrintCommandListener listener = new PrintCommandListener(System.out, true);
-
+
// Connect and login
final IMAPClient imap = IMAPUtils.imapLogin(uri, 10000, listener);
- MboxListener chunkListener = new MboxListener(mbox);
+ MboxListener chunkListener = new MboxListener(mbox);
try {
imap.setSoTimeout(6000);
@@ -230,7 +230,7 @@ public final class IMAPExportMbox
public void close() throws IOException {
if (bw != null) {
bw.close();
- }
+ }
}
}
}
Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java?rev=1614763&r1=1614762&r2=1614763&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java Wed Jul 30 20:53:25 2014
@@ -398,7 +398,7 @@ implements Configurable
/** Pattern for PASV mode responses. Groups: (n,n,n,n),(n),(n) */
private static final java.util.regex.Pattern __PARMS_PAT;
-
+
static {
__PARMS_PAT = java.util.regex.Pattern.compile(
"(\\d{1,3},\\d{1,3},\\d{1,3},\\d{1,3}),(\\d{1,3}),(\\d{1,3})");
Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java?rev=1614763&r1=1614762&r2=1614763&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java Wed Jul 30 20:53:25 2014
@@ -60,7 +60,7 @@ implements Configurable
* constructor for this abstract class.
* @param regex Regular expression used main parsing of the
* file listing.
- * @param flags the flags to apply, see
+ * @param flags the flags to apply, see
* {@link java.util.regex.Pattern#compile(String, int) Pattern#compile(String, int)}. Use 0 for none.
* @since 3.4
*/
Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAP.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAP.java?rev=1614763&r1=1614762&r2=1614763&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAP.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAP.java Wed Jul 30 20:53:25 2014
@@ -72,7 +72,7 @@ public class IMAP extends SocketClient
public interface IMAPChunkListener {
/**
* Called when a multi-line partial response has been received.
- * @param imap the instance, get the response
+ * @param imap the instance, get the response
* by calling {@link #getReplyString()} or {@link #getReplyStrings()}
* @return {@code true} if the reply buffer is to be cleared on return
*/
@@ -103,7 +103,7 @@ public class IMAP extends SocketClient
public boolean chunkReceived(IMAP imap) {
return true;
}
-
+
};
private volatile IMAPChunkListener __chunkListener;
@@ -422,7 +422,7 @@ public class IMAP extends SocketClient
/**
* Sets the current chunk listener.
* If a listener is registered and the implementation returns true,
- * then any registered
+ * then any registered
* {@link org.apache.commons.net.PrintCommandListener PrintCommandListener}
* instances will be invoked with the partial response and a status of
* {@link IMAPReply#PARTIAL} to indicate that the final reply code is not yet known.
Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAPReply.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAPReply.java?rev=1614763&r1=1614762&r2=1614763&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAPReply.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAPReply.java Wed Jul 30 20:53:25 2014
@@ -42,9 +42,9 @@ public final class IMAPReply
public static final int CONT = 3;
/**
- * The reply code indicating a partial response.
+ * The reply code indicating a partial response.
* This is used when a chunk listener is registered and the listener
- * requests that the reply lines are cleared on return.
+ * requests that the reply lines are cleared on return.
*/
public static final int PARTIAL = 3;
Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NNTPClient.java?rev=1614763&r1=1614762&r2=1614763&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NNTPClient.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NNTPClient.java Wed Jul 30 20:53:25 2014
@@ -368,7 +368,7 @@ public class NNTPClient extends NNTP
* Same as <code> retrieveArticle(articleId, (ArticleInfo) null) </code>
* Note: the return can be cast to a {@link BufferedReader}
* @param articleId the article id to retrieve
- * @return A DotTerminatedMessageReader instance from which the article can be read.
+ * @return A DotTerminatedMessageReader instance from which the article can be read.
* null if the article does not exist.
* @throws IOException if an IO error occurs
*/
@@ -380,7 +380,7 @@ public class NNTPClient extends NNTP
/**
* Same as <code> retrieveArticle((String) null) </code>
* Note: the return can be cast to a {@link BufferedReader}
- * @return A DotTerminatedMessageReader instance from which the article can be read.
+ * @return A DotTerminatedMessageReader instance from which the article can be read.
* null if the article does not exist.
* @throws IOException if an IO error occurs
*/
@@ -435,7 +435,7 @@ public class NNTPClient extends NNTP
}
/**
- * Same as <code> retrieveArticle(articleNumber, null) </code>
+ * Same as <code> retrieveArticle(articleNumber, null) </code>
* @param articleNumber the article number to fetch
* @return A DotTerminatedMessageReader instance from which the article
* can be read. null if the article does not exist.
@@ -566,7 +566,7 @@ public class NNTPClient extends NNTP
/**
- * Same as <code> retrieveArticleHeader(articleNumber, null) </code>
+ * Same as <code> retrieveArticleHeader(articleNumber, null) </code>
*
* @param articleNumber the article number
* @return the reader
@@ -699,7 +699,7 @@ public class NNTPClient extends NNTP
/**
- * Same as <code> retrieveArticleBody(articleNumber, null) </code>
+ * Same as <code> retrieveArticleBody(articleNumber, null) </code>
* @param articleNumber the article number
* @return the reader
* @throws IOException if an error occurs
@@ -743,7 +743,7 @@ public class NNTPClient extends NNTP
}
/**
- * Same as <code> selectNewsgroup(newsgroup, null) </code>
+ * Same as <code> selectNewsgroup(newsgroup, null) </code>
* @param newsgroup the newsgroup name
* @return true if newsgroup exist and was selected
* @throws IOException if an error occurs
@@ -847,7 +847,7 @@ public class NNTPClient extends NNTP
}
/**
- * Same as <code> selectArticle(articleId, (ArticleInfo) null) </code>
+ * Same as <code> selectArticle(articleId, (ArticleInfo) null) </code>
*/
public boolean selectArticle(String articleId) throws IOException
{
@@ -1582,7 +1582,7 @@ public class NNTPClient extends NNTP
/**
- * @param header
+ * @param header
* @param lowArticleNumber to fetch
* @param highArticleNumber to fetch
* @return a DotTerminatedReader if successful, null otherwise
@@ -1610,9 +1610,9 @@ public class NNTPClient extends NNTP
/**
* @param a s
- * @param b
- * @return
- * @throws IOException
+ * @param b
+ * @return
+ * @throws IOException
* @deprecated 3.0 use {@link #retrieveHeader(String, long)} instead
*/
@Deprecated
@@ -1716,10 +1716,10 @@ public class NNTPClient extends NNTP
}
/**
- * @param articleId The unique article identifier of the article to retrieve
+ * @param articleId The unique article identifier of the article to retrieve
* @param pointer A parameter through which to return the article's number and unique id
* @deprecated 3.0 use {@link #retrieveArticle(String, ArticleInfo)} instead
- * @return A DotTerminatedMessageReader instance from which the article can be read.
+ * @return A DotTerminatedMessageReader instance from which the article can be read.
* null if the article does not exist.
* @throws IOException on error
*/
@@ -1732,7 +1732,7 @@ public class NNTPClient extends NNTP
}
/**
- * @param articleId The unique article identifier of the article to retrieve
+ * @param articleId The unique article identifier of the article to retrieve
* @param pointer A parameter through which to return the article's number and unique id
* @return A DotTerminatedMessageReader instance from which the article
* body can be read. null if the article does not exist.
@@ -1748,7 +1748,7 @@ public class NNTPClient extends NNTP
}
/**
- * @param articleId The unique article identifier of the article to retrieve
+ * @param articleId The unique article identifier of the article to retrieve
* @param pointer A parameter through which to return the article's number and unique id
* @return A DotTerminatedMessageReader instance from which the article
* body can be read. null if the article does not exist.
@@ -1764,7 +1764,7 @@ public class NNTPClient extends NNTP
}
/**
- * @param articleId The unique article identifier of the article to retrieve
+ * @param articleId The unique article identifier of the article to retrieve
* @param pointer A parameter through which to return the article's number and unique id
* @return A DotTerminatedMessageReader instance from which the article
* body can be read. null if the article does not exist.
Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Threader.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Threader.java?rev=1614763&r1=1614762&r2=1614763&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Threader.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Threader.java Wed Jul 30 20:53:25 2014
@@ -98,7 +98,7 @@ public class Threader {
/**
*
* @param threadable
- * @param idTable
+ * @param idTable
*/
private void buildContainer(Threadable threadable, HashMap<String,ThreadContainer> idTable) {
String id = threadable.messageThreadId();
@@ -207,7 +207,7 @@ public class Threader {
/**
* Find the root set of all existing ThreadContainers
- * @param idTable
+ * @param idTable
* @return root the ThreadContainer representing the root node
*/
private ThreadContainer findRootSet(HashMap<String, ThreadContainer> idTable) {
@@ -295,7 +295,7 @@ public class Threader {
/**
* If any two members of the root set have the same subject, merge them. This is to attempt to accomodate messages without References: headers.
- * @param root
+ * @param root
*/
private void gatherSubjects(ThreadContainer root) {
Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java?rev=1614763&r1=1614762&r2=1614763&view=diff
==============================================================================
--- commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java (original)
+++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java Wed Jul 30 20:53:25 2014
@@ -137,7 +137,7 @@ public class MLSDComparison {
/**
* Compare two instances to see if they are the same,
* ignoring any uninitialised fields.
- * @param a first instance
+ * @param a first instance
* @param b second instance
* @return true if the initialised fields are the same
* @since 3.0
Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java?rev=1614763&r1=1614762&r2=1614763&view=diff
==============================================================================
--- commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java (original)
+++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java Wed Jul 30 20:53:25 2014
@@ -251,7 +251,7 @@ public class NTFTPEntryParserTest extend
}
// byte -123 when read using ISO-8859-1 encoding becomes 0X85 line terminator
- private static final byte[] listFilesByteTrace = {
+ private static final byte[] listFilesByteTrace = {
48, 57, 45, 48, 52, 45, 49, 51, 32, 32, 48, 53, 58, 53, 49, 80, 77,
32, 32, 32, 32, 32, 32, 32, 60, 68, 73, 82, 62, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
97, 115, 112, 110, 101, 116, 95, 99, 108, 105, 101, 110, 116,
Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/nntp/TestThreader.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/nntp/TestThreader.java?rev=1614763&r1=1614762&r2=1614763&view=diff
==============================================================================
--- commons/proper/net/trunk/src/test/java/org/apache/commons/net/nntp/TestThreader.java (original)
+++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/nntp/TestThreader.java Wed Jul 30 20:53:25 2014
@@ -27,27 +27,27 @@ import org.junit.Test;
* Test the Threader
*/
public class TestThreader {
-
+
@Test
@SuppressWarnings("deprecation") // test of deprecated method
public void testNullArray() { // NET-539
Threader t = new Threader();
Threadable[] messages=null;
- Assert.assertNull(t.thread(messages));
+ Assert.assertNull(t.thread(messages));
}
@Test
public void testNullList() {
Threader t = new Threader();
List<Threadable> messages=null;
- Assert.assertNull(t.thread(messages));
+ Assert.assertNull(t.thread(messages));
}
@Test
public void testNullIterable() {
Threader t = new Threader();
Iterable<Threadable> messages=null;
- Assert.assertNull(t.thread(messages));
+ Assert.assertNull(t.thread(messages));
}
@SuppressWarnings("deprecation") // test of deprecated method