Author: sebb
Date: Fri Dec 5 19:32:00 2014
New Revision: 1643407
URL: http://svn.apache.org/r1643407
Log:
Standardise on Calendar.DAY_OF_MONTH rather than the synonym Calendar.DATE -
which is less obvious
Modified:
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/FTPTimestampParserImpl.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/FTPConfigEntryParserTest.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/MacOsPeterFTPEntryParserTest.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserAdditionalTest.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/UnixFTPEntryParserTest.java
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=1643407&r1=1643406&r2=1643407&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
Fri Dec 5 19:32:00 2014
@@ -142,7 +142,7 @@ public class EnterpriseUnixFTPEntryParse
cal.set(Calendar.MINUTE, Integer.parseInt(min));
}
cal.set(Calendar.MONTH, month);
- cal.set(Calendar.DATE, Integer.parseInt(da));
+ cal.set(Calendar.DAY_OF_MONTH, Integer.parseInt(da));
file.setTimestamp(cal);
}
catch (NumberFormatException e)
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=1643407&r1=1643406&r2=1643407&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
Fri Dec 5 19:32:00 2014
@@ -104,7 +104,7 @@ public class FTPTimestampParserImpl impl
if (lenientFutureDates) {
// add a day to "now" so that "slop" doesn't cause a date
// slightly in the future to roll back a full year. (Bug
35181 => NET-83)
- now.add(Calendar.DATE, 1);
+ now.add(Calendar.DAY_OF_MONTH, 1);
}
// The Java SimpleDateFormat class uses the epoch year 1970 if not
present in the input
// As 1970 was not a leap year, it cannot parse "Feb 29" correctly.
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=1643407&r1=1643406&r2=1643407&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
Fri Dec 5 19:32:00 2014
@@ -155,7 +155,7 @@ public class FTPClientConfigFunctionalTe
// and, in particular, that no files have been considered "future"
// by the parser and therefore been relegated to the same date a
// year ago.
- first.add(Calendar.DATE, 2);
+ first.add(Calendar.DAY_OF_MONTH, 2);
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/FTPConfigEntryParserTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPConfigEntryParserTest.java?rev=1643407&r1=1643406&r2=1643407&view=diff
==============================================================================
---
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPConfigEntryParserTest.java
(original)
+++
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/FTPConfigEntryParserTest.java
Fri Dec 5 19:32:00 2014
@@ -83,7 +83,7 @@ public class FTPConfigEntryParserTest ex
Calendar cal = Calendar.getInstance();
cal.set(Calendar.MONTH, Calendar.MARCH);
- cal.set(Calendar.DATE, 2);
+ cal.set(Calendar.DAY_OF_MONTH, 2);
cal.set(Calendar.HOUR_OF_DAY, 16);
cal.set(Calendar.MINUTE, 27);
cal.set(Calendar.SECOND, 0);
@@ -145,7 +145,7 @@ public class FTPConfigEntryParserTest ex
Calendar cal = Calendar.getInstance();
cal.set(Calendar.MONTH, Calendar.MARCH);
- cal.set(Calendar.DATE, 2);
+ cal.set(Calendar.DAY_OF_MONTH, 2);
cal.set(Calendar.HOUR_OF_DAY, 18);
cal.set(Calendar.MINUTE, 06);
cal.set(Calendar.SECOND, 0);
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=1643407&r1=1643406&r2=1643407&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
Fri Dec 5 19:32:00 2014
@@ -68,7 +68,7 @@ public class FTPTimestampParserImplTest
Calendar caltemp = (Calendar) cal.clone();
caltemp.add(Calendar.HOUR_OF_DAY, 1);
Date anHourFromNow = caltemp.getTime();
- caltemp.add(Calendar.DATE, 1);
+ caltemp.add(Calendar.DAY_OF_MONTH, 1);
Date anHourFromNowTomorrow = caltemp.getTime();
FTPTimestampParserImpl parser = new FTPTimestampParserImpl();
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=1643407&r1=1643406&r2=1643407&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
Fri Dec 5 19:32:00 2014
@@ -77,14 +77,14 @@ public class MacOsPeterFTPEntryParserTes
Calendar cal = Calendar.getInstance();
cal.set(Calendar.MONTH, Calendar.MARCH);
- cal.set(Calendar.DATE, 1);
+ cal.set(Calendar.DAY_OF_MONTH, 1);
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
if (f.getTimestamp().getTime().before(cal.getTime())) {
cal.add(Calendar.YEAR, -1);
}
- cal.set(Calendar.DATE, 2);
+ cal.set(Calendar.DAY_OF_MONTH, 2);
cal.set(Calendar.HOUR_OF_DAY, 15);
cal.set(Calendar.MINUTE, 13);
@@ -109,14 +109,14 @@ public class MacOsPeterFTPEntryParserTes
Calendar cal = Calendar.getInstance();
cal.set(Calendar.MONTH, Calendar.JULY);
- cal.set(Calendar.DATE, 1);
+ cal.set(Calendar.DAY_OF_MONTH, 1);
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
if (f.getTimestamp().getTime().before(cal.getTime())) {
cal.add(Calendar.YEAR, -1);
}
- cal.set(Calendar.DATE, 2);
+ cal.set(Calendar.DAY_OF_MONTH, 2);
cal.set(Calendar.HOUR_OF_DAY, 14);
cal.set(Calendar.MINUTE, 51);
assertEquals(df.format(cal.getTime()),
df.format(f.getTimestamp().getTime()));
Modified:
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserAdditionalTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserAdditionalTest.java?rev=1643407&r1=1643406&r2=1643407&view=diff
==============================================================================
---
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserAdditionalTest.java
(original)
+++
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserAdditionalTest.java
Fri Dec 5 19:32:00 2014
@@ -98,7 +98,7 @@ public class OS400FTPEntryParserAddition
cal.set(Calendar.MONTH, Calendar.MARCH);
cal.set(Calendar.YEAR, 2004);
- cal.set(Calendar.DATE, 24);
+ cal.set(Calendar.DAY_OF_MONTH, 24);
cal.set(Calendar.HOUR_OF_DAY, 14);
cal.set(Calendar.MINUTE, 6);
cal.set(Calendar.SECOND, 34);
@@ -134,7 +134,7 @@ public class OS400FTPEntryParserAddition
Calendar cal = Calendar.getInstance();
- cal.set(Calendar.DATE, 24);
+ cal.set(Calendar.DAY_OF_MONTH, 24);
cal.set(Calendar.MONTH, Calendar.MARCH);
cal.set(Calendar.YEAR, 2004);
cal.set(Calendar.HOUR_OF_DAY, 14);
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=1643407&r1=1643406&r2=1643407&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
Fri Dec 5 19:32:00 2014
@@ -124,7 +124,7 @@ public class OS400FTPEntryParserTest ext
cal.set(Calendar.MONTH, Calendar.MARCH);
cal.set(Calendar.YEAR, 2004);
- cal.set(Calendar.DATE, 24);
+ cal.set(Calendar.DAY_OF_MONTH, 24);
cal.set(Calendar.HOUR_OF_DAY, 14);
cal.set(Calendar.MINUTE, 6);
cal.set(Calendar.SECOND, 34);
@@ -163,7 +163,7 @@ public class OS400FTPEntryParserTest ext
Calendar cal = Calendar.getInstance();
- cal.set(Calendar.DATE, 24);
+ cal.set(Calendar.DAY_OF_MONTH, 24);
cal.set(Calendar.MONTH, Calendar.MARCH);
cal.set(Calendar.YEAR, 2004);
cal.set(Calendar.HOUR_OF_DAY, 14);
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=1643407&r1=1643406&r2=1643407&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
Fri Dec 5 19:32:00 2014
@@ -113,7 +113,7 @@ public class UnixFTPEntryParserTest exte
cal.set(Calendar.YEAR, 2005);
cal.set(Calendar.MONTH, Calendar.APRIL);
- cal.set(Calendar.DATE, 8);
+ cal.set(Calendar.DAY_OF_MONTH, 8);
cal.set(Calendar.HOUR_OF_DAY, 11);
cal.set(Calendar.MINUTE, 22);
assertEquals(cal.getTime(), f.getTimestamp().getTime());
@@ -231,14 +231,14 @@ public class UnixFTPEntryParserTest exte
Calendar cal = Calendar.getInstance();
cal.set(Calendar.MONTH, Calendar.MARCH);
- cal.set(Calendar.DATE, 1);
+ cal.set(Calendar.DAY_OF_MONTH, 1);
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
if (f.getTimestamp().getTime().before(cal.getTime())) {
cal.add(Calendar.YEAR, -1);
}
- cal.set(Calendar.DATE, 2);
+ cal.set(Calendar.DAY_OF_MONTH, 2);
cal.set(Calendar.HOUR_OF_DAY, 15);
cal.set(Calendar.MINUTE, 13);
@@ -285,14 +285,14 @@ public class UnixFTPEntryParserTest exte
Calendar cal = Calendar.getInstance();
cal.set(Calendar.MONTH, Calendar.MARCH);
- cal.set(Calendar.DATE, 1);
+ cal.set(Calendar.DAY_OF_MONTH, 1);
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
if (f.getTimestamp().getTime().before(cal.getTime())) {
cal.add(Calendar.YEAR, -1);
}
- cal.set(Calendar.DATE, 2);
+ cal.set(Calendar.DAY_OF_MONTH, 2);
cal.set(Calendar.HOUR_OF_DAY, 15);
cal.set(Calendar.MINUTE, 13);
assertEquals(df.format(cal.getTime()),
df.format(f.getTimestamp().getTime()));
