litesoft
Diff Revisions
859
vs
860
for /trunk/Java/core/Anywhere/src/org/litesoft/core/util/ExpirationLine.java
|
@@ -25,7 +25,7 @@ |
25 |
25 |
|
public ExpirationLine( int pQuantity, int pDeltaMonths ) |
26 |
26 |
|
{ |
27 |
27 |
|
mQuantity = pQuantity; |
28 |
|
- |
SimpleDate zDate = SimpleDate.today().addMonths( pDeltaMonths ); |
|
28 |
+ |
CalendarYMD zDate = CalendarYMD.today().addMonths( pDeltaMonths ); |
29 |
29 |
|
mMonth = zDate.getMonth(); |
30 |
30 |
|
mYear = zDate.getYear(); |
31 |
31 |
|
} |
|
@@ -65,17 +65,17 @@ |
65 |
65 |
|
|
66 |
66 |
|
public int getDaysRemaining() |
67 |
67 |
|
{ |
68 |
|
- |
return SimpleDate.today().daysTill( getExpirationDate() ); |
|
68 |
+ |
return CalendarYMD.today().daysTill( getExpirationDate() ); |
69 |
69 |
|
} |
70 |
70 |
|
|
71 |
|
- |
public SimpleDate getExpiration() |
|
71 |
+ |
public CalendarYMD getExpiration() |
72 |
72 |
|
{ |
73 |
|
- |
return new SimpleDate( mYear, mMonth ); |
|
73 |
+ |
return new CalendarYMD( mYear, mMonth ); |
74 |
74 |
|
} |
75 |
75 |
|
|
76 |
|
- |
public SimpleDate getExpirationDate() |
|
76 |
+ |
public CalendarYMD getExpirationDate() |
77 |
77 |
|
{ |
78 |
|
- |
return new SimpleDate( mYear, mMonth, Month.daysIn( mYear, mMonth ) ); |
|
78 |
+ |
return new CalendarYMD( mYear, mMonth, Month.daysIn( mYear, mMonth ) ); |
79 |
79 |
|
} |
80 |
80 |
|
|
81 |
81 |
|
public int getQuantity() |
|
@@ -121,7 +121,7 @@ |
121 |
121 |
|
return hashCodeEm( mQuantity, mMonth, mYear ); |
122 |
122 |
|
} |
123 |
123 |
|
|
124 |
|
- |
public static boolean expirationDateMatchesTightString( SimpleDate pExpDate, String pFourDigitExpDate ) |
|
124 |
+ |
public static boolean expirationDateMatchesTightString( CalendarYMD pExpDate, String pFourDigitExpDate ) |
125 |
125 |
|
{ |
126 |
126 |
|
if ( (pFourDigitExpDate != null) && (pFourDigitExpDate.length() == 4) ) |
127 |
127 |
|
{ |
|
@@ -139,7 +139,7 @@ |
139 |
139 |
|
return false; |
140 |
140 |
|
} |
141 |
141 |
|
|
142 |
|
- |
public static boolean expirationDateMatches( SimpleDate pExpDate, int pMonth, int pYear ) |
|
142 |
+ |
public static boolean expirationDateMatches( CalendarYMD pExpDate, int pMonth, int pYear ) |
143 |
143 |
|
{ |
144 |
144 |
|
return (pExpDate != null) && (pExpDate.getMonth() == pMonth) && (pExpDate.getYear() == pYear); |
145 |
145 |
|
} |