Author: sebb Date: Mon Aug 24 00:33:56 2015 New Revision: 1697290 URL: http://svn.apache.org/r1697290 Log: Redundant spaces
Modified: commons/proper/net/trunk/src/main/java/examples/Main.java commons/proper/net/trunk/src/main/java/examples/ftp/FTPClientExample.java commons/proper/net/trunk/src/main/java/examples/mail/IMAPExportMbox.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/chargen/CharGenUDPClient.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/daytime/DaytimeUDPClient.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/echo/EchoUDPClient.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/FTPSSocketFactory.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.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/telnet/TelnetOptionHandler.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPAckPacket.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPPacket.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/time/TimeUDPClient.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SubnetUtils.java commons/proper/net/trunk/src/test/java/examples/MainTest.java commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java 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=1697290&r1=1697289&r2=1697290&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 00:33:56 2015 @@ -54,15 +54,15 @@ public class Main { 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>"); + if (fromJar()) { + 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 List<String> l = (List<String>) Collections.list(fp.propertyNames()); - if (l.isEmpty()) { + if (l.isEmpty()) { return; } Collections.sort(l); Modified: commons/proper/net/trunk/src/main/java/examples/ftp/FTPClientExample.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/examples/ftp/FTPClientExample.java?rev=1697290&r1=1697289&r2=1697290&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/examples/ftp/FTPClientExample.java (original) +++ commons/proper/net/trunk/src/main/java/examples/ftp/FTPClientExample.java Mon Aug 24 00:33:56 2015 @@ -309,7 +309,7 @@ public final class FTPClientExample if (serverType != null) { config = new FTPClientConfig(serverType); } else { - config = new FTPClientConfig(); + config = new FTPClientConfig(); } config.setUnparseableEntries(saveUnparseable); if (defaultDateFormat != null) { 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=1697290&r1=1697289&r2=1697290&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 00:33:56 2015 @@ -184,7 +184,7 @@ public final class IMAPExportMbox } else { final File mbox = new File(file); if (mbox.exists()) { - throw new IOException("mailbox file: " + mbox + " already exists!"); + throw new IOException("mailbox file: " + mbox + " already exists!"); } System.out.println("Creating file " + mbox); chunkListener = new MboxListener(new BufferedWriter(new FileWriter(mbox)), eol, printHash, printMarker, checkSequence); @@ -201,7 +201,7 @@ public final class IMAPExportMbox @Override public void protocolReplyReceived(ProtocolCommandEvent event) { if (event.getReplyCode() != IMAPReply.PARTIAL){ // This is dealt with by the chunk listener - super.protocolReplyReceived(event); + super.protocolReplyReceived(event); } } }; @@ -287,7 +287,7 @@ public final class IMAPExportMbox System.out.println("Processed " + chunkListener.total + " messages."); } if (maxIndexInFolder != null) { - System.out.println("Folder contained " + maxIndexInFolder + " messages."); + System.out.println("Folder contained " + maxIndexInFolder + " messages."); } } Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/chargen/CharGenUDPClient.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/chargen/CharGenUDPClient.java?rev=1697290&r1=1697289&r2=1697290&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/chargen/CharGenUDPClient.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/chargen/CharGenUDPClient.java Mon Aug 24 00:33:56 2015 @@ -96,9 +96,9 @@ public final class CharGenUDPClient exte _socket_.send(__sendPacket); } - /*** Same as <code>send(host, CharGenUDPClient.DEFAULT_PORT);</code> - * @param host the destination host - * @throws IOException on error + /*** Same as <code>send(host, CharGenUDPClient.DEFAULT_PORT);</code> + * @param host the destination host + * @throws IOException on error ***/ public void send(InetAddress host) throws IOException { Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/daytime/DaytimeUDPClient.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/daytime/DaytimeUDPClient.java?rev=1697290&r1=1697289&r2=1697290&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/daytime/DaytimeUDPClient.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/daytime/DaytimeUDPClient.java Mon Aug 24 00:33:56 2015 @@ -70,7 +70,7 @@ public final class DaytimeUDPClient exte return new String(receivePacket.getData(), 0, receivePacket.getLength(), getCharsetName()); // Java 1.6 can use getCharset() } - /** Same as <code>getTime(host, DaytimeUDPClient.DEFAULT_PORT);</code> + /** Same as <code>getTime(host, DaytimeUDPClient.DEFAULT_PORT);</code> * @param host the host * @return the time * @throws IOException on error Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/echo/EchoUDPClient.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/echo/EchoUDPClient.java?rev=1697290&r1=1697289&r2=1697290&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/echo/EchoUDPClient.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/echo/EchoUDPClient.java Mon Aug 24 00:33:56 2015 @@ -91,10 +91,10 @@ public final class EchoUDPClient extends return __receivePacket.getLength(); } - /*** Same as <code> receive(data, data.length)</code> + /*** Same as <code> receive(data, data.length)</code> * @param data the buffer to receive the input * @return the number of bytes - * @throws IOException on error + * @throws IOException on error ***/ public int receive(byte[] data) throws IOException { 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=1697290&r1=1697289&r2=1697290&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 Mon Aug 24 00:33:56 2015 @@ -1891,7 +1891,7 @@ implements Configurable * @param command the command to get * @param remote the remote file name * @param local the local file name - * @return true if successful + * @return true if successful * @throws IOException on error * @since 3.1 */ @@ -1942,7 +1942,7 @@ implements Configurable * the local representation. You must close the InputStream when you * finish reading from it. The InputStream itself will take care of * closing the parent data connection socket upon being closed. - * <p> + * <p> * <b>To finalize the file transfer you must call * {@link #completePendingCommand completePendingCommand } and * check its return value to verify success.</b> @@ -2042,7 +2042,7 @@ implements Configurable * OutputStream when you finish writing to it. The OutputStream itself * will take care of closing the parent data connection socket upon being * closed. - * <p> + * <p> * <b>To finalize the file transfer you must call * {@link #completePendingCommand completePendingCommand } and * check its return value to verify success.</b> @@ -2106,7 +2106,7 @@ implements Configurable * OutputStream when you finish writing to it. The OutputStream itself * will take care of closing the parent data connection socket upon being * closed. - * <p> + * <p> * <b>To finalize the file transfer you must call * {@link #completePendingCommand completePendingCommand } and * check its return value to verify success.</b> @@ -2173,7 +2173,7 @@ implements Configurable * OutputStream when you finish writing to it. The OutputStream itself * will take care of closing the parent data connection socket upon being * closed. - * <p> + * <p> * <b>To finalize the file transfer you must call * {@link #completePendingCommand completePendingCommand } and * check its return value to verify success.</b> @@ -2237,7 +2237,7 @@ implements Configurable * OutputStream when you finish writing to it. The OutputStream itself * will take care of closing the parent data connection socket upon being * closed. - * <p> + * <p> * <b>To finalize the file transfer you must call * {@link #completePendingCommand completePendingCommand } and * check its return value to verify success.</b> 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=1697290&r1=1697289&r2=1697290&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 00:33:56 2015 @@ -70,7 +70,7 @@ public class FTPSSocketFactory extends S /** @param port the port * @return the socket - * @throws IOException on error + * @throws IOException on error * @deprecated (2.2) use {@link FTPSServerSocketFactory#createServerSocket(int) instead} */ @Deprecated public java.net.ServerSocket createServerSocket(int port) throws IOException { Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java?rev=1697290&r1=1697289&r2=1697290&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java Mon Aug 24 00:33:56 2015 @@ -242,7 +242,7 @@ public class DefaultFTPFileEntryParserFa return new CompositeFileEntryParser(new FTPFileEntryParser[] { new NTFTPEntryParser(config), - new UnixFTPEntryParser(config, + new UnixFTPEntryParser(config, config != null && FTPClientConfig.SYST_UNIX_TRIM_LEADING.equals(config.getServerSystemKey())) }); } Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java?rev=1697290&r1=1697289&r2=1697290&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java Mon Aug 24 00:33:56 2015 @@ -59,8 +59,8 @@ public class EnterpriseUnixFTPEntryParse + "\\s*" // TODO should the space be optional? // TODO \\d* should be \\d? surely ? Otherwise 01111 is allowed + "((?:[012]\\d*)|(?:3[01]))\\s*" // 18 date [012]\d* or 3[01] - + "((\\d\\d\\d\\d)|((?:[01]\\d)|(?:2[0123])):([012345]\\d))\\s" - // 20 \d\d\d\d = year OR + + "((\\d\\d\\d\\d)|((?:[01]\\d)|(?:2[0123])):([012345]\\d))\\s" + // 20 \d\d\d\d = year OR // 21 [01]\d or 2[0123] hour + ':' // 22 [012345]\d = minute + "(\\S*)(\\s*.*)"; // 23 name Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java?rev=1697290&r1=1697289&r2=1697290&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java Mon Aug 24 00:33:56 2015 @@ -84,7 +84,7 @@ public class UnixFTPEntryParser extends * e z/OS external link bit * Final letter may be appended: * + file has extended security attributes (e.g. ACL) - * Note: local listings on MacOSX also use '@'; + * Note: local listings on MacOSX also use '@'; * this is not allowed for here as does not appear to be shown by FTP servers * {@code @} file has extended attributes */ @@ -92,7 +92,7 @@ public class UnixFTPEntryParser extends "([bcdelfmpSs-])" // file type +"(((r|-)(w|-)([xsStTL-]))((r|-)(w|-)([xsStTL-]))((r|-)(w|-)([xsStTL-])))\\+?" // permissions - + "\\s*" // separator TODO why allow it to be omitted?? + + "\\s*" // separator TODO why allow it to be omitted?? + "(\\d+)" // link count 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=1697290&r1=1697289&r2=1697290&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 Mon Aug 24 00:33:56 2015 @@ -862,7 +862,7 @@ public class NNTPClient extends NNTP * for retrieving the current article number. * @param pointer to the article * @return true if OK - * @throws IOException on error + * @throws IOException on error ***/ public boolean selectArticle(ArticleInfo pointer) throws IOException { @@ -910,7 +910,7 @@ public class NNTPClient extends NNTP } - /*** Same as <code> selectArticle(articleNumber, null) </code> + /*** Same as <code> selectArticle(articleNumber, null) </code> * @param articleNumber the numger * @return true if successful * @throws IOException on error ***/ @@ -958,8 +958,8 @@ public class NNTPClient extends NNTP return true; } - /*** Same as <code> selectPreviousArticle((ArticleInfo) null) </code> - * @return true if successful + /*** Same as <code> selectPreviousArticle((ArticleInfo) null) </code> + * @return true if successful * @throws IOException on error ***/ public boolean selectPreviousArticle() throws IOException { @@ -1005,7 +1005,7 @@ public class NNTPClient extends NNTP } - /*** Same as <code> selectNextArticle((ArticleInfo) null) </code> + /*** Same as <code> selectNextArticle((ArticleInfo) null) </code> * @return true if successful * @throws IOException on error ***/ public boolean selectNextArticle() throws IOException @@ -1637,7 +1637,7 @@ public class NNTPClient extends NNTP * @param a tba * @param ap tba * @return tba - * @throws IOException tba + * @throws IOException tba * @deprecated 3.0 use {@link #selectArticle(long, ArticleInfo)} instead */ @Deprecated Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetOptionHandler.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetOptionHandler.java?rev=1697290&r1=1697289&r2=1697290&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetOptionHandler.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetOptionHandler.java Mon Aug 24 00:33:56 2015 @@ -212,7 +212,7 @@ public abstract class TelnetOptionHandle * The method is used to specify a subnegotiation sequence that will be * sent by TelnetClient when the option is activated. * <p> - * This implementation returns null, and must be overriden by + * This implementation returns null, and must be overriden by * the actual TelnetOptionHandler to specify * which response must be sent for the subnegotiation request. * @return subnegotiation sequence to be sent by TelnetClient. TelnetClient @@ -228,7 +228,7 @@ public abstract class TelnetOptionHandle * The method is used to specify a subnegotiation sequence that will be * sent by TelnetClient when the option is activated. * <p> - * This implementation returns null, and must be overriden by + * This implementation returns null, and must be overriden by * the actual TelnetOptionHandler to specify * which response must be sent for the subnegotiation request. * @return subnegotiation sequence to be sent by TelnetClient. TelnetClient Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPAckPacket.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPAckPacket.java?rev=1697290&r1=1697289&r2=1697290&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPAckPacket.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPAckPacket.java Mon Aug 24 00:33:56 2015 @@ -151,7 +151,7 @@ public final class TFTPAckPacket extends /*** * Sets the block number of the acknowledgement. - * + * * @param blockNumber the number to set ***/ public void setBlockNumber(int blockNumber) Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java?rev=1697290&r1=1697289&r2=1697290&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java Mon Aug 24 00:33:56 2015 @@ -198,7 +198,7 @@ public final class TFTPDataPacket extend return _blockNumber; } - /*** Sets the block number of the data packet. + /*** Sets the block number of the data packet. * @param blockNumber the number to set ***/ public void setBlockNumber(int blockNumber) Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPPacket.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPPacket.java?rev=1697290&r1=1697289&r2=1697290&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPPacket.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPPacket.java Mon Aug 24 00:33:56 2015 @@ -234,7 +234,7 @@ public abstract class TFTPPacket } /*** - * Sets the port where the packet is going to be sent. + * Sets the port where the packet is going to be sent. * @param port the port to set ***/ public final void setPort(int port) @@ -242,7 +242,7 @@ public abstract class TFTPPacket _port = port; } - /*** Sets the host address where the packet is going to be sent. + /*** Sets the host address where the packet is going to be sent. * @param address the address to set ***/ public final void setAddress(InetAddress address) Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/time/TimeUDPClient.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/time/TimeUDPClient.java?rev=1697290&r1=1697289&r2=1697290&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/time/TimeUDPClient.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/time/TimeUDPClient.java Mon Aug 24 00:33:56 2015 @@ -92,8 +92,8 @@ public final class TimeUDPClient extends return time; } - /*** Same as <code> getTime(host, DEFAULT_PORT); </code> - * @param host the time server + /*** Same as <code> getTime(host, DEFAULT_PORT); </code> + * @param host the time server * @return the time returned from the server * @throws IOException on error ***/ @@ -119,7 +119,7 @@ public final class TimeUDPClient extends } - /*** Same as <code> getTime(host, DEFAULT_PORT); </code> + /*** Same as <code> getTime(host, DEFAULT_PORT); </code> * @param host the time server * @return the date * @throws IOException on error Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SubnetUtils.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SubnetUtils.java?rev=1697290&r1=1697289&r2=1697290&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SubnetUtils.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SubnetUtils.java Mon Aug 24 00:33:56 2015 @@ -127,7 +127,7 @@ public class SubnetUtils { } /** - * + * * @param address the address to check * @return true if it is in range * @since 3.4 (made public) Modified: commons/proper/net/trunk/src/test/java/examples/MainTest.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/examples/MainTest.java?rev=1697290&r1=1697289&r2=1697290&view=diff ============================================================================== --- commons/proper/net/trunk/src/test/java/examples/MainTest.java (original) +++ commons/proper/net/trunk/src/test/java/examples/MainTest.java Mon Aug 24 00:33:56 2015 @@ -40,7 +40,7 @@ public class MainTest { final Enumeration<String> propertyNames = (Enumeration<String>) cp.propertyNames(); while(propertyNames.hasMoreElements()){ String c = propertyNames.nextElement(); - String fv = fp.getProperty(c); + String fv = fp.getProperty(c); final String cv = cp.getProperty(c); if (fv == null) { System.out.printf("%-25s %s - missing from examples.properties%n",c,cv); @@ -78,10 +78,10 @@ public class MainTest { for(File file : current.listFiles()) { if (file.isDirectory()) { scanForClasses(rootLength, file, p); - } else { + } else { processFileName(file.getPath().substring(rootLength), p); } - } + } } private static void processFileName(String name, Properties p) { @@ -96,7 +96,7 @@ public class MainTest { final int lastSep = name.lastIndexOf('/'); final String alias = name.substring(lastSep+1); if (p.containsKey(alias)) { - System.out.printf("Duplicate alias: %-25s %s %s %n",alias,name,p.getProperty(alias)); + System.out.printf("Duplicate alias: %-25s %s %s %n",alias,name,p.getProperty(alias)); } else { p.setProperty(alias, name); } Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java?rev=1697290&r1=1697289&r2=1697290&view=diff ============================================================================== --- commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java (original) +++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java Mon Aug 24 00:33:56 2015 @@ -177,13 +177,13 @@ public abstract class FTPParseTestFramew // This is needed for FTPFile.toFormattedString() to work correctly for(int i = ordinal; i < values.length; i++) { CalendarUnit unit = values[i]; - assertTrue("Expected set "+unit+" in "+listEntry, stamp.isSet(unit.unit)); + assertTrue("Expected set "+unit+" in "+listEntry, stamp.isSet(unit.unit)); } // Check previous entry (if any) is not set // This is also needed for FTPFile.toFormattedString() to work correctly if (ordinal > 0) { final CalendarUnit prevUnit = values[ordinal-1]; - assertFalse("Expected not set "+prevUnit+" in "+listEntry, stamp.isSet(prevUnit.unit)); + assertFalse("Expected not set "+prevUnit+" in "+listEntry, stamp.isSet(prevUnit.unit)); } }