litesoft
Diff Revisions
911
vs
912
for /trunk/Java/core/Anywhere/src/org/litesoft/core/simpletypes/temporal/AbstractCalendarY.java
|
@@ -8,12 +8,25 @@ |
8 |
8 |
|
{ |
9 |
9 |
|
private static final long serialVersionUID = 1L; |
10 |
10 |
|
|
|
11 |
+ |
private /* final */ int mYear; |
|
12 |
+ |
|
|
13 |
+ |
protected AbstractCalendarY( int pYear ) |
|
14 |
+ |
{ |
|
15 |
+ |
mYear = pYear; |
|
16 |
+ |
} |
|
17 |
+ |
|
|
18 |
+ |
@Override |
|
19 |
+ |
public final int getYear() |
|
20 |
+ |
{ |
|
21 |
+ |
return mYear; |
|
22 |
+ |
} |
|
23 |
+ |
|
11 |
24 |
|
/** |
12 |
25 |
|
* Return a T with the Year set to the parameter, if it was a LeapDay and can not be a LeapDay it will be 28Feb. |
13 |
26 |
|
*/ |
14 |
27 |
|
public final T year( int pYear ) |
15 |
28 |
|
{ |
16 |
|
- |
return (getYear() == pYear) ? us() : LLsetYear( pYear ); |
|
29 |
+ |
return (mYear == pYear) ? us() : LLsetYear( pYear ); |
17 |
30 |
|
} |
18 |
31 |
|
|
19 |
32 |
|
/** |
|
@@ -21,7 +34,7 @@ |
21 |
34 |
|
*/ |
22 |
35 |
|
public final T addYears( int pYears ) |
23 |
36 |
|
{ |
24 |
|
- |
return (pYears == 0) ? us() : LLsetYear( getYear() + pYears ); |
|
37 |
+ |
return (pYears == 0) ? us() : LLsetYear( mYear + pYears ); |
25 |
38 |
|
} |
26 |
39 |
|
|
27 |
40 |
|
/** |
|
@@ -29,7 +42,7 @@ |
29 |
42 |
|
*/ |
30 |
43 |
|
public final T minusYears( int pYears ) |
31 |
44 |
|
{ |
32 |
|
- |
return (pYears == 0) ? us() : LLsetYear( getYear() - pYears ); |
|
45 |
+ |
return (pYears == 0) ? us() : LLsetYear( mYear - pYears ); |
33 |
46 |
|
} |
34 |
47 |
|
|
35 |
48 |
|
/** |
|
@@ -97,7 +110,7 @@ |
97 |
110 |
|
@Override |
98 |
111 |
|
protected int LL_hashCode() |
99 |
112 |
|
{ |
100 |
|
- |
return getYear(); |
|
113 |
+ |
return mYear; |
101 |
114 |
|
} |
102 |
115 |
|
|
103 |
116 |
|
/** |