| |
@@ -9,15 +9,15 @@ |
| 9 |
9 |
|
public class CreditsData implements Comparable |
| 10 |
10 |
|
{ |
| 11 |
11 |
|
private String mWho; |
| 12 |
|
- |
private SimpleDate mStartDate, mEndDate = null; |
| |
12 |
+ |
private CalendarYMD mStartDate, mEndDate = null; |
| 13 |
13 |
|
|
| 14 |
14 |
|
public CreditsData( String pStartDateYYYY_MM_DD, String pWho, String pEndDateYYYY_MM_DD ) |
| 15 |
15 |
|
{ |
| 16 |
|
- |
mStartDate = SimpleDate.fromYMD( pStartDateYYYY_MM_DD ); |
| |
16 |
+ |
mStartDate = CalendarYMD.fromYMD( pStartDateYYYY_MM_DD ); |
| 17 |
17 |
|
mWho = Strings.assertNotNullNotEmpty( "Who", pWho ); |
| 18 |
18 |
|
if ( pEndDateYYYY_MM_DD != null ) |
| 19 |
19 |
|
{ |
| 20 |
|
- |
mEndDate = SimpleDate.fromYMD( pEndDateYYYY_MM_DD ); |
| |
20 |
+ |
mEndDate = CalendarYMD.fromYMD( pEndDateYYYY_MM_DD ); |
| 21 |
21 |
|
} |
| 22 |
22 |
|
} |
| 23 |
23 |
|
|
| |
@@ -31,20 +31,20 @@ |
| 31 |
31 |
|
return mWho; |
| 32 |
32 |
|
} |
| 33 |
33 |
|
|
| 34 |
|
- |
public SimpleDate getStartDate() |
| |
34 |
+ |
public CalendarYMD getStartDate() |
| 35 |
35 |
|
{ |
| 36 |
36 |
|
return mStartDate; |
| 37 |
37 |
|
} |
| 38 |
38 |
|
|
| 39 |
|
- |
public SimpleDate getEndDate() |
| |
39 |
+ |
public CalendarYMD getEndDate() |
| 40 |
40 |
|
{ |
| 41 |
|
- |
return (mEndDate != null) ? mEndDate : new SimpleDate( new Date() ); |
| |
41 |
+ |
return (mEndDate != null) ? mEndDate : new CalendarYMD( new Date() ); |
| 42 |
42 |
|
} |
| 43 |
43 |
|
|
| 44 |
44 |
|
public boolean wasActiveDuring( int pYear, int pMonth, int pFromDay, int pThruDay ) |
| 45 |
45 |
|
{ |
| 46 |
|
- |
SimpleDate fromDate = new SimpleDate( pYear, pMonth, pFromDay ); |
| 47 |
|
- |
SimpleDate thruDate = new SimpleDate( pYear, pMonth, pThruDay ); |
| |
46 |
+ |
CalendarYMD fromDate = new CalendarYMD( pYear, pMonth, pFromDay ); |
| |
47 |
+ |
CalendarYMD thruDate = new CalendarYMD( pYear, pMonth, pThruDay ); |
| 48 |
48 |
|
return !mStartDate.after( thruDate ) && !fromDate.after( getEndDate() ); |
| 49 |
49 |
|
} |
| 50 |
50 |
|
|
| |
@@ -97,10 +97,10 @@ |
| 97 |
97 |
|
mM = pM; |
| 98 |
98 |
|
} |
| 99 |
99 |
|
|
| 100 |
|
- |
public MonthYear( SimpleDate pSimpleDate ) |
| |
100 |
+ |
public MonthYear( CalendarYMD pCalendarYMD ) |
| 101 |
101 |
|
{ |
| 102 |
|
- |
mY = pSimpleDate.getYear(); |
| 103 |
|
- |
mM = pSimpleDate.getMonth(); |
| |
102 |
+ |
mY = pCalendarYMD.getYear(); |
| |
103 |
+ |
mM = pCalendarYMD.getMonth(); |
| 104 |
104 |
|
} |
| 105 |
105 |
|
|
| 106 |
106 |
|
public int getYear() |
| |
@@ -138,7 +138,7 @@ |
| 138 |
138 |
|
return s; |
| 139 |
139 |
|
} |
| 140 |
140 |
|
|
| 141 |
|
- |
public boolean isLessThan( SimpleDate them ) |
| |
141 |
+ |
public boolean isLessThan( CalendarYMD them ) |
| 142 |
142 |
|
{ |
| 143 |
143 |
|
if ( this.mY == them.getYear() ) |
| 144 |
144 |
|
{ |
| |
@@ -147,7 +147,7 @@ |
| 147 |
147 |
|
return (this.mY < them.getYear()); |
| 148 |
148 |
|
} |
| 149 |
149 |
|
|
| 150 |
|
- |
public boolean isLessThanOrEqual( SimpleDate them ) |
| |
150 |
+ |
public boolean isLessThanOrEqual( CalendarYMD them ) |
| 151 |
151 |
|
{ |
| 152 |
152 |
|
if ( this.mY == them.getYear() ) |
| 153 |
153 |
|
{ |
View this file contents
View the full history
Commits for