Author: sebb
Date: Mon Aug 24 15:11:40 2015
New Revision: 1697433
URL: http://svn.apache.org/r1697433
Log:
Checkstyle: Line length
Modified:
commons/proper/net/trunk/checkstyle.xml
commons/proper/net/trunk/src/main/java/examples/Main.java
commons/proper/net/trunk/src/main/java/examples/mail/IMAPExportMbox.java
commons/proper/net/trunk/src/main/java/examples/mail/IMAPImportMbox.java
commons/proper/net/trunk/src/main/java/examples/telnet/TelnetClientExample.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/AuthenticatingIMAPClient.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAPClient.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ThreadContainer.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/ExtendedPOP3Client.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SSLContextUtils.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParserTest.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java
Modified: commons/proper/net/trunk/checkstyle.xml
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/checkstyle.xml?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
--- commons/proper/net/trunk/checkstyle.xml (original)
+++ commons/proper/net/trunk/checkstyle.xml Mon Aug 24 15:11:40 2015
@@ -57,7 +57,7 @@ limitations under the License.
<module name="UnusedImports"/>
<module name="NeedBraces"/>
<module name="LineLength">
- <property name="max" value="300"/> <!-- TODO reduce -->
+ <property name="max" value="132"/> <!-- TODO reduce -->
<property name="severity" value="warning" />
</module>
Modified: commons/proper/net/trunk/src/main/java/examples/Main.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/examples/Main.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/examples/Main.java (original)
+++ commons/proper/net/trunk/src/main/java/examples/Main.java Mon Aug 24
15:11:40 2015
@@ -51,13 +51,17 @@ public class Main {
}
if (args.length == 0) {
if (Thread.currentThread().getStackTrace().length > 2) { // called
by Maven
- System.out.println("Usage: mvn -q exec:java
-Dexec.arguments=<alias or exampleClass>,<exampleClass parameters>
(comma-separated, no spaces)");
- System.out.println("Or : mvn -q exec:java
-Dexec.args=\"<alias or exampleClass> <exampleClass parameters>\" (space
separated)");
+ System.out.println("Usage: mvn -q exec:java
-Dexec.arguments=<alias or" +
+ " exampleClass>,<exampleClass parameters>
(comma-separated, no spaces)");
+ System.out.println("Or : mvn -q exec:java
-Dexec.args=\"<alias" +
+ " or exampleClass> <exampleClass
parameters>\" (space separated)");
} else {
if (fromJar()) {
- System.out.println("Usage: java -jar
commons-net-examples-m.n.jar <alias or exampleClass> <exampleClass
parameters>");
+ System.out.println(
+ "Usage: java -jar commons-net-examples-m.n.jar <alias
or exampleClass> <exampleClass parameters>");
} else {
- System.out.println("Usage: java -cp target/classes
examples/Main <alias or exampleClass> <exampleClass parameters>");
+ System.out.println(
+ "Usage: java -cp target/classes examples/Main <alias
or exampleClass> <exampleClass parameters>");
}
}
@SuppressWarnings("unchecked") // property names are Strings
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=1697433&r1=1697432&r2=1697433&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
Mon Aug 24 15:11:40 2015
@@ -131,7 +131,8 @@ public final class IMAPExportMbox
if (argCount < 2)
{
- System.err.println("Usage: IMAPExportMbox [-LF|-CRLF] [-c n] [-r
n] [-R n] [-.] [-X] imap[s]://user:password@host[:port]/folder/path
[+|-]<mboxfile> [sequence-set] [itemnames]");
+ System.err.println("Usage: IMAPExportMbox [-LF|-CRLF] [-c n] [-r
n] [-R n] [-.] [-X]" +
+ "
imap[s]://user:password@host[:port]/folder/path [+|-]<mboxfile> [sequence-set]
[itemnames]");
System.err.println("\t-LF | -CRLF set end-of-line to LF or CRLF
(default is the line.separator system property)");
System.err.println("\t-c connect timeout in seconds (default 10)");
System.err.println("\t-r read timeout in seconds (default 10)");
@@ -141,7 +142,8 @@ public final class IMAPExportMbox
System.err.println("\tthe mboxfile is where the messages are
stored; use '-' to write to standard output.");
System.err.println("\tPrefix filename with '+' to append to the
file. Prefix with '-' to allow overwrite.");
System.err.println("\ta sequence-set is a list of numbers/number
ranges e.g. 1,2,3-10,20:* - default 1:*");
- System.err.println("\titemnames are the message data item name(s)
e.g. BODY.PEEK[HEADER.FIELDS (SUBJECT)] or a macro e.g. ALL - default
(INTERNALDATE BODY.PEEK[])");
+ System.err.println("\titemnames are the message data item name(s)
e.g. BODY.PEEK[HEADER.FIELDS (SUBJECT)]" +
+ " or a macro e.g. ALL - default (INTERNALDATE
BODY.PEEK[])");
System.exit(1);
}
@@ -176,11 +178,13 @@ public final class IMAPExportMbox
} else if (file.startsWith("+")) {
final File mbox = new File(file.substring(1));
System.out.println("Appending to file " + mbox);
- chunkListener = new MboxListener(new BufferedWriter(new
FileWriter(mbox, true)), eol, printHash, printMarker, checkSequence);
+ chunkListener = new MboxListener(
+ new BufferedWriter(new FileWriter(mbox, true)), eol,
printHash, printMarker, checkSequence);
} else if (file.startsWith("-")) {
final File mbox = new File(file.substring(1));
System.out.println("Writing to file " + mbox);
- chunkListener = new MboxListener(new BufferedWriter(new
FileWriter(mbox, false)), eol, printHash, printMarker, checkSequence);
+ chunkListener = new MboxListener(
+ new BufferedWriter(new FileWriter(mbox, false)), eol,
printHash, printMarker, checkSequence);
} else {
final File mbox = new File(file);
if (mbox.exists()) {
@@ -254,7 +258,8 @@ public final class IMAPExportMbox
} catch (IOException ioe) {
String count = chunkListener == null ? "?" :
Integer.toString(chunkListener.total);
- System.err.println("FETCH " + sequenceSet + " " + itemNames + "
failed after processing " + count + " complete messages ");
+ System.err.println(
+ "FETCH " + sequenceSet + " " + itemNames + " failed after
processing " + count + " complete messages ");
if (chunkListener != null) {
System.err.println("Last complete response seen:
"+chunkListener.lastFetched);
}
@@ -322,7 +327,8 @@ public final class IMAPExportMbox
private final boolean printMarker;
private final boolean checkSequence;
- MboxListener(BufferedWriter bw, String eol, boolean printHash, boolean
printMarker, boolean checkSequence) throws IOException {
+ MboxListener(BufferedWriter bw, String eol, boolean printHash, boolean
printMarker, boolean checkSequence)
+ throws IOException {
this.eol = eol;
this.printHash = printHash;
this.printMarker = printMarker;
@@ -405,7 +411,8 @@ public final class IMAPExportMbox
for(long j = lastSeq + 1; j < msgSeq; j++) {
missingIds.add(String.valueOf(j));
}
- System.err.println("*** Sequence error: current="
+ msgSeq + " previous=" + lastSeq + " Missing=" + missing);
+ System.err.println(
+ "*** Sequence error: current=" + msgSeq + "
previous=" + lastSeq + " Missing=" + missing);
}
}
lastSeq = msgSeq;
Modified:
commons/proper/net/trunk/src/main/java/examples/mail/IMAPImportMbox.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/examples/mail/IMAPImportMbox.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/examples/mail/IMAPImportMbox.java
(original)
+++ commons/proper/net/trunk/src/main/java/examples/mail/IMAPImportMbox.java
Mon Aug 24 15:11:40 2015
@@ -56,7 +56,8 @@ public final class IMAPImportMbox
if (args.length < 2)
{
System.err.println("Usage: IMAPImportMbox
imap[s]://user:password@host[:port]/folder/path <mboxfile> [selectors]");
- System.err.println("\tWhere: a selector is a list of
numbers/number ranges - 1,2,3-10 - or a list of strings to match in the initial
From line");
+ System.err.println("\tWhere: a selector is a list of
numbers/number ranges - 1,2,3-10" +
+ " - or a list of strings to match in the
initial From line");
System.exit(1);
}
Modified:
commons/proper/net/trunk/src/main/java/examples/telnet/TelnetClientExample.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/examples/telnet/TelnetClientExample.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/examples/telnet/TelnetClientExample.java
(original)
+++
commons/proper/net/trunk/src/main/java/examples/telnet/TelnetClientExample.java
Mon Aug 24 15:11:40 2015
@@ -155,7 +155,8 @@ public class TelnetClientExample impleme
{
System.out.println("Status of options:");
for(int ii=0; ii<25; ii++) {
- System.out.println("Local Option " + ii +
":" + tc.getLocalOptionState(ii) + " Remote Option " + ii + ":" +
tc.getRemoteOptionState(ii));
+ System.out.println("Local Option " + ii +
":" + tc.getLocalOptionState(ii) +
+ " Remote Option " + ii
+ ":" + tc.getRemoteOptionState(ii));
}
}
else if(line.startsWith("REGISTER"))
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Mon Aug 24 15:11:40 2015
@@ -107,7 +107,9 @@ public class FTPSClient extends FTPClien
/** The protocol versions */
private String[] protocols = null;
- /** The FTPS {@link TrustManager} implementation, default validate only:
{@link TrustManagerUtils#getValidateServerCertificateTrustManager()}. */
+ /** The FTPS {@link TrustManager} implementation, default validate only
+ * {@link TrustManagerUtils#getValidateServerCertificateTrustManager()}.
+ */
private TrustManager trustManager =
TrustManagerUtils.getValidateServerCertificateTrustManager();
/** The {@link KeyManager}, default null (i.e. use system default). */
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
Mon Aug 24 15:11:40 2015
@@ -56,7 +56,8 @@ public class FTPSSocketFactory extends S
}
@Override
- public Socket createSocket(String address, int port, InetAddress
localAddress, int localPort) throws UnknownHostException, IOException {
+ public Socket createSocket(String address, int port, InetAddress
localAddress, int localPort)
+ throws UnknownHostException, IOException {
return this.context.getSocketFactory().createSocket(address, port,
localAddress, localPort);
}
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
Mon Aug 24 15:11:40 2015
@@ -25,7 +25,9 @@ import javax.net.ssl.X509TrustManager;
/**
* Do not use.
* @since 2.0
- * @deprecated 3.0 use {@link
org.apache.commons.net.util.TrustManagerUtils#getValidateServerCertificateTrustManager()
TrustManagerUtils#getValidateServerCertificateTrustManager()} instead
+ * @deprecated 3.0 use
+ * {@link
org.apache.commons.net.util.TrustManagerUtils#getValidateServerCertificateTrustManager()
+ * TrustManagerUtils#getValidateServerCertificateTrustManager()} instead
*/
@Deprecated
public class FTPSTrustManager implements X509TrustManager
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
Mon Aug 24 15:11:40 2015
@@ -25,7 +25,8 @@ import org.apache.commons.net.ftp.FTPFil
/**
* Implementation of FTPFileEntryParser and FTPFileListParser for Netware
Systems. Note that some of the proprietary
* extensions for Novell-specific operations are not supported. See
- * <a
href="http://www.novell.com/documentation/nw65/index.html?page=/documentation/nw65/ftp_enu/data/fbhbgcfa.html";>http://www.novell.com/documentation/nw65/index.html?page=/documentation/nw65/ftp_enu/data/fbhbgcfa.html</a>
+ * <a
href="http://www.novell.com/documentation/nw65/index.html?page=/documentation/nw65/ftp_enu/data/fbhbgcfa.html";>
+ *
http://www.novell.com/documentation/nw65/index.html?page=/documentation/nw65/ftp_enu/data/fbhbgcfa.html</a>
* for more details.
*
* @see org.apache.commons.net.ftp.FTPFileEntryParser FTPFileEntryParser (for
usage instructions)
@@ -102,7 +103,9 @@ public class NetwareFTPEntryParser exten
* <li><b>A</b> - Access Control; Right to modify trustee assignments and
the Inherited Rights Mask.
* </ul>
*
- * See <a
href="http://www.novell.com/documentation/nfap10/index.html?page=/documentation/nfap10/nfaubook/data/abxraws.html";>here</a>
+ * See
+ * <a
href="http://www.novell.com/documentation/nfap10/index.html?page=/documentation/nfap10/nfaubook/data/abxraws.html";>
+ * here</a>
* for more details
*
* @param entry A line of text from the file listing
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
Mon Aug 24 15:11:40 2015
@@ -196,12 +196,12 @@ import org.apache.commons.net.ftp.FTPFil
*
* [echo] Downloading members of all files of a library:
* [ftp] getting files
- * [ftp] transferring RPGUNIT1.FILE\RUN.MBR to
C:\workspaces\rdp_080\workspace\ANT - FTP\i5-downloads-lib\RPGUNIT1.FILE\RUN.MBR
- * [ftp] transferring RPGUNIT1.FILE\RUNRMT.MBR to
C:\workspaces\rdp_080\workspace\ANT -
FTP\i5-downloads-lib\RPGUNIT1.FILE\RUNRMT.MBR
- * [ftp] transferring RPGUNITT1.FILE\RUNT.MBR to
C:\workspaces\rdp_080\workspace\ANT -
FTP\i5-downloads-lib\RPGUNITT1.FILE\RUNT.MBR
- * [ftp] transferring RPGUNITY1.FILE\RUN.MBR to
C:\workspaces\rdp_080\workspace\ANT -
FTP\i5-downloads-lib\RPGUNITY1.FILE\RUN.MBR
- * [ftp] transferring RPGUNITY1.FILE\RUNNER.MBR to
C:\workspaces\rdp_080\workspace\ANT -
FTP\i5-downloads-lib\RPGUNITY1.FILE\RUNNER.MBR
- * [ftp] transferring RPGUNITY1.FILE\RUNNERBND.MBR to
C:\workspaces\rdp_080\workspace\ANT -
FTP\i5-downloads-lib\RPGUNITY1.FILE\RUNNERBND.MBR
+ * [ftp] transferring RPGUNIT1.FILE\RUN.MBR to C:\work\rdp_080\space\ANT -
FTP\i5-downloads\RPGUNIT1.FILE\RUN.MBR
+ * [ftp] transferring RPGUNIT1.FILE\RUNRMT.MBR to C:\work\rdp_080\space\ANT
- FTP\i5-downloads\RPGUNIT1.FILE\RUNRMT.MBR
+ * [ftp] transferring RPGUNITT1.FILE\RUNT.MBR to C:\work\rdp_080\space\ANT
- FTP\i5-downloads\RPGUNITT1.FILE\RUNT.MBR
+ * [ftp] transferring RPGUNITY1.FILE\RUN.MBR to C:\work\rdp_080\space\ANT -
FTP\i5-downloads\RPGUNITY1.FILE\RUN.MBR
+ * [ftp] transferring RPGUNITY1.FILE\RUNNER.MBR to
C:\work\rdp_080\space\ANT - FTP\i5-downloads\RPGUNITY1.FILE\RUNNER.MBR
+ * [ftp] transferring RPGUNITY1.FILE\RUNNERBND.MBR to
C:\work\rdp_080\space\ANT - FTP\i5-downloads\RPGUNITY1.FILE\RUNNERBND.MBR
* [ftp] 6 files retrieved
*
*
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/AuthenticatingIMAPClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/AuthenticatingIMAPClient.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/AuthenticatingIMAPClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/AuthenticatingIMAPClient.java
Mon Aug 24 15:11:40 2015
@@ -173,7 +173,8 @@ public class AuthenticatingIMAPClient ex
Mac hmac_md5 = Mac.getInstance("HmacMD5");
hmac_md5.init(new
SecretKeySpec(password.getBytes(getCharsetName()), "HmacMD5")); // Java 1.6 can
use getCharset()
// compute the result:
- byte[] hmacResult =
_convertToHexString(hmac_md5.doFinal(serverChallenge)).getBytes(getCharsetName());
// Java 1.6 can use getCharset()
+ // Java 1.6 can use getCharset()
+ byte[] hmacResult =
_convertToHexString(hmac_md5.doFinal(serverChallenge)).getBytes(getCharsetName());
// join the byte arrays to form the reply
byte[] usernameBytes = username.getBytes(getCharsetName()); //
Java 1.6 can use getCharset()
byte[] toEncode = new byte[usernameBytes.length + 1 /* the
space */ + hmacResult.length];
@@ -193,11 +194,13 @@ public class AuthenticatingIMAPClient ex
// the server sends fixed responses (base64("Username") and
// base64("Password")), so we don't have to read them.
if (sendData(
-
Base64.encodeBase64StringUnChunked(username.getBytes(getCharsetName()))) !=
IMAPReply.CONT) // Java 1.6 can use getCharset()
+ // Java 1.6 can use getCharset()
+
Base64.encodeBase64StringUnChunked(username.getBytes(getCharsetName()))) !=
IMAPReply.CONT)
{
return false;
}
- int result =
sendData(Base64.encodeBase64StringUnChunked(password.getBytes(getCharsetName())));
// Java 1.6 can use getCharset()
+ // Java 1.6 can use getCharset()
+ int result =
sendData(Base64.encodeBase64StringUnChunked(password.getBytes(getCharsetName())));
if (result == IMAPReply.OK)
{
setState(IMAP.IMAPState.AUTH_STATE);
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAPClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAPClient.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAPClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAPClient.java
Mon Aug 24 15:11:40 2015
@@ -278,7 +278,8 @@ public class IMAPClient extends IMAP
* @param datetime The date/time string (optional).
* @return {@code true} if the command was successful,{@code false} if not.
* @exception IOException If a network I/O error occurs.
- * @deprecated (3.4) Does not work; the message body is not optional. Use
{@link #append(String, String, String, String)} instead.
+ * @deprecated (3.4) Does not work; the message body is not optional.
+ * Use {@link #append(String, String, String, String)} instead.
*/
@Deprecated
public boolean append(String mailboxName, String flags, String datetime)
throws IOException
@@ -302,7 +303,8 @@ public class IMAPClient extends IMAP
* @param mailboxName The mailbox name.
* @return {@code true} if the command was successful,{@code false} if not.
* @exception IOException If a network I/O error occurs.
- * @deprecated (3.4) Does not work; the message body is not optional. Use
{@link #append(String, String, String, String)} instead.
+ * @deprecated (3.4) Does not work; the message body is not optional.
+ * Use {@link #append(String, String, String, String)} instead.
*/
@Deprecated
public boolean append(String mailboxName) throws IOException
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ThreadContainer.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ThreadContainer.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ThreadContainer.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ThreadContainer.java
Mon Aug 24 15:11:40 2015
@@ -20,7 +20,8 @@ package org.apache.commons.net.nntp;
/**
* A placeholder utility class, used for constructing a tree of Threadables
* Original implementation by Jamie Zawinski.
- * See the Grendel source for more details <a
href="http://lxr.mozilla.org/mozilla/source/grendel/sources/grendel/view/Threader.java#511";>here</a>
+ * See the Grendel source for more details
+ * <a
href="http://lxr.mozilla.org/mozilla/source/grendel/sources/grendel/view/Threader.java#511";>here</a>
* Threadable objects
*/
class ThreadContainer {
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=1697433&r1=1697432&r2=1697433&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
Mon Aug 24 15:11:40 2015
@@ -21,7 +21,9 @@ package org.apache.commons.net.nntp;
/**
* This is an implementation of a message threading algorithm, as originally
devised by Zamie Zawinski.
* See <a
href="http://www.jwz.org/doc/threading.html";>http://www.jwz.org/doc/threading.html</a>
for details.
- * For his Java implementation, see <a
href="http://lxr.mozilla.org/mozilla/source/grendel/sources/grendel/view/Threader.java";>http://lxr.mozilla.org/mozilla/source/grendel/sources/grendel/view/Threader.java</a>
+ * For his Java implementation, see
+ * <a
href="http://lxr.mozilla.org/mozilla/source/grendel/sources/grendel/view/Threader.java";>
+ *
http://lxr.mozilla.org/mozilla/source/grendel/sources/grendel/view/Threader.java</a>
*/
import java.util.Arrays;
@@ -267,7 +269,8 @@ public class Threader {
prev.next = kids;
}
- // Make each child's parent be this level's parent -> i.e.
promote the children. Make the last child's next point to this container's next
+ // Make each child's parent be this level's parent -> i.e.
promote the children.
+ // Make the last child's next point to this container's next
// i.e. splice kids into the list in place of container
for (tail = kids; tail.next != null; tail = tail.next) {
tail.parent = container.parent;
@@ -291,7 +294,8 @@ 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.
+ * 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
*/
private void gatherSubjects(ThreadContainer root) {
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/ExtendedPOP3Client.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/ExtendedPOP3Client.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/ExtendedPOP3Client.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/ExtendedPOP3Client.java
Mon Aug 24 15:11:40 2015
@@ -87,7 +87,8 @@ public class ExtendedPOP3Client extends
Mac hmac_md5 = Mac.getInstance("HmacMD5");
hmac_md5.init(new
SecretKeySpec(password.getBytes(getCharsetName()), "HmacMD5")); // Java 1.6 can
use getCharset()
// compute the result:
- byte[] hmacResult =
_convertToHexString(hmac_md5.doFinal(serverChallenge)).getBytes(getCharsetName());
// Java 1.6 can use getCharset()
+ // Java 1.6 can use getCharset()
+ byte[] hmacResult =
_convertToHexString(hmac_md5.doFinal(serverChallenge)).getBytes(getCharsetName());
// join the byte arrays to form the reply
byte[] usernameBytes = username.getBytes(getCharsetName()); //
Java 1.6 can use getCharset()
byte[] toEncode = new byte[usernameBytes.length + 1 /* the
space */ + hmacResult.length];
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
Mon Aug 24 15:11:40 2015
@@ -224,7 +224,8 @@ public class AuthenticatingSMTPClient ex
{
// the server sends an empty response ("334 "), so we don't have
to read it.
return SMTPReply.isPositiveCompletion(sendCommand(
- Base64.encodeBase64StringUnChunked(("\000" + username +
"\000" + password).getBytes(getCharsetName())) // Java 1.6 can use getCharset()
+ // Java 1.6 can use getCharset()
+ Base64.encodeBase64StringUnChunked(("\000" + username +
"\000" + password).getBytes(getCharsetName()))
));
}
else if (method.equals(AUTH_METHOD.CRAM_MD5))
@@ -235,7 +236,8 @@ public class AuthenticatingSMTPClient ex
Mac hmac_md5 = Mac.getInstance("HmacMD5");
hmac_md5.init(new
SecretKeySpec(password.getBytes(getCharsetName()), "HmacMD5")); // Java 1.6 can
use getCharset()
// compute the result:
- byte[] hmacResult =
_convertToHexString(hmac_md5.doFinal(serverChallenge)).getBytes(getCharsetName());
// Java 1.6 can use getCharset()
+ // Java 1.6 can use getCharset()
+ byte[] hmacResult =
_convertToHexString(hmac_md5.doFinal(serverChallenge)).getBytes(getCharsetName());
// join the byte arrays to form the reply
byte[] usernameBytes = username.getBytes(getCharsetName()); //
Java 1.6 can use getCharset()
byte[] toEncode = new byte[usernameBytes.length + 1 /* the space
*/ + hmacResult.length];
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
Mon Aug 24 15:11:40 2015
@@ -122,7 +122,8 @@ final class TelnetInputStream extends Bu
while (true)
{
- // If there is no more data AND we were told not to block, just
return WOULD_BLOCK (-2). (More efficient than exception.)
+ // If there is no more data AND we were told not to block,
+ // just return WOULD_BLOCK (-2). (More efficient than exception.)
if(!mayBlock && super.available() == 0) {
return WOULD_BLOCK;
}
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=1697433&r1=1697432&r2=1697433&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
Mon Aug 24 15:11:40 2015
@@ -100,7 +100,8 @@ public final class KeyManagerUtils {
* @throws GeneralSecurityException if there is a problem creating the
keystore
* @throws IOException if there is a problem creating the keystore
*/
- public static KeyManager createClientKeyManager(String storeType, File
storePath, String storePass, String keyAlias, String keyPass)
+ public static KeyManager createClientKeyManager(
+ String storeType, File storePath, String storePass, String
keyAlias, String keyPass)
throws IOException, GeneralSecurityException
{
KeyStore ks = loadStore(storeType, storePath, storePass);
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SSLContextUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SSLContextUtils.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SSLContextUtils.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SSLContextUtils.java
Mon Aug 24 15:11:40 2015
@@ -42,7 +42,8 @@ public class SSLContextUtils {
* @return the initialised context.
* @throws IOException this is used to wrap any {@link
GeneralSecurityException} that occurs
*/
- public static SSLContext createSSLContext(String protocol, KeyManager
keyManager, TrustManager trustManager) throws IOException {
+ public static SSLContext createSSLContext(String protocol, KeyManager
keyManager, TrustManager trustManager)
+ throws IOException {
return createSSLContext(protocol,
keyManager == null ? null : new KeyManager[] { keyManager },
trustManager == null ? null : new TrustManager[] {
trustManager });
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
Mon Aug 24 15:11:40 2015
@@ -99,7 +99,8 @@ public final class TrustManagerUtils
/**
* Return the default TrustManager provided by the JVM.
* <p>
- * This should be the same as the default used by {@link
javax.net.ssl.SSLContext#init(javax.net.ssl.KeyManager[],
javax.net.ssl.TrustManager[], java.security.SecureRandom)
+ * This should be the same as the default used by
+ * {@link javax.net.ssl.SSLContext#init(javax.net.ssl.KeyManager[],
javax.net.ssl.TrustManager[], java.security.SecureRandom)
* SSLContext#init(KeyManager[], TrustManager[], SecureRandom)}
* when the TrustManager parameter is set to {@code null}
* @param keyStore the KeyStore to use, may be {@code null}
Modified:
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
(original)
+++
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
Mon Aug 24 15:11:40 2015
@@ -156,7 +156,8 @@ public class FTPClientConfigFunctionalTe
// by the parser and therefore been relegated to the same date a
// year ago.
first.add(Calendar.DAY_OF_MONTH, 2);
- assertTrue(lastfile.getTimestamp().getTime().toString()+" before
"+ first.getTime().toString(),lastfile.getTimestamp().before(first));
+ assertTrue(lastfile.getTimestamp().getTime().toString() +
+ " before "+
first.getTime().toString(),lastfile.getTimestamp().before(first));
}
}
}
Modified:
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
(original)
+++
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
Mon Aug 24 15:11:40 2015
@@ -288,7 +288,8 @@ public class FTPTimestampParserImplTest
* @param expected the expected result from parsing
* @param lenient whether to use lenient mode or not.
*/
- private void checkShortParse(String msg, Calendar servertime, Calendar
input, Calendar expected, boolean lenient) throws ParseException {
+ private void checkShortParse(String msg, Calendar servertime, Calendar
input, Calendar expected, boolean lenient)
+ throws ParseException {
FTPTimestampParserImpl parser = new FTPTimestampParserImpl();
parser.setLenientFutureDates(lenient);
Format shortFormat = parser.getRecentDateFormat(); // It's expecting
this format
Modified:
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
(original)
+++
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
Mon Aug 24 15:11:40 2015
@@ -27,7 +27,8 @@ import org.apache.commons.net.ftp.FTPFil
*/
public class MVSFTPEntryParserTest extends FTPParseTestFramework {
- private static final String[] goodsamplesDatasetList = { /* Note, if the
string begins with SAVE, the parsed entry is stored in the List saveftpfiles */
+ private static final String[] goodsamplesDatasetList = {
+ /* Note, if the string begins with SAVE, the parsed entry is
stored in the List saveftpfiles */
// "Volume Unit Referred Ext Used Recfm Lrecl BlkSz Dsorg
Dsname",
"SAVE00 3390 2004/06/23 1 1 FB 128 6144 PS
INCOMING.RPTBM023.D061704",
"SAVE01 3390 2004/06/23 1 1 FB 128 6144 PO
INCOMING.RPTBM024.D061704",
@@ -42,7 +43,8 @@ public class MVSFTPEntryParserTest exten
"FPFS41 3390 2004/06/23 1 1 FB 128 6144 PS
INCOMING.RPTBM056.D061704",
"FPFS25 3390 2004/06/23 1 1 FB 128 6144 PS
INCOMING.WTM204.D061704", };
- private static final String[] goodsamplesMemberList = {/* Note, if the
string begins with SAVE, the parsed entry is stored in the List saveftpfiles */
+ private static final String[] goodsamplesMemberList = {
+ /* Note, if the string begins with SAVE, the parsed entry is
stored in the List saveftpfiles */
"Name VV.MM Created Changed Size Init Mod
Id",
"SAVE03 01.03 2002/09/12 2002/10/11 09:37 11 11 0
KIL001",
"SAVE04
", // no statistics
Modified:
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParserTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParserTest.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParserTest.java
(original)
+++
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParserTest.java
Mon Aug 24 15:11:40 2015
@@ -150,12 +150,14 @@ public class MacOsPeterFTPEntryParserTes
@Override
public void testDefaultPrecision() {
- testPrecision("-rw-r--r-- 78440 49231 127671 Jul 22 2010
Filename with whitespace.jpg", CalendarUnit.DAY_OF_MONTH);
+ testPrecision(
+ "-rw-r--r-- 78440 49231 127671 Jul 22 2010 Filename
with whitespace.jpg", CalendarUnit.DAY_OF_MONTH);
}
@Override
public void testRecentPrecision() {
- testPrecision("-rw-r--r-- 78440 49231 127671 Jul 22 14:51
Filename with whitespace.jpg", CalendarUnit.MINUTE);
+ testPrecision(
+ "-rw-r--r-- 78440 49231 127671 Jul 22 14:51 Filename
with whitespace.jpg", CalendarUnit.MINUTE);
}
}
Modified:
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
(original)
+++
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
Mon Aug 24 15:11:40 2015
@@ -69,7 +69,8 @@ public class UnixFTPEntryParserTest exte
"drwxrwx---+ 23 500 500 0 Jan 10 13:09 testACL",
"-rw-r--r-- 1 1 3518644 May 25 12:12 std",
"lrwxrwxrwx 1 neeme neeme 23 Mar 2 18:06 macros ->
./../../global/macros/.",
- "-rw-r--r-- 1 ftp group with spaces in it as allowed in
cygwin see bug 38634 83853 Jan 22 2001 zxJDBC-1.2.4.tar.gz",
+ "-rw-r--r-- 1 ftp group with spaces in it as allowed in
cygwin see bug 38634" +
+ " 83853 Jan 22 2001 zxJDBC-1.2.4.tar.gz",
// Bug 38634 => NET-16
"crw-r----- 1 root kmem 0, 27 Jan 30 11:42 kmem", //FreeBSD device
"crw------- 1 root sys 109,767 Jul 2 2004
pci@1c,600000:devctl", //Solaris device
@@ -172,13 +173,15 @@ public class UnixFTPEntryParserTest exte
}
public void testLeadingSpacesNET566() { // check new behaviour
- FTPFile f = new UnixFTPEntryParser(null,
false).parseFTPEntry("drwxr-xr-x 2 john smith group 4096 Mar 2
15:13 zxbox");
+ FTPFile f = new UnixFTPEntryParser(null, false).parseFTPEntry(
+ "drwxr-xr-x 2 john smith group 4096 Mar 2 15:13
zxbox");
assertNotNull(f);
assertEquals(" zxbox", f.getName() ); // leading spaces retained
}
public void testTrimLeadingSpacesNET566() { // check can trim spaces as
before
- FTPFile f = new UnixFTPEntryParser(null,
true).parseFTPEntry("drwxr-xr-x 2 john smith group 4096 Mar 2
15:13 zxbox");
+ FTPFile f = new UnixFTPEntryParser(null, true).parseFTPEntry(
+ "drwxr-xr-x 2 john smith group 4096 Mar 2 15:13
zxbox");
assertNotNull(f);
assertEquals("zxbox", f.getName() ); // leading spaces trimmed
}
Modified:
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java
(original)
+++
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java
Mon Aug 24 15:11:40 2015
@@ -42,6 +42,7 @@ public class VMSFTPEntryParserTest exten
"\r\nTotal 14 files"
};
+ // CHECKSTYLE:OFF (long lines)
private static final String[] goodsamples =
{
"1-JUN.LIS;1 9/9 2-JUN-1998 07:32:04
[GROUP,OWNER] (RWED,RWED,RWED,RE)",
@@ -61,6 +62,7 @@ public class VMSFTPEntryParserTest exten
"FREEWARE40.DIR;1 27/36 16-FEB-1999 10:01:46
[AP_HTTPD,APACHE$WWW (RWE,RWE,RE,RE)",
"1-JUN.LIS;1 9/9 2-jun-1998 07:32:04
[GROUP,OWNER] (RWED,RWED,RWED,RE)",
};
+ // CHECKSTYLE:ON
private static final String fullListing = "Directory USER1:[TEMP]\r\n\r\n"+
"1-JUN.LIS;1 9/9 2-JUN-1998 07:32:04 [GROUP,OWNER]
(RWED,RWED,RWED,RE)\r\n"+
@@ -135,7 +137,8 @@ public class VMSFTPEntryParserTest exten
public void testParseFieldsOnDirectory() throws Exception
{
- FTPFile dir = getParser().parseFTPEntry("DATA.DIR;1 1/9
2-JUN-1998 07:32:04 [GROUP,OWNER] (RWED,RWED,RWED,RE)");
+ FTPFile dir = getParser().parseFTPEntry(
+ "DATA.DIR;1 1/9 2-JUN-1998 07:32:04
[GROUP,OWNER] (RWED,RWED,RWED,RE)");
assertTrue("Should be a directory.",
dir.isDirectory());
assertEquals("DATA.DIR",
@@ -151,7 +154,8 @@ public class VMSFTPEntryParserTest exten
checkPermisions(dir, 0775);
- dir = getParser().parseFTPEntry("DATA.DIR;1 1/9
2-JUN-1998 07:32:04 [TRANSLATED] (RWED,RWED,,RE)");
+ dir = getParser().parseFTPEntry(
+ "DATA.DIR;1 1/9 2-JUN-1998 07:32:04
[TRANSLATED] (RWED,RWED,,RE)");
assertTrue("Should be a directory.",
dir.isDirectory());
assertEquals("DATA.DIR",
@@ -170,7 +174,8 @@ public class VMSFTPEntryParserTest exten
@Override
public void testParseFieldsOnFile() throws Exception
{
- FTPFile file = getParser().parseFTPEntry("1-JUN.LIS;1 9/9
2-JUN-1998 07:32:04 [GROUP,OWNER] (RWED,RWED,RW,R)");
+ FTPFile file = getParser().parseFTPEntry(
+ "1-JUN.LIS;1 9/9 2-JUN-1998 07:32:04
[GROUP,OWNER] (RWED,RWED,RW,R)");
assertTrue("Should be a file.",
file.isFile());
assertEquals("1-JUN.LIS",
@@ -203,7 +208,8 @@ public class VMSFTPEntryParserTest exten
}
public void testDefaultPrecision() {
- testPrecision("1-JUN.LIS;1 9/9 2-JUN-1998
07:32:04 [TRANSLATED] (RWED,RD,,)", CalendarUnit.SECOND);
+ testPrecision(
+ "1-JUN.LIS;1 9/9 2-JUN-1998 07:32:04
[TRANSLATED] (RWED,RD,,)", CalendarUnit.SECOND);
}
public void testRecentPrecision() {
Modified:
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java?rev=1697433&r1=1697432&r2=1697433&view=diff
==============================================================================
---
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java
(original)
+++
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java
Mon Aug 24 15:11:40 2015
@@ -24,8 +24,10 @@ import java.net.DatagramPacket;
public class TestNtpPacket {
// pre-canned NTP packet
- // [version:3, mode:4, poll:4, refId=0x81531472, precision:-17, delay:100,
dispersion(ms):51.605224609375, id:129.83.20.114, xmitTime:Thu, May 30 2013
17:46:01.295, etc. ]
- static final byte[] ntpPacket =
hexStringToByteArray("1c0304ef0000006400000d3681531472d552447fec1d6000d5524718ac49ba5ed55247194b6d9000d55247194b797000");
+ // [version:3, mode:4, poll:4, refId=0x81531472, precision:-17, delay:100,
dispersion(ms):51.605224609375,
+ // id:129.83.20.114, xmitTime:Thu, May 30 2013 17:46:01.295, etc. ]
+ static final byte[] ntpPacket = hexStringToByteArray(
+
"1c0304ef0000006400000d3681531472d552447fec1d6000d5524718ac49ba5ed55247194b6d9000d55247194b797000");
@Test
public void testCreate() {
