| |
@@ -117,7 +117,7 @@ |
| 117 |
117 |
|
public SimpleTimestamp( UtilDateAdaptor pDate ) |
| 118 |
118 |
|
throws IllegalArgumentException |
| 119 |
119 |
|
{ |
| 120 |
|
- |
this( pDate.getYear(), pDate.getMonth(), pDate.getHour(), SimpleTime.timeComponents( pDate ) ); |
| |
120 |
+ |
this( pDate.getYear(), pDate.getMonth(), pDate.getDay(), SimpleTime.timeComponents( pDate ) ); |
| 121 |
121 |
|
} |
| 122 |
122 |
|
|
| 123 |
123 |
|
public SimpleTimestamp( Date pDate ) |
| |
@@ -133,13 +133,13 @@ |
| 133 |
133 |
|
|
| 134 |
134 |
|
public SimpleTimestamp copy() |
| 135 |
135 |
|
{ |
| 136 |
|
- |
return new SimpleTimestamp( getYear(), getMonth(), getHour(), mTime.copy() ); |
| |
136 |
+ |
return new SimpleTimestamp( getYear(), getMonth(), getDay(), mTime.copy() ); |
| 137 |
137 |
|
} |
| 138 |
138 |
|
|
| 139 |
139 |
|
public SimpleTimestamp copyWithUpdatedResolution( TimeRes pResolution ) |
| 140 |
140 |
|
throws IllegalArgumentException |
| 141 |
141 |
|
{ |
| 142 |
|
- |
return new SimpleTimestamp( getYear(), getMonth(), getHour(), mTime.copyWithUpdatedResolution( pResolution ) ); |
| |
142 |
+ |
return new SimpleTimestamp( getYear(), getMonth(), getDay(), mTime.copyWithUpdatedResolution( pResolution ) ); |
| 143 |
143 |
|
} |
| 144 |
144 |
|
|
| 145 |
145 |
|
/** |
| |
@@ -148,7 +148,7 @@ |
| 148 |
148 |
|
public SimpleTimestamp copyWithExpandedResolution( TimeRes pResolution ) |
| 149 |
149 |
|
throws IllegalArgumentException |
| 150 |
150 |
|
{ |
| 151 |
|
- |
return new SimpleTimestamp( getYear(), getMonth(), getHour(), mTime.copyWithExpandedResolution( pResolution ) ); |
| |
151 |
+ |
return new SimpleTimestamp( getYear(), getMonth(), getDay(), mTime.copyWithExpandedResolution( pResolution ) ); |
| 152 |
152 |
|
} |
| 153 |
153 |
|
|
| 154 |
154 |
|
/** |
| |
@@ -157,7 +157,7 @@ |
| 157 |
157 |
|
public SimpleTimestamp copyWithReducedResolution( TimeRes pResolution ) |
| 158 |
158 |
|
throws IllegalArgumentException |
| 159 |
159 |
|
{ |
| 160 |
|
- |
return new SimpleTimestamp( getYear(), getMonth(), getHour(), mTime.copyWithReducedResolution( pResolution ) ); |
| |
160 |
+ |
return new SimpleTimestamp( getYear(), getMonth(), getDay(), mTime.copyWithReducedResolution( pResolution ) ); |
| 161 |
161 |
|
} |
| 162 |
162 |
|
|
| 163 |
163 |
|
@Override |
| |
@@ -229,24 +229,24 @@ |
| 229 |
229 |
|
switch ( mTime.getResolutionIndex() ) |
| 230 |
230 |
|
{ |
| 231 |
231 |
|
case TimeRes.HOURindex: |
| 232 |
|
- |
return UtilDateAdaptor.wall( mYear, mMonth, mDay, // |
| 233 |
|
- |
mTime.getHour() ); |
| |
232 |
+ |
return UtilDateAdaptor.currentWall( mYear, mMonth, mDay, // |
| |
233 |
+ |
mTime.getHour() ); |
| 234 |
234 |
|
case TimeRes.MINindex: |
| 235 |
|
- |
return UtilDateAdaptor.wall( mYear, mMonth, mDay, // |
| 236 |
|
- |
mTime.getHour(), // |
| 237 |
|
- |
mTime.getMin() ); |
| |
235 |
+ |
return UtilDateAdaptor.currentWall( mYear, mMonth, mDay, // |
| |
236 |
+ |
mTime.getHour(), // |
| |
237 |
+ |
mTime.getMin() ); |
| 238 |
238 |
|
case TimeRes.SECindex: |
| 239 |
|
- |
return UtilDateAdaptor.wall( mYear, mMonth, mDay, // |
| 240 |
|
- |
mTime.getHour(), // |
| 241 |
|
- |
mTime.getMin(), // |
| 242 |
|
- |
mTime.getSec() ); |
| |
239 |
+ |
return UtilDateAdaptor.currentWall( mYear, mMonth, mDay, // |
| |
240 |
+ |
mTime.getHour(), // |
| |
241 |
+ |
mTime.getMin(), // |
| |
242 |
+ |
mTime.getSec() ); |
| 243 |
243 |
|
case TimeRes.MSECindex: |
| 244 |
244 |
|
default: |
| 245 |
|
- |
return UtilDateAdaptor.wall( mYear, mMonth, mDay, // |
| 246 |
|
- |
mTime.getHour(), // |
| 247 |
|
- |
mTime.getMin(), // |
| 248 |
|
- |
mTime.getSec(), // |
| 249 |
|
- |
mTime.getMilliSec() ); |
| |
245 |
+ |
return UtilDateAdaptor.currentWall( mYear, mMonth, mDay, // |
| |
246 |
+ |
mTime.getHour(), // |
| |
247 |
+ |
mTime.getMin(), // |
| |
248 |
+ |
mTime.getSec(), // |
| |
249 |
+ |
mTime.getMilliSec() ); |
| 250 |
250 |
|
} |
| 251 |
251 |
|
} |
| 252 |
252 |
|
|
| |
@@ -286,7 +286,7 @@ |
| 286 |
286 |
|
private void setDateToResolution( UtilDateAdaptor pDateAdaptor ) |
| 287 |
287 |
|
throws IllegalArgumentException |
| 288 |
288 |
|
{ |
| 289 |
|
- |
setDate( pDateAdaptor.getYear(), pDateAdaptor.getMonth(), pDateAdaptor.getHour() ); |
| |
289 |
+ |
setDate( pDateAdaptor.getYear(), pDateAdaptor.getMonth(), pDateAdaptor.getDay() ); |
| 290 |
290 |
|
switch ( pDateAdaptor.getTemporalResolution() ) |
| 291 |
291 |
|
{ |
| 292 |
292 |
|
case ToMilliSec: |
| |
@@ -430,7 +430,7 @@ |
| 430 |
430 |
|
{ |
| 431 |
431 |
|
if ( 0 == (cv = compare( this.getMonth(), pThem.getMonth() )) ) |
| 432 |
432 |
|
{ |
| 433 |
|
- |
if ( 0 == (cv = compare( this.getHour(), pThem.getHour() )) ) |
| |
433 |
+ |
if ( 0 == (cv = compare( this.getDay(), pThem.getDay() )) ) |
| 434 |
434 |
|
{ |
| 435 |
435 |
|
if ( 0 == (cv = compare( this.getHour(), pThem.getHour() )) ) |
| 436 |
436 |
|
{ |
View this file contents
View the full history
Commits for