| |
@@ -15,12 +15,12 @@ |
| 15 |
15 |
|
@SuppressWarnings({"deprecation", "UnusedDeclaration"}) @Deprecated /** for Serialization */ |
| 16 |
16 |
|
protected TimestampHM() |
| 17 |
17 |
|
{ |
| 18 |
|
- |
this( 0, 0, 0, 0, 0, 0 ); |
| |
18 |
+ |
this( 0, 1, 1, 0, 0, 0 ); |
| 19 |
19 |
|
} |
| 20 |
20 |
|
|
| 21 |
|
- |
private TimestampHM( int pYear, int pMonth, int pDay, int pZuluOffsetMins, int pHour, int pMin ) |
| |
21 |
+ |
public TimestampHM( int pYear, int pMonth, int pDay, int pZuluOffsetMins, int pHour, int pMin ) |
| 22 |
22 |
|
{ |
| 23 |
|
- |
super( null ); // TODO: pYear, pMonth, pDay, pZuluOffsetMins, pHour, pMin ); |
| |
23 |
+ |
super( pYear, pMonth, pDay, pZuluOffsetMins, pHour, pMin ); |
| 24 |
24 |
|
} |
| 25 |
25 |
|
|
| 26 |
26 |
|
public TimestampHM( TimestampAccessorHM pAccessor ) |
| |
@@ -30,15 +30,9 @@ |
| 30 |
30 |
|
pAccessor.getHour(), pAccessor.getMin() ); |
| 31 |
31 |
|
} |
| 32 |
32 |
|
|
| 33 |
|
- |
@Override |
| 34 |
|
- |
protected UtilDateAdaptor createWall() |
| 35 |
|
- |
{ |
| 36 |
|
- |
return null; // TODO: XXX |
| 37 |
|
- |
} |
| 38 |
|
- |
|
| 39 |
33 |
|
public static TimestampHM fromWallTime( int pYear, int pMonth, int pDay, int pHour, int pMin ) |
| 40 |
34 |
|
{ |
| 41 |
|
- |
return new TimestampHM( UtilDateAdaptor.wall( pYear, pMonth, pDay, pHour, pMin ) ); |
| |
35 |
+ |
return new TimestampHM( UtilDateAdaptor.currentWall( pYear, pMonth, pDay, pHour, pMin ) ); |
| 42 |
36 |
|
} |
| 43 |
37 |
|
|
| 44 |
38 |
|
public static TimestampHM fromISO8601( int pYear, int pMonth, int pDay, int pHour, String pFraction, boolean pZulu, Integer pUTC_offsetMinutes ) |
| |
@@ -50,17 +44,17 @@ |
| 50 |
44 |
|
{ |
| 51 |
45 |
|
int zZuluOffsetMins = Integers.deNull( pUTC_offsetMinutes ); |
| 52 |
46 |
|
Mutable zMutable = new Mutable( pYear, pMonth, pDay, // |
| 53 |
|
- |
false, // |
| |
47 |
+ |
false, zZuluOffsetMins, // |
| 54 |
48 |
|
pHour, pMin ); |
| 55 |
49 |
|
if ( pZulu || (zZuluOffsetMins == 0) ) |
| 56 |
50 |
|
{ |
| 57 |
|
- |
// TODO: zMutable.fromZuluToWall(); |
| |
51 |
+ |
zMutable.fromZuluToWall(); |
| 58 |
52 |
|
} |
| 59 |
53 |
|
else // !Zulu && zZuluOffsetMins != 0 |
| 60 |
54 |
|
{ |
| 61 |
|
- |
// TODO: zMutable.fromOriginalWallToWall(); |
| |
55 |
+ |
zMutable.fromOriginalWallToWall(); |
| 62 |
56 |
|
} |
| 63 |
|
- |
return null; // TODO: new TimestampHM( zMutable ); |
| |
57 |
+ |
return new TimestampHM( zMutable ); |
| 64 |
58 |
|
} |
| 65 |
59 |
|
|
| 66 |
60 |
|
@Override |
| |
@@ -104,9 +98,9 @@ |
| 104 |
98 |
|
|
| 105 |
99 |
|
public final String toSQLvalue() |
| 106 |
100 |
|
{ |
| 107 |
|
- |
Mutable zMutable = new Mutable( getYear(), getMonth(), getDay(), false, getHour(), getMin() ); |
| 108 |
|
- |
// TODO: zMutable.fromWallToZulu(); |
| 109 |
|
- |
return null; // TODO: formatSQLvalueYMDH( zMutable, true, new StringBuilder() ).toString(); |
| |
101 |
+ |
Mutable zMutable = new Mutable( getYear(), getMonth(), getDay(), false, getZuluOffsetMins(), getHour(), getMin() ); |
| |
102 |
+ |
zMutable.fromWallToZulu(); |
| |
103 |
+ |
return formatSQLvalueYMDH( zMutable, true, new StringBuilder() ).toString(); |
| 110 |
104 |
|
} |
| 111 |
105 |
|
|
| 112 |
106 |
|
public static TimestampHM fromSQLvalue( String pToSQLvalue ) |
| |
@@ -124,7 +118,7 @@ |
| 124 |
118 |
|
@Override |
| 125 |
119 |
|
public UtilDateAdaptor toUtilDateAdaptor() |
| 126 |
120 |
|
{ |
| 127 |
|
- |
return null; // TODO: UtilDateAdaptor.offsetWallToMin( getZuluOffsetMins(), getYear(), getMonth(), getDay(), getHour(), getMin() ); |
| |
121 |
+ |
return UtilDateAdaptor.offsetWallToMin( getZuluOffsetMins(), getYear(), getMonth(), getDay(), getHour(), getMin() ); |
| 128 |
122 |
|
} |
| 129 |
123 |
|
|
| 130 |
124 |
|
// vvvvvvvvvvvvvvvvvv Non-common Public methods vvvvvvvvvvvvvvvvv |
| |
@@ -139,30 +133,36 @@ |
| 139 |
133 |
|
@Override |
| 140 |
134 |
|
protected TimestampHM createTypeFrom( Mutable pMutable ) |
| 141 |
135 |
|
{ |
| 142 |
|
- |
return null; // TODO: new TimestampHM( pMutable.getYear(), pMutable.getMonth(), pMutable.getDay(), pMutable.getZuluOffsetMins(), pMutable.getHour(), pMutable.getMin() ); |
| |
136 |
+ |
return new TimestampHM( pMutable.getYear(), pMutable.getMonth(), pMutable.getDay(), pMutable.getZuluOffsetMins(), pMutable.getHour(), pMutable.getMin() ); |
| |
137 |
+ |
} |
| |
138 |
+ |
|
| |
139 |
+ |
@Override |
| |
140 |
+ |
protected Mutable createMutable( int pNewYear ) |
| |
141 |
+ |
{ |
| |
142 |
+ |
return new Mutable( pNewYear, getMonth(), getDay(), true, getZuluOffsetMins(), getHour(), getMin() ); |
| 143 |
143 |
|
} |
| 144 |
144 |
|
|
| 145 |
145 |
|
@Override |
| 146 |
146 |
|
protected Mutable createMutable( int pYear, int pNewMonth ) |
| 147 |
147 |
|
{ |
| 148 |
|
- |
return new Mutable( pYear, pNewMonth, getDay(), true, getHour(), getMin() ); |
| |
148 |
+ |
return new Mutable( pYear, pNewMonth, getDay(), true, getZuluOffsetMins(), getHour(), getMin() ); |
| 149 |
149 |
|
} |
| 150 |
150 |
|
|
| 151 |
151 |
|
@Override |
| 152 |
152 |
|
protected Mutable createMutable( int pYear, int pMonth, int pNewDay ) |
| 153 |
153 |
|
{ |
| 154 |
|
- |
return new Mutable( pYear, pMonth, pNewDay, false, getHour(), getMin() ); |
| |
154 |
+ |
return new Mutable( pYear, pMonth, pNewDay, false, getZuluOffsetMins(), getHour(), getMin() ); |
| 155 |
155 |
|
} |
| 156 |
156 |
|
|
| 157 |
157 |
|
@Override |
| 158 |
158 |
|
protected Mutable createMutable( int pYear, int pMonth, int pDay, int pNewHour ) |
| 159 |
159 |
|
{ |
| 160 |
|
- |
return new Mutable( pYear, pMonth, pDay, false, pNewHour, getMin() ); |
| |
160 |
+ |
return new Mutable( pYear, pMonth, pDay, false, getZuluOffsetMins(), pNewHour, getMin() ); |
| 161 |
161 |
|
} |
| 162 |
162 |
|
|
| 163 |
163 |
|
@Override |
| 164 |
164 |
|
protected Mutable createMutable( int pYear, int pMonth, int pDay, int pHour, int pNewMin ) |
| 165 |
165 |
|
{ |
| 166 |
|
- |
return new Mutable( pYear, pMonth, pDay, false, pHour, pNewMin ); |
| |
166 |
+ |
return new Mutable( pYear, pMonth, pDay, false, getZuluOffsetMins(), pHour, pNewMin ); |
| 167 |
167 |
|
} |
| 168 |
168 |
|
} |
View this file contents
View the full history
Commits for