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 2015/08/24 02:32:19 UTC
svn commit: r1697289 - in /commons/proper/net/trunk/src:
main/java/org/apache/commons/net/ftp/
main/java/org/apache/commons/net/ftp/parser/
test/java/org/apache/commons/net/ftp/parser/
Author: sebb
Date: Mon Aug 24 00:32:19 2015
New Revision: 1697289
URL: http://svn.apache.org/r1697289
Log:
Redundant spaces
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFile.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSxEntryParserTest.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/OS400FTPEntryParserTest.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java
Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFile.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFile.java?rev=1697289&r1=1697288&r2=1697289&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFile.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFile.java Mon Aug 24 00:32:19 2015
@@ -84,7 +84,7 @@ public class FTPFile implements Serializ
/**
* Constructor for use by {@link FTPListParseEngine} only.
- * Used to create FTPFile entries for failed parses
+ * Used to create FTPFile entries for failed parses
* @param rawListing line that could not be parsed.
* @since 3.4
*/
@@ -175,14 +175,14 @@ public class FTPFile implements Serializ
* Used to indicate whether an entry is valid or not.
* If the entry is invalid, only the {@link #getRawListing()} method will be useful.
* Other methods may fail.
- *
+ *
* Used in conjunction with list parsing that preseverves entries that failed to parse.
* @see FTPClientConfig#setUnparseableEntries(boolean)
* @return true if the entry is valid
* @since 3.4
*/
public boolean isValid() {
- return (_permissions != null);
+ return (_permissions != null);
}
/***
@@ -455,7 +455,7 @@ public class FTPFile implements Serializ
*/
public String toFormattedString(final String timezone)
{
-
+
if (!isValid()) {
return "[Invalid: could not parse file entry]";
}
Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java?rev=1697289&r1=1697288&r2=1697289&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java Mon Aug 24 00:32:19 2015
@@ -50,7 +50,7 @@ public class FTPTimestampParserImpl impl
private SimpleDateFormat recentDateFormat;
/* The index in CALENDAR_UNITS of the smallest time unit in recentDateFormat */
private int recentDateSmallestUnitIndex;
-
+
private boolean lenientFutureDates = false;
/*
@@ -66,9 +66,9 @@ public class FTPTimestampParserImpl impl
* e.g. for MINUTE it would clear MILLISECOND and SECOND
*/
private static final int[] CALENDAR_UNITS = {
- Calendar.MILLISECOND,
+ Calendar.MILLISECOND,
Calendar.SECOND,
- Calendar.MINUTE,
+ Calendar.MINUTE,
Calendar.HOUR_OF_DAY,
Calendar.DAY_OF_MONTH,
Calendar.MONTH,
@@ -182,7 +182,7 @@ public class FTPTimestampParserImpl impl
* @param timestampStr The timestamp to be parsed
* @param serverTime The current time for the server
* @return the calendar
- * @throws ParseException if timestamp cannot be parsed
+ * @throws ParseException if timestamp cannot be parsed
* @since 1.5
*/
public Calendar parseTimestamp(String timestampStr, Calendar serverTime) throws ParseException {
@@ -269,7 +269,7 @@ public class FTPTimestampParserImpl impl
if (dfs != null) {
this.defaultDateFormat = new SimpleDateFormat(format, dfs);
} else {
- this.defaultDateFormat = new SimpleDateFormat(format);
+ this.defaultDateFormat = new SimpleDateFormat(format);
}
this.defaultDateFormat.setLenient(false);
} else {
Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java?rev=1697289&r1=1697288&r2=1697289&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java Mon Aug 24 00:32:19 2015
@@ -104,7 +104,7 @@ public class MLSxEntryParser extends FTP
} else {
return null; // Invalid - no pathname
}
-
+
}
String parts[] = entry.split(" ",2); // Path may contain space
if (parts.length != 2 || parts[1].length() == 0) {
Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSxEntryParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSxEntryParserTest.java?rev=1697289&r1=1697288&r2=1697289&view=diff
==============================================================================
--- commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSxEntryParserTest.java (original)
+++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSxEntryParserTest.java Mon Aug 24 00:32:19 2015
@@ -99,7 +99,7 @@ public class MLSxEntryParserTest extends
@Override
public void testDefaultPrecision() {
testPrecision("Type=dir;Modify=20141022065102;UNIX.mode=0775; source", CalendarUnit.SECOND);
-
+
}
@Override
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=1697289&r1=1697288&r2=1697289&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 00:32:19 2015
@@ -222,12 +222,10 @@ public class MVSFTPEntryParserTest exten
@Override
public void testDefaultPrecision() {
// TODO Not sure what dates are parsed
-
}
@Override
public void testRecentPrecision() {
// TODO Auto-generated method stub
-
}
}
Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java?rev=1697289&r1=1697288&r2=1697289&view=diff
==============================================================================
--- commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java (original)
+++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java Mon Aug 24 00:32:19 2015
@@ -189,7 +189,7 @@ public class OS400FTPEntryParserTest ext
final FTPClientConfig conf = new FTPClientConfig(FTPClientConfig.SYST_AS400);
conf.setDefaultDateFormatStr("MM/dd/yy HH:mm:ss");
final FTPFileEntryParser parser = new OS400FTPEntryParser(conf);
-
+
FTPFile f = parser.parseFTPEntry("ZFTPDEV 9069 05/20/15 15:36:52 *STMF /DRV/AUDWRKSHET/AUDWRK0204232015114625.PDF");
assertNotNull("Could not parse entry.", f);
assertNotNull("Could not parse timestamp.", f.getTimestamp());
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=1697289&r1=1697288&r2=1697289&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 00:32:19 2015
@@ -207,7 +207,7 @@ 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);
}
-
+
public void testRecentPrecision() {
// Not used
}