litesoft
Diff Revisions
897
vs
898
for /trunk/Java/core/Anywhere/src/org/litesoft/core/simpletypes/temporal/CalendarYMD.java
|
@@ -17,15 +17,36 @@ |
17 |
17 |
|
{ |
18 |
18 |
|
private static final long serialVersionUID = 1L; |
19 |
19 |
|
|
20 |
|
- |
@SuppressWarnings({"deprecation", "UnusedDeclaration"}) @Deprecated /** for Serialization */ |
21 |
|
- |
protected CalendarYMD() |
|
20 |
+ |
private int mYear, mMonth, mDay; |
|
21 |
+ |
|
|
22 |
+ |
@Override |
|
23 |
+ |
public int getYear() |
22 |
24 |
|
{ |
23 |
|
- |
this( 0, 0, 0 ); |
|
25 |
+ |
return mYear; |
|
26 |
+ |
} |
|
27 |
+ |
|
|
28 |
+ |
@Override |
|
29 |
+ |
public int getMonth() |
|
30 |
+ |
{ |
|
31 |
+ |
return mMonth; |
|
32 |
+ |
} |
|
33 |
+ |
|
|
34 |
+ |
@Override |
|
35 |
+ |
public int getDay() |
|
36 |
+ |
{ |
|
37 |
+ |
return mDay; |
24 |
38 |
|
} |
25 |
39 |
|
|
26 |
40 |
|
public CalendarYMD( int pYear, int pMonth, int pDay ) |
27 |
41 |
|
{ |
28 |
|
- |
super( pYear, pMonth, pDay ); |
|
42 |
+ |
mMonth = validateMonth( mYear = pYear, pMonth ); |
|
43 |
+ |
mDay = validateDay( mYear, mMonth, pDay ); |
|
44 |
+ |
} |
|
45 |
+ |
|
|
46 |
+ |
@SuppressWarnings({"deprecation", "UnusedDeclaration"}) @Deprecated /** for Serialization */ |
|
47 |
+ |
protected CalendarYMD() |
|
48 |
+ |
{ |
|
49 |
+ |
this( 0, 0, 0 ); |
29 |
50 |
|
} |
30 |
51 |
|
|
31 |
52 |
|
public CalendarYMD( CalendarAccessorYMD pAccessor ) |
|
@@ -172,12 +193,6 @@ |
172 |
193 |
|
} |
173 |
194 |
|
|
174 |
195 |
|
@Override |
175 |
|
- |
protected Mutable createMutable( int pNewYear ) |
176 |
|
- |
{ |
177 |
|
- |
return new Mutable( pNewYear, getMonth(), getDay(), true ); |
178 |
|
- |
} |
179 |
|
- |
|
180 |
|
- |
@Override |
181 |
196 |
|
protected Mutable createMutable( int pYear, int pNewMonth ) |
182 |
197 |
|
{ |
183 |
198 |
|
return new Mutable( pYear, pNewMonth, getDay(), true ); |