litesoft
Diff Revisions
897
vs
898
for /trunk/Java/core/Anywhere/src/org/litesoft/core/simpletypes/temporal/AbstractCalendarY.java
|
@@ -8,25 +8,12 @@ |
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 |
|
- |
|
24 |
11 |
|
/** |
25 |
12 |
|
* 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. |
26 |
13 |
|
*/ |
27 |
14 |
|
public final T year( int pYear ) |
28 |
15 |
|
{ |
29 |
|
- |
return (mYear == pYear) ? us() : LLsetYear( pYear ); |
|
16 |
+ |
return (getYear() == pYear) ? us() : LLsetYear( pYear ); |
30 |
17 |
|
} |
31 |
18 |
|
|
32 |
19 |
|
/** |
|
@@ -34,7 +21,7 @@ |
34 |
21 |
|
*/ |
35 |
22 |
|
public final T addYears( int pYears ) |
36 |
23 |
|
{ |
37 |
|
- |
return (pYears == 0) ? us() : LLsetYear( mYear + pYears ); |
|
24 |
+ |
return (pYears == 0) ? us() : LLsetYear( getYear() + pYears ); |
38 |
25 |
|
} |
39 |
26 |
|
|
40 |
27 |
|
/** |
|
@@ -42,7 +29,7 @@ |
42 |
29 |
|
*/ |
43 |
30 |
|
public final T minusYears( int pYears ) |
44 |
31 |
|
{ |
45 |
|
- |
return (pYears == 0) ? us() : LLsetYear( mYear - pYears ); |
|
32 |
+ |
return (pYears == 0) ? us() : LLsetYear( getYear() - pYears ); |
46 |
33 |
|
} |
47 |
34 |
|
|
48 |
35 |
|
/** |
|
@@ -110,7 +97,7 @@ |
110 |
97 |
|
@Override |
111 |
98 |
|
protected int LL_hashCode() |
112 |
99 |
|
{ |
113 |
|
- |
return mYear; |
|
100 |
+ |
return getYear(); |
114 |
101 |
|
} |
115 |
102 |
|
|
116 |
103 |
|
/** |