|
@@ -16,22 +16,28 @@ |
16 |
16 |
|
@SuppressWarnings({"deprecation", "UnusedDeclaration"}) @Deprecated /** for Serialization */ |
17 |
17 |
|
protected TimestampH() |
18 |
18 |
|
{ |
19 |
|
- |
this( 0, 0, 0, 0, 0 ); |
|
19 |
+ |
super( 0, 0 ); |
20 |
20 |
|
} |
21 |
21 |
|
|
22 |
|
- |
private TimestampH( int pYear, int pMonth, int pDay, int pZuluOffsetMins, int pHour ) |
|
22 |
+ |
private TimestampH( int pOriginalZuluOffsetMins, long pUTC ) |
23 |
23 |
|
{ |
24 |
|
- |
super( pYear, |
25 |
|
- |
validateMonth( pYear, pMonth ), |
26 |
|
- |
validateDay( pYear, pMonth, pDay ), |
27 |
|
- |
pZuluOffsetMins, pHour ); |
|
24 |
+ |
super( pOriginalZuluOffsetMins, pUTC ); |
28 |
25 |
|
} |
29 |
26 |
|
|
30 |
|
- |
public TimestampH( TimestampAccessorH pAccessor ) |
|
27 |
+ |
private TimestampH( int pOriginalZuluOffsetMins, UtilDateAdaptor pDateAdaptor ) |
31 |
28 |
|
{ |
32 |
|
- |
this( pAccessor.getYear(), pAccessor.getMonth(), pAccessor.getDay(), // |
33 |
|
- |
pAccessor.getZuluOffsetMins(), // |
34 |
|
- |
pAccessor.getHour() ); |
|
29 |
+ |
super( pOriginalZuluOffsetMins, pDateAdaptor ); |
|
30 |
+ |
} |
|
31 |
+ |
|
|
32 |
+ |
public TimestampH( UtilDateAdaptor pDateAdaptor ) |
|
33 |
+ |
{ |
|
34 |
+ |
super( pDateAdaptor.force( TemporalResolution.ToHour ) ); |
|
35 |
+ |
} |
|
36 |
+ |
|
|
37 |
+ |
@Override |
|
38 |
+ |
protected UtilDateAdaptor createWall() |
|
39 |
+ |
{ |
|
40 |
+ |
return new UtilDateAdaptor( getUTClong(), TemporalResolution.ToHour ); |
35 |
41 |
|
} |
36 |
42 |
|
|
37 |
43 |
|
public static TimestampH fromWallTime( int pYear, int pMonth, int pDay, int pHour ) |
|
@@ -39,26 +45,23 @@ |
39 |
45 |
|
return new TimestampH( UtilDateAdaptor.wall( pYear, |
40 |
46 |
|
validateMonth( pYear, pMonth ), |
41 |
47 |
|
validateDay( pYear, pMonth, pDay ), |
42 |
|
- |
pHour ) ); |
|
48 |
+ |
validateHour( pHour ) ) ); |
43 |
49 |
|
} |
44 |
50 |
|
|
45 |
51 |
|
public static TimestampH fromISO8601( int pYear, int pMonth, int pDay, int pHour, boolean pZulu, Integer pUTC_offsetMinutes ) |
46 |
52 |
|
{ |
|
53 |
+ |
validateMonth( pYear, pMonth ); |
|
54 |
+ |
validateDay( pYear, pMonth, pDay ); |
|
55 |
+ |
validateHour( pHour ); |
47 |
56 |
|
int zZuluOffsetMins = Integers.deNull( pUTC_offsetMinutes ); |
48 |
|
- |
Mutable zMutable = new Mutable( pYear, |
49 |
|
- |
validateMonth( pYear, pMonth ), |
50 |
|
- |
validateDay( pYear, pMonth, pDay ), |
51 |
|
- |
false, zZuluOffsetMins, // |
52 |
|
- |
pHour ); |
53 |
|
- |
if ( pZulu || (zZuluOffsetMins == 0) ) |
|
57 |
+ |
if ( pZulu ) |
54 |
58 |
|
{ |
55 |
|
- |
zMutable.fromZuluToWall(); |
|
59 |
+ |
return new TimestampH( zZuluOffsetMins, UtilDateAdaptor.zulu( pYear, pMonth, pDay, pHour ) ); |
56 |
60 |
|
} |
57 |
|
- |
else // !Zulu && zZuluOffsetMins != 0 |
58 |
|
- |
{ |
59 |
|
- |
zMutable.fromOriginalWallToWall(); |
60 |
|
- |
} |
61 |
|
- |
return new TimestampH( zMutable ); |
|
61 |
+ |
Mutable zMutable = new Mutable( pYear, pMonth, pDay, false, pHour ); // Original Wall Time |
|
62 |
+ |
zMutable.adjustOrigWallToZulu( zZuluOffsetMins ); |
|
63 |
+ |
return new TimestampH( zZuluOffsetMins, |
|
64 |
+ |
UtilDateAdaptor.zulu( zMutable.getYear(), zMutable.getMonth(), zMutable.getDay(), zMutable.getHour() ) ); |
62 |
65 |
|
} |
63 |
66 |
|
|
64 |
67 |
|
@Override |
|
@@ -101,9 +104,10 @@ |
101 |
104 |
|
|
102 |
105 |
|
public final String toSQLvalue() |
103 |
106 |
|
{ |
104 |
|
- |
Mutable zMutable = new Mutable( getYear(), getMonth(), getDay(), false, getZuluOffsetMins(), getHour() ); |
105 |
|
- |
zMutable.fromWallToZulu(); |
106 |
|
- |
return formatSQLvalueYMDH( zMutable, true, new StringBuilder() ).toString(); |
|
107 |
+ |
return "TODO"; // TODO: xxx |
|
108 |
+ |
// Mutable zMutable = new Mutable( getYear(), getMonth(), getDay(), false, getZuluOffsetMins(), getHour() ); |
|
109 |
+ |
// zMutable.fromWallToZulu(); |
|
110 |
+ |
// return formatSQLvalueYMDH( zMutable, true, new StringBuilder() ).toString(); |
107 |
111 |
|
} |
108 |
112 |
|
|
109 |
113 |
|
public static TimestampH fromSQLvalue( String pToSQLvalue ) |
|
@@ -120,7 +124,7 @@ |
120 |
124 |
|
@Override |
121 |
125 |
|
public UtilDateAdaptor toUtilDateAdaptor() |
122 |
126 |
|
{ |
123 |
|
- |
return UtilDateAdaptor.offsetWallToHour( getZuluOffsetMins(), getYear(), getMonth(), getDay(), getHour() ); |
|
127 |
+ |
return getWall(); |
124 |
128 |
|
} |
125 |
129 |
|
|
126 |
130 |
|
// vvvvvvvvvvvvvvvvvv Non-common Public methods vvvvvvvvvvvvvvvvv |
|
@@ -135,30 +139,24 @@ |
135 |
139 |
|
@Override |
136 |
140 |
|
protected TimestampH createTypeFrom( Mutable pMutable ) |
137 |
141 |
|
{ |
138 |
|
- |
return new TimestampH( pMutable.getYear(), pMutable.getMonth(), pMutable.getDay(), pMutable.getZuluOffsetMins(), pMutable.getHour() ); |
139 |
|
- |
} |
140 |
|
- |
|
141 |
|
- |
@Override |
142 |
|
- |
protected Mutable createMutable( int pNewYear ) |
143 |
|
- |
{ |
144 |
|
- |
return new Mutable( pNewYear, getMonth(), getDay(), true, getZuluOffsetMins(), getHour() ); |
|
142 |
+ |
return null; // TODO: new TimestampH( pMutable.getYear(), pMutable.getMonth(), pMutable.getDay(), pMutable.getZuluOffsetMins(), pMutable.getHour() ); |
145 |
143 |
|
} |
146 |
144 |
|
|
147 |
145 |
|
@Override |
148 |
146 |
|
protected Mutable createMutable( int pYear, int pNewMonth ) |
149 |
147 |
|
{ |
150 |
|
- |
return new Mutable( pYear, pNewMonth, getDay(), true, getZuluOffsetMins(), getHour() ); |
|
148 |
+ |
return null; // TODO: new Mutable( pYear, pNewMonth, getDay(), true, getZuluOffsetMins(), getHour() ); |
151 |
149 |
|
} |
152 |
150 |
|
|
153 |
151 |
|
@Override |
154 |
152 |
|
protected Mutable createMutable( int pYear, int pMonth, int pNewDay ) |
155 |
153 |
|
{ |
156 |
|
- |
return new Mutable( pYear, pMonth, pNewDay, false, getZuluOffsetMins(), getHour() ); |
|
154 |
+ |
return null; // TODO: new Mutable( pYear, pMonth, pNewDay, false, getZuluOffsetMins(), getHour() ); |
157 |
155 |
|
} |
158 |
156 |
|
|
159 |
157 |
|
@Override |
160 |
158 |
|
protected Mutable createMutable( int pYear, int pMonth, int pDay, int pNewHour ) |
161 |
159 |
|
{ |
162 |
|
- |
return new Mutable( pYear, pMonth, pDay, false, getZuluOffsetMins(), pNewHour ); |
|
160 |
+ |
return null; // TODO: new Mutable( pYear, pMonth, pDay, false, getZuluOffsetMins(), pNewHour ); |
163 |
161 |
|
} |
164 |
162 |
|
} |