Author: sebb
Date: Sun Mar 27 15:56:28 2011
New Revision: 1085970
URL: http://svn.apache.org/viewvc?rev=1085970&view=rev
Log:
Trailing spaces
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Article.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ArticleInfo.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/NewsgroupInfo.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Threader.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3MessageInfo.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java?rev=1085970&r1=1085969&r2=1085970&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java
(original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java
Sun Mar 27 15:56:28 2011
@@ -395,7 +395,7 @@ public class FTP extends SocketClient
__getReply();
// If we received code 120, we have to fetch completion reply.
if (FTPReply.isPositivePreliminary(_replyCode))
- __getReply();
+ __getReply();
}
}
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Article.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Article.java?rev=1085970&r1=1085969&r2=1085970&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Article.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Article.java
Sun Mar 27 15:56:28 2011
@@ -234,14 +234,14 @@ public class Article implements Threadab
public String toString(){ // Useful for Eclipse debugging
return articleNumber + " " +articleId + " " + subject;
}
-
+
// DEPRECATED METHODS - for API compatibility only - DO NOT USE
@Deprecated
public int getArticleNumber() {
return (int) articleNumber;
}
-
+
@Deprecated
public void setArticleNumber(int a) {
articleNumber = a;
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ArticleInfo.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ArticleInfo.java?rev=1085970&r1=1085969&r2=1085970&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ArticleInfo.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ArticleInfo.java
Sun Mar 27 15:56:28 2011
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
package org.apache.commons.net.nntp;
@@ -21,14 +21,14 @@ package org.apache.commons.net.nntp;
* Class contains details about an article.
* Create an instance of the class and pass it to the appropriate NNTP method.
* The values will be populated on return.
- *
+ *
*/
public class ArticleInfo {
public String articleId;
-
+
public long articleNumber;
-
+
public ArticleInfo() {
}
}
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=1085970&r1=1085969&r2=1085970&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
Sun Mar 27 15:56:28 2011
@@ -92,10 +92,10 @@ public class NNTPClient extends NNTP
/**
* Parse the reply and store the id and number in the pointer.
- *
+ *
* @param reply the reply to parse "22n nnn <aaa>"
* @param pointer the pointer to update
- *
+ *
* @throws MalformedServerReplyException
*/
private void __parseArticlePointer(String reply, ArticleInfo pointer)
@@ -367,16 +367,16 @@ public class NNTPClient extends NNTP
/**
* Same as <code> retrieveArticle(articleId, (ArticleInfo) null) </code>
- * Note: the return can be cast to a {@link BufferedReader}
+ * Note: the return can be cast to a {@link BufferedReader}
*/
public Reader retrieveArticle(String articleId) throws IOException
{
return retrieveArticle(articleId, (ArticleInfo) null);
}
- /**
+ /**
* Same as <code> retrieveArticle((String) null) </code>
- * Note: the return can be cast to a {@link BufferedReader}
+ * Note: the return can be cast to a {@link BufferedReader}
*/
public Reader retrieveArticle() throws IOException
{
@@ -484,7 +484,7 @@ public class NNTPClient extends NNTP
}
/**
- * Same as <code> retrieveArticleHeader(articleId, (ArticleInfo) null)
</code>
+ * Same as <code> retrieveArticleHeader(articleId, (ArticleInfo) null)
</code>
* Note: the return can be cast to a {@link BufferedReader}
*/
public Reader retrieveArticleHeader(String articleId) throws IOException
@@ -604,7 +604,7 @@ public class NNTPClient extends NNTP
}
/**
- * Same as <code> retrieveArticleBody(articleId, (ArticleInfo) null)
</code>
+ * Same as <code> retrieveArticleBody(articleId, (ArticleInfo) null)
</code>
* Note: the return can be cast to a {@link BufferedReader}
*/
public Reader retrieveArticleBody(String articleId) throws IOException
@@ -613,8 +613,8 @@ public class NNTPClient extends NNTP
}
/**
- * Same as <code> retrieveArticleBody(null) </code>
- * Note: the return can be cast to a {@link BufferedReader}
+ * Same as <code> retrieveArticleBody(null) </code>
+ * Note: the return can be cast to a {@link BufferedReader}
*/
public Reader retrieveArticleBody() throws IOException
{
@@ -1513,20 +1513,20 @@ public class NNTPClient extends NNTP
}
-
-
+
+
// DEPRECATED METHODS - for API compatibility only - DO NOT USE
// ============================================================
-
-
- /**
+
+
+ /**
* @deprecated 3.0 use {@link #retrieveHeader(String, long, long)} instead
*/
@Deprecated
public Reader retrieveHeader(String s, int l, int h)
- throws IOException
+ throws IOException
{
return retrieveHeader(s, (long) l, (long) h);
}
@@ -1538,7 +1538,7 @@ public class NNTPClient extends NNTP
public Reader retrieveArticleInfo(int a, int b) throws IOException {
return retrieveArticleInfo((long) a, (long) b);
}
-
+
/**
* @deprecated 3.0 use {@link #retrieveHeader(String, long)} instead
*/
@@ -1546,7 +1546,7 @@ public class NNTPClient extends NNTP
public Reader retrieveHeader(String a, int b) throws IOException {
return retrieveHeader(a, (long) b);
}
-
+
/**
* @deprecated 3.0 use {@link #selectArticle(long, ArticleInfo)} instead
*/
@@ -1557,7 +1557,7 @@ public class NNTPClient extends NNTP
__ai2ap(ai, ap);
return b;
}
-
+
/**
* @deprecated 3.0 use {@link #retrieveArticleInfo(long)} instead
*/
@@ -1617,7 +1617,7 @@ public class NNTPClient extends NNTP
*/
@Deprecated
public Reader retrieveArticle(int a) throws IOException {
- return retrieveArticle((long) a);
+ return retrieveArticle((long) a);
}
/**
@@ -1630,7 +1630,7 @@ public class NNTPClient extends NNTP
__ai2ap(ai, ap);
return rdr;
}
-
+
/**
* @deprecated 3.0 use {@link #retrieveArticle(String, ArticleInfo)}
instead
*/
@@ -1639,7 +1639,7 @@ public class NNTPClient extends NNTP
ArticleInfo ai = __ap2ai(ap);
Reader rdr = retrieveArticle(a, ai);
__ai2ap(ai, ap);
- return rdr;
+ return rdr;
}
/**
@@ -1650,9 +1650,9 @@ public class NNTPClient extends NNTP
ArticleInfo ai = __ap2ai(ap);
Reader rdr = retrieveArticleBody(a, ai);
__ai2ap(ai, ap);
- return rdr;
+ return rdr;
}
-
+
/**
* @deprecated 3.0 use {@link #retrieveArticleHeader(String, ArticleInfo)}
instead
*/
@@ -1661,9 +1661,9 @@ public class NNTPClient extends NNTP
ArticleInfo ai = __ap2ai(ap);
Reader rdr = retrieveArticleHeader(a, ai);
__ai2ap(ai, ap);
- return rdr;
+ return rdr;
}
-
+
/**
* @deprecated 3.0 use {@link #selectArticle(String, ArticleInfo)} instead
*/
@@ -1673,9 +1673,9 @@ public class NNTPClient extends NNTP
boolean b = selectArticle(a, ai);
__ai2ap(ai, ap);
return b;
-
+
}
-
+
/**
* @deprecated 3.0 use {@link #selectArticle(ArticleInfo)} instead
*/
@@ -1685,9 +1685,9 @@ public class NNTPClient extends NNTP
boolean b = selectArticle(ai);
__ai2ap(ai, ap);
return b;
-
+
}
-
+
/**
* @deprecated 3.0 use {@link #selectNextArticle(ArticleInfo)} instead
*/
@@ -1697,9 +1697,9 @@ public class NNTPClient extends NNTP
boolean b = selectNextArticle(ai);
__ai2ap(ai, ap);
return b;
-
+
}
-
+
/**
* @deprecated 3.0 use {@link #selectPreviousArticle(ArticleInfo)} instead
*/
@@ -1708,11 +1708,11 @@ public class NNTPClient extends NNTP
ArticleInfo ai = __ap2ai(ap);
boolean b = selectPreviousArticle(ai);
__ai2ap(ai, ap);
- return b;
+ return b;
}
// Helper methods
-
+
private ArticleInfo __ap2ai(@SuppressWarnings("deprecation")
ArticlePointer ap) {
if (ap == null) return null;
ArticleInfo ai = new ArticleInfo();
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NewsgroupInfo.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NewsgroupInfo.java?rev=1085970&r1=1085969&r2=1085970&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NewsgroupInfo.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NewsgroupInfo.java
Sun Mar 27 15:56:28 2011
@@ -153,7 +153,7 @@ public final class NewsgroupInfo
return buffer.toString();
}
*/
-
+
// DEPRECATED METHODS - for API compatibility only - DO NOT USE
@Deprecated
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=1085970&r1=1085969&r2=1085970&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
Sun Mar 27 15:56:28 2011
@@ -54,7 +54,7 @@ public class Threader {
* @return null if messages == null or root.child == null
* @since 3.0
*/
- public Threadable thread(Iterable<? extends Threadable> messages) {
+ public Threadable thread(Iterable<? extends Threadable> messages) {
if (messages == null)
return null;
@@ -414,7 +414,7 @@ public class Threader {
subjectTable = null;
}
-
+
// DEPRECATED METHODS - for API compatibility only - DO NOT USE
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3MessageInfo.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3MessageInfo.java?rev=1085970&r1=1085969&r2=1085970&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3MessageInfo.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3MessageInfo.java
Sun Mar 27 15:56:28 2011
@@ -74,10 +74,10 @@ public final class POP3MessageInfo
{
this(num, uid, -1);
}
-
+
private POP3MessageInfo(int num, String uid, int size) {
this.number = num;
this.size = size;
- this.identifier = uid;
+ this.identifier = uid;
}
}
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java?rev=1085970&r1=1085969&r2=1085970&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java
Sun Mar 27 15:56:28 2011
@@ -42,7 +42,7 @@ import org.apache.commons.net.io.Util;
* How to use with a client certificate:
* <pre>
* KeyManager km = KeyManagerUtils.createClientKeyManager("JKS",
- * "/path/to/privatekeystore.jks","storepassword",
+ * "/path/to/privatekeystore.jks","storepassword",
* "privatekeyalias", "keypassword");
* FTPSClient cl = new FTPSClient();
* cl.setKeyManager(km);
@@ -59,7 +59,7 @@ import org.apache.commons.net.io.Util;
* cl.setKeyManager(km);
* cl.connect(...);
* </pre>
- *
+ *
* @since 3.0
*/
public final class KeyManagerUtils {
@@ -92,7 +92,7 @@ public final class KeyManagerUtils {
*
* @param storeType the type of the keyStore, e.g. "JKS"
* @param storePath the path to the keyStore
- * @param storePass the keyStore password
+ * @param storePass the keyStore password
* @param keyAlias the alias of the key to use, may be {@code null} in
which case the first key entry alias is used
* @param keyPass the password of the key to use
* @return the customised KeyManager
@@ -110,7 +110,7 @@ public final class KeyManagerUtils {
* Uses the default store type and assumes the key password is the same as
the store password
*
* @param storePath the path to the keyStore
- * @param storePass the keyStore password
+ * @param storePass the keyStore password
* @param keyAlias the alias of the key to use, may be {@code null} in
which case the first key entry alias is used
* @return the customised KeyManager
*/
@@ -127,7 +127,7 @@ public final class KeyManagerUtils {
* The key alias is found by searching the keystore for the first private
key entry
*
* @param storePath the path to the keyStore
- * @param storePass the keyStore password
+ * @param storePass the keyStore password
* @return the customised KeyManager
*/
public static KeyManager createClientKeyManager(File storePath, String
storePass)
@@ -136,7 +136,7 @@ public final class KeyManagerUtils {
return createClientKeyManager(DEFAULT_STORE_TYPE, storePath,
storePass, null, storePass);
}
- private static KeyStore loadStore(String storeType, File storePath, String
storePass)
+ private static KeyStore loadStore(String storeType, File storePath, String
storePass)
throws KeyStoreException, IOException, GeneralSecurityException {
KeyStore ks = KeyStore.getInstance(storeType);
FileInputStream stream = null;
@@ -209,7 +209,7 @@ public final class KeyManagerUtils {
public X509Certificate[] getCertificateChain(String alias) {
return keyStore.getCertificateChain();
}
-
+
public String[] getClientAliases(String keyType, Principal[] issuers) {
return new String[]{ keyStore.getAlias()};
}
