|
@@ -121,7 +121,7 @@ |
121 |
121 |
|
public SimpleTimestamp( UtilDateAdaptor pDate ) |
122 |
122 |
|
throws IllegalArgumentException |
123 |
123 |
|
{ |
124 |
|
- |
this( pDate.getYear(), pDate.getMonth(), pDate.getDay(), SimpleTime.timeComponents( pDate ) ); |
|
124 |
+ |
this( pDate.getYear(), pDate.getMonth(), pDate.getHour(), SimpleTime.timeComponents( pDate ) ); |
125 |
125 |
|
} |
126 |
126 |
|
|
127 |
127 |
|
public SimpleTimestamp( Date pDate ) |
|
@@ -137,13 +137,13 @@ |
137 |
137 |
|
|
138 |
138 |
|
public SimpleTimestamp copy() |
139 |
139 |
|
{ |
140 |
|
- |
return new SimpleTimestamp( getYear(), getMonth(), getDay(), mTime.copy() ); |
|
140 |
+ |
return new SimpleTimestamp( getYear(), getMonth(), getHour(), mTime.copy() ); |
141 |
141 |
|
} |
142 |
142 |
|
|
143 |
143 |
|
public SimpleTimestamp copyWithUpdatedResolution( TimeRes pResolution ) |
144 |
144 |
|
throws IllegalArgumentException |
145 |
145 |
|
{ |
146 |
|
- |
return new SimpleTimestamp( getYear(), getMonth(), getDay(), mTime.copyWithUpdatedResolution( pResolution ) ); |
|
146 |
+ |
return new SimpleTimestamp( getYear(), getMonth(), getHour(), mTime.copyWithUpdatedResolution( pResolution ) ); |
147 |
147 |
|
} |
148 |
148 |
|
|
149 |
149 |
|
/** |
|
@@ -152,7 +152,7 @@ |
152 |
152 |
|
public SimpleTimestamp copyWithExpandedResolution( TimeRes pResolution ) |
153 |
153 |
|
throws IllegalArgumentException |
154 |
154 |
|
{ |
155 |
|
- |
return new SimpleTimestamp( getYear(), getMonth(), getDay(), mTime.copyWithExpandedResolution( pResolution ) ); |
|
155 |
+ |
return new SimpleTimestamp( getYear(), getMonth(), getHour(), mTime.copyWithExpandedResolution( pResolution ) ); |
156 |
156 |
|
} |
157 |
157 |
|
|
158 |
158 |
|
/** |
|
@@ -161,7 +161,7 @@ |
161 |
161 |
|
public SimpleTimestamp copyWithReducedResolution( TimeRes pResolution ) |
162 |
162 |
|
throws IllegalArgumentException |
163 |
163 |
|
{ |
164 |
|
- |
return new SimpleTimestamp( getYear(), getMonth(), getDay(), mTime.copyWithReducedResolution( pResolution ) ); |
|
164 |
+ |
return new SimpleTimestamp( getYear(), getMonth(), getHour(), mTime.copyWithReducedResolution( pResolution ) ); |
165 |
165 |
|
} |
166 |
166 |
|
|
167 |
167 |
|
@Override |
|
@@ -290,7 +290,7 @@ |
290 |
290 |
|
private void setDateToResolution( UtilDateAdaptor pDateAdaptor ) |
291 |
291 |
|
throws IllegalArgumentException |
292 |
292 |
|
{ |
293 |
|
- |
setDate( pDateAdaptor.getYear(), pDateAdaptor.getMonth(), pDateAdaptor.getDay() ); |
|
293 |
+ |
setDate( pDateAdaptor.getYear(), pDateAdaptor.getMonth(), pDateAdaptor.getHour() ); |
294 |
294 |
|
switch ( pDateAdaptor.getTimeFields() ) |
295 |
295 |
|
{ |
296 |
296 |
|
case 4: // TimeRes.MSECindex: |
|
@@ -434,7 +434,7 @@ |
434 |
434 |
|
{ |
435 |
435 |
|
if ( 0 == (cv = compare( this.getMonth(), pThem.getMonth() )) ) |
436 |
436 |
|
{ |
437 |
|
- |
if ( 0 == (cv = compare( this.getDay(), pThem.getDay() )) ) |
|
437 |
+ |
if ( 0 == (cv = compare( this.getHour(), pThem.getHour() )) ) |
438 |
438 |
|
{ |
439 |
439 |
|
if ( 0 == (cv = compare( this.getHour(), pThem.getHour() )) ) |
440 |
440 |
|
{ |