litesoft
Subversion Repository Public Repository

litesoft

URLs

Copy to Clipboard
Explore
Commits

Diff Revisions 911 vs 912 for /trunk/Java/core/Anywhere/src/org/litesoft/core/simpletypes/temporal/TimestampHMS.java

Diff revisions: vs.
  @@ -15,12 +15,12 @@
15 15 @SuppressWarnings({"deprecation", "UnusedDeclaration"}) @Deprecated /** for Serialization */
16 16 protected TimestampHMS()
17 17 {
18 - this( 0, 0, 0, 0, 0, 0, 0 );
18 + this( 0, 1, 1, 0, 0, 0, 0 );
19 19 }
20 20
21 - private TimestampHMS( int pYear, int pMonth, int pDay, int pZuluOffsetMins, int pHour, int pMin, int pSec )
21 + public TimestampHMS( int pYear, int pMonth, int pDay, int pZuluOffsetMins, int pHour, int pMin, int pSec )
22 22 {
23 - super( null ); // TODO: pYear, pMonth, pDay, pZuluOffsetMins, pHour, pMin, pSec );
23 + super( pYear, pMonth, pDay, pZuluOffsetMins, pHour, pMin, pSec );
24 24 }
25 25
26 26 public TimestampHMS( TimestampAccessorHMS pAccessor )
  @@ -30,15 +30,9 @@
30 30 pAccessor.getHour(), pAccessor.getMin(), pAccessor.getSec() );
31 31 }
32 32
33 - @Override
34 - protected UtilDateAdaptor createWall()
35 - {
36 - return null; // TODO: XXX
37 - }
38 -
39 33 public static TimestampHMS fromWallTime( int pYear, int pMonth, int pDay, int pHour, int pMin, int pSec )
40 34 {
41 - return new TimestampHMS( UtilDateAdaptor.wall( pYear, pMonth, pDay, pHour, pMin, pSec ) );
35 + return new TimestampHMS( UtilDateAdaptor.currentWall( pYear, pMonth, pDay, pHour, pMin, pSec ) );
42 36 }
43 37
44 38 public static TimestampHMS fromISO8601( int pYear, int pMonth, int pDay, int pHour, int pMin, 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, pSec );
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 TimestampHMS( zMutable );
57 + return new TimestampHMS( zMutable );
64 58 }
65 59
66 60 @Override
  @@ -105,9 +99,9 @@
105 99
106 100 public final String toSQLvalue()
107 101 {
108 - Mutable zMutable = new Mutable( getYear(), getMonth(), getDay(), false, getHour(), getMin(), getSec() );
109 - // TODO: zMutable.fromWallToZulu();
110 - return null; // TODO: formatSQLvalueYMDH( zMutable, true, new StringBuilder() ).toString();
102 + Mutable zMutable = new Mutable( getYear(), getMonth(), getDay(), false, getZuluOffsetMins(), getHour(), getMin(), getSec() );
103 + zMutable.fromWallToZulu();
104 + return formatSQLvalueYMDH( zMutable, true, new StringBuilder() ).toString();
111 105 }
112 106
113 107 public static TimestampHMS fromSQLvalue( String pToSQLvalue )
  @@ -126,7 +120,7 @@
126 120 @Override
127 121 public UtilDateAdaptor toUtilDateAdaptor()
128 122 {
129 - return null; // TODO: UtilDateAdaptor.offsetWallToSec( getZuluOffsetMins(), getYear(), getMonth(), getDay(), getHour(), getMin(), getSec() );
123 + return UtilDateAdaptor.offsetWallToSec( getZuluOffsetMins(), getYear(), getMonth(), getDay(), getHour(), getMin(), getSec() );
130 124 }
131 125
132 126 // vvvvvvvvvvvvvvvvvv Non-common Public methods vvvvvvvvvvvvvvvvv
  @@ -141,36 +135,42 @@
141 135 @Override
142 136 protected TimestampHMS createTypeFrom( Mutable pMutable )
143 137 {
144 - return null; // TODO: new TimestampHMS( pMutable.getYear(), pMutable.getMonth(), pMutable.getDay(), pMutable.getZuluOffsetMins(), pMutable.getHour(), pMutable.getMin(), pMutable.getSec() );
138 + return new TimestampHMS( pMutable.getYear(), pMutable.getMonth(), pMutable.getDay(), pMutable.getZuluOffsetMins(), pMutable.getHour(), pMutable.getMin(), pMutable.getSec() );
139 + }
140 +
141 + @Override
142 + protected Mutable createMutable( int pNewYear )
143 + {
144 + return new Mutable( pNewYear, getMonth(), getDay(), true, getZuluOffsetMins(), getHour(), getMin(), getSec() );
145 145 }
146 146
147 147 @Override
148 148 protected Mutable createMutable( int pYear, int pNewMonth )
149 149 {
150 - return new Mutable( pYear, pNewMonth, getDay(), true, getHour(), getMin(), getSec() );
150 + return new Mutable( pYear, pNewMonth, getDay(), true, getZuluOffsetMins(), getHour(), getMin(), getSec() );
151 151 }
152 152
153 153 @Override
154 154 protected Mutable createMutable( int pYear, int pMonth, int pNewDay )
155 155 {
156 - return new Mutable( pYear, pMonth, pNewDay, false, getHour(), getMin(), getSec() );
156 + return new Mutable( pYear, pMonth, pNewDay, false, getZuluOffsetMins(), getHour(), getMin(), getSec() );
157 157 }
158 158
159 159 @Override
160 160 protected Mutable createMutable( int pYear, int pMonth, int pDay, int pNewHour )
161 161 {
162 - return new Mutable( pYear, pMonth, pDay, false, pNewHour, getMin(), getSec() );
162 + return new Mutable( pYear, pMonth, pDay, false, getZuluOffsetMins(), pNewHour, getMin(), getSec() );
163 163 }
164 164
165 165 @Override
166 166 protected Mutable createMutable( int pYear, int pMonth, int pDay, int pHour, int pNewMin )
167 167 {
168 - return new Mutable( pYear, pMonth, pDay, false, pHour, pNewMin, getSec() );
168 + return new Mutable( pYear, pMonth, pDay, false, getZuluOffsetMins(), pHour, pNewMin, getSec() );
169 169 }
170 170
171 171 @Override
172 172 protected Mutable createMutable( int pYear, int pMonth, int pDay, int pHour, int pMin, int pNewSec )
173 173 {
174 - return new Mutable( pYear, pMonth, pDay, false, pHour, pMin, pNewSec );
174 + return new Mutable( pYear, pMonth, pDay, false, getZuluOffsetMins(), pHour, pMin, pNewSec );
175 175 }
176 176 }

View View this file contents

History View the full history

Feeds

Commits for /trunk/Java/core/Anywhere/src/org/litesoft/core/simpletypes/temporal/TimestampHMS.java

Need assistance?   Get in touch, or head to our documentation site.