|
@@ -43,7 +43,7 @@ |
43 |
43 |
|
setDate( pYear, pMonth, pDay ); |
44 |
44 |
|
} |
45 |
45 |
|
|
46 |
|
- |
public SimpleTimestamp( SimpleDate pDate, SimpleTime pTime ) |
|
46 |
+ |
public SimpleTimestamp( CalendarYMD pDate, SimpleTime pTime ) |
47 |
47 |
|
throws IllegalArgumentException |
48 |
48 |
|
{ |
49 |
49 |
|
this( pTime ); |
|
@@ -82,25 +82,25 @@ |
82 |
82 |
|
this( pYear, pMonth, pDay, new SimpleTime( pHour, pMin, pSec, pMilliSec ) ); |
83 |
83 |
|
} |
84 |
84 |
|
|
85 |
|
- |
public SimpleTimestamp( SimpleDate pDate, int pHour ) |
|
85 |
+ |
public SimpleTimestamp( CalendarYMD pDate, int pHour ) |
86 |
86 |
|
throws IllegalArgumentException |
87 |
87 |
|
{ |
88 |
88 |
|
this( pDate, new SimpleTime( pHour ) ); |
89 |
89 |
|
} |
90 |
90 |
|
|
91 |
|
- |
public SimpleTimestamp( SimpleDate pDate, int pHour, int pMin ) |
|
91 |
+ |
public SimpleTimestamp( CalendarYMD pDate, int pHour, int pMin ) |
92 |
92 |
|
throws IllegalArgumentException |
93 |
93 |
|
{ |
94 |
94 |
|
this( pDate, new SimpleTime( pHour, pMin ) ); |
95 |
95 |
|
} |
96 |
96 |
|
|
97 |
|
- |
public SimpleTimestamp( SimpleDate pDate, int pHour, int pMin, int pSec ) |
|
97 |
+ |
public SimpleTimestamp( CalendarYMD pDate, int pHour, int pMin, int pSec ) |
98 |
98 |
|
throws IllegalArgumentException |
99 |
99 |
|
{ |
100 |
100 |
|
this( pDate, new SimpleTime( pHour, pMin, pSec ) ); |
101 |
101 |
|
} |
102 |
102 |
|
|
103 |
|
- |
public SimpleTimestamp( SimpleDate pDate, int pHour, int pMin, int pSec, int pMilliSec ) |
|
103 |
+ |
public SimpleTimestamp( CalendarYMD pDate, int pHour, int pMin, int pSec, int pMilliSec ) |
104 |
104 |
|
throws IllegalArgumentException |
105 |
105 |
|
{ |
106 |
106 |
|
this( pDate, new SimpleTime( pHour, pMin, pSec, pMilliSec ) ); |
|
@@ -109,7 +109,7 @@ |
109 |
109 |
|
public SimpleTimestamp( TimeRes pResolution, Date pDate ) |
110 |
110 |
|
throws IllegalArgumentException |
111 |
111 |
|
{ |
112 |
|
- |
this( new SimpleDate( pDate ), SimpleTime.timeComponents( pResolution, pDate ) ); |
|
112 |
+ |
this( new CalendarYMD( pDate ), SimpleTime.timeComponents( pResolution, pDate ) ); |
113 |
113 |
|
} |
114 |
114 |
|
|
115 |
115 |
|
// public SimpleTimestamp( TimeRes pResolution, UtilDateAdaptor pDate ) |
|
@@ -127,7 +127,7 @@ |
127 |
127 |
|
public SimpleTimestamp( Date pDate ) |
128 |
128 |
|
throws IllegalArgumentException |
129 |
129 |
|
{ |
130 |
|
- |
this( new SimpleDate( pDate ), SimpleTime.timeComponents( pDate ) ); |
|
130 |
+ |
this( new CalendarYMD( pDate ), SimpleTime.timeComponents( pDate ) ); |
131 |
131 |
|
} |
132 |
132 |
|
|
133 |
133 |
|
public static SimpleTimestamp now() |
|
@@ -176,9 +176,9 @@ |
176 |
176 |
|
return mTime.getTimeRes(); |
177 |
177 |
|
} |
178 |
178 |
|
|
179 |
|
- |
public SimpleDate getDateComponents() |
|
179 |
+ |
public CalendarYMD getDateComponents() |
180 |
180 |
|
{ |
181 |
|
- |
return new SimpleDate( mYear, mMonth, mDay ); |
|
181 |
+ |
return new CalendarYMD( mYear, mMonth, mDay ); |
182 |
182 |
|
} |
183 |
183 |
|
|
184 |
184 |
|
public SimpleTime getTimeComponents() |
|
@@ -268,7 +268,7 @@ |
268 |
268 |
|
setDateToResolution( new UtilDateAdaptor( pDate ) ); |
269 |
269 |
|
} |
270 |
270 |
|
|
271 |
|
- |
public void setDate( SimpleDate pDate ) |
|
271 |
+ |
public void setDate( CalendarYMD pDate ) |
272 |
272 |
|
{ |
273 |
273 |
|
if ( pDate == null ) |
274 |
274 |
|
{ |
|
@@ -512,7 +512,7 @@ |
512 |
512 |
|
{ |
513 |
513 |
|
SimpleTime time = getTimeComponents(); |
514 |
514 |
|
int adjustByDays = time.add( pAdjustBy ); // Should be 0 / positive |
515 |
|
- |
SimpleDate date = getDateComponents(); |
|
515 |
+ |
CalendarYMD date = getDateComponents(); |
516 |
516 |
|
date.addDays( adjustByDays ); |
517 |
517 |
|
setTimestamp( new SimpleTimestamp( date, time ) ); |
518 |
518 |
|
return this; // TODO: XXX |
|
@@ -523,7 +523,7 @@ |
523 |
523 |
|
{ |
524 |
524 |
|
SimpleTime time = getTimeComponents(); |
525 |
525 |
|
int adjustByDays = time.subtract( pAdjustBy ); // Should be 0 / negative |
526 |
|
- |
SimpleDate date = getDateComponents(); |
|
526 |
+ |
CalendarYMD date = getDateComponents(); |
527 |
527 |
|
date.addDays( adjustByDays ); |
528 |
528 |
|
setTimestamp( new SimpleTimestamp( date, time ) ); |
529 |
529 |
|
return this; // TODO: XXX |