| |
@@ -6,18 +6,25 @@ |
| 6 |
6 |
|
{ |
| 7 |
7 |
|
private static final long serialVersionUID = 1L; |
| 8 |
8 |
|
|
| 9 |
|
- |
private final int mSec; |
| |
9 |
+ |
protected AbstractTimestampHMS( int pOriginalZuluOffsetMins, long pUTC ) |
| |
10 |
+ |
{ |
| |
11 |
+ |
super( pOriginalZuluOffsetMins, pUTC ); |
| |
12 |
+ |
} |
| |
13 |
+ |
|
| |
14 |
+ |
protected AbstractTimestampHMS( int pOriginalZuluOffsetMins, UtilDateAdaptor pDateAdaptor ) |
| |
15 |
+ |
{ |
| |
16 |
+ |
super( pOriginalZuluOffsetMins, pDateAdaptor ); |
| |
17 |
+ |
} |
| 10 |
18 |
|
|
| 11 |
|
- |
protected AbstractTimestampHMS( int pYear, int pMonth, int pDay, int pZuluOffsetMins, int pHour, int pMin, int pSec ) |
| |
19 |
+ |
protected AbstractTimestampHMS( UtilDateAdaptor pDateAdaptor ) |
| 12 |
20 |
|
{ |
| 13 |
|
- |
super( pYear, pMonth, pDay, pZuluOffsetMins, pHour, pMin ); |
| 14 |
|
- |
mSec = validateSec( pSec ); |
| |
21 |
+ |
super( pDateAdaptor ); |
| 15 |
22 |
|
} |
| 16 |
23 |
|
|
| 17 |
24 |
|
@Override |
| 18 |
25 |
|
public final int getSec() |
| 19 |
26 |
|
{ |
| 20 |
|
- |
return mSec; |
| |
27 |
+ |
return getWall().getSec(); |
| 21 |
28 |
|
} |
| 22 |
29 |
|
|
| 23 |
30 |
|
/** |
| |
@@ -26,7 +33,7 @@ |
| 26 |
33 |
|
public final T sec( int pSec ) |
| 27 |
34 |
|
{ |
| 28 |
35 |
|
validateSec( pSec ); |
| 29 |
|
- |
return (mSec == pSec) ? us() : LLsetSec( pSec ); |
| |
36 |
+ |
return (getSec() == pSec) ? us() : LLsetSec( pSec ); |
| 30 |
37 |
|
} |
| 31 |
38 |
|
|
| 32 |
39 |
|
/** |
| |
@@ -34,7 +41,7 @@ |
| 34 |
41 |
|
*/ |
| 35 |
42 |
|
public final T addSecs( int pSecs ) |
| 36 |
43 |
|
{ |
| 37 |
|
- |
return (pSecs == 0) ? us() : LLsetSec( mSec + pSecs ); |
| |
44 |
+ |
return (pSecs == 0) ? us() : LLsetSec( getSec() + pSecs ); |
| 38 |
45 |
|
} |
| 39 |
46 |
|
|
| 40 |
47 |
|
/** |
| |
@@ -42,7 +49,7 @@ |
| 42 |
49 |
|
*/ |
| 43 |
50 |
|
public final T minusSecs( int pSecs ) |
| 44 |
51 |
|
{ |
| 45 |
|
- |
return (pSecs == 0) ? us() : LLsetSec( mSec - pSecs ); |
| |
52 |
+ |
return (pSecs == 0) ? us() : LLsetSec( getSec() - pSecs ); |
| 46 |
53 |
|
} |
| 47 |
54 |
|
|
| 48 |
55 |
|
// vvvvvvvvvvvvvvvvvv Support methods vvvvvvvvvvvvvvvvv |
| |
@@ -83,7 +90,7 @@ |
| 83 |
90 |
|
|
| 84 |
91 |
|
protected int LL_hashCode() |
| 85 |
92 |
|
{ |
| 86 |
|
- |
return hashCodeEm( super.hashCode(), mSec ); |
| |
93 |
+ |
return hashCodeEm( super.hashCode(), getSec() ); |
| 87 |
94 |
|
} |
| 88 |
95 |
|
|
| 89 |
96 |
|
/** |
| |
@@ -116,13 +123,13 @@ |
| 116 |
123 |
|
|
| 117 |
124 |
|
protected abstract M createMutable( int pYear, int pMonth, int pDay, int pHour, int pMin, int pNewSec ); |
| 118 |
125 |
|
|
| 119 |
|
- |
protected static class Mutable extends AbstractTimestampHM.Mutable implements TimestampAccessorHMS |
| |
126 |
+ |
protected static class Mutable extends AbstractTimestampHM.Mutable |
| 120 |
127 |
|
{ |
| 121 |
128 |
|
protected int mSec; |
| 122 |
129 |
|
|
| 123 |
|
- |
public Mutable( int pYear, int pMonth, int pDay, boolean pDayConstrained, int pZuluOffsetMins, int pHour, int pMin, int pSec ) |
| |
130 |
+ |
public Mutable( int pYear, int pMonth, int pDay, boolean pDayConstrained, int pHour, int pMin, int pSec ) |
| 124 |
131 |
|
{ |
| 125 |
|
- |
super( pYear, pMonth, pDay, pDayConstrained, pZuluOffsetMins, pHour, pMin ); |
| |
132 |
+ |
super( pYear, pMonth, pDay, pDayConstrained, pHour, pMin ); |
| 126 |
133 |
|
mSec = pSec; |
| 127 |
134 |
|
} |
| 128 |
135 |
|
|
View this file contents
View the full history
Commits for