litesoft
Diff Revisions
859
vs
860
for /trunk/Java/core/Anywhere/src/org/litesoft/core/simpletypes/temporal/SimpleDateRange.java
|
@@ -11,8 +11,8 @@ |
11 |
11 |
|
{ |
12 |
12 |
|
private static final long serialVersionUID = 1L; |
13 |
13 |
|
|
14 |
|
- |
private SimpleDate mFromInclusive = null; |
15 |
|
- |
private SimpleDate mToExclusive = null; |
|
14 |
+ |
private CalendarYMD mFromInclusive = null; |
|
15 |
+ |
private CalendarYMD mToExclusive = null; |
16 |
16 |
|
|
17 |
17 |
|
/** |
18 |
18 |
|
* @deprecated - for Serialization |
|
@@ -22,7 +22,7 @@ |
22 |
22 |
|
{ |
23 |
23 |
|
} |
24 |
24 |
|
|
25 |
|
- |
public SimpleDateRange( String pFormat, SimpleDate pFromInclusive, SimpleDate pToExclusive ) |
|
25 |
+ |
public SimpleDateRange( String pFormat, CalendarYMD pFromInclusive, CalendarYMD pToExclusive ) |
26 |
26 |
|
{ |
27 |
27 |
|
// this( pFormat ); |
28 |
28 |
|
setFromInclusive( pFromInclusive ); |
|
@@ -40,7 +40,7 @@ |
40 |
40 |
|
* |
41 |
41 |
|
* @throws IllegalArgumentException if !null and Resolution does NOT match |
42 |
42 |
|
*/ |
43 |
|
- |
public void setFromInclusive( SimpleDate pFromInclusive ) |
|
43 |
+ |
public void setFromInclusive( CalendarYMD pFromInclusive ) |
44 |
44 |
|
throws IllegalArgumentException |
45 |
45 |
|
{ |
46 |
46 |
|
mFromInclusive = checkRes( pFromInclusive ); |
|
@@ -49,7 +49,7 @@ |
49 |
49 |
|
/** |
50 |
50 |
|
* @return null means infite past (e.g. beginning of day) |
51 |
51 |
|
*/ |
52 |
|
- |
public SimpleDate getFromInclusive() |
|
52 |
+ |
public CalendarYMD getFromInclusive() |
53 |
53 |
|
{ |
54 |
54 |
|
return mFromInclusive; |
55 |
55 |
|
} |
|
@@ -59,7 +59,7 @@ |
59 |
59 |
|
* |
60 |
60 |
|
* @throws IllegalArgumentException if !null and Resolution does NOT match |
61 |
61 |
|
*/ |
62 |
|
- |
public void setToExclusive( SimpleDate pToExclusive ) |
|
62 |
+ |
public void setToExclusive( CalendarYMD pToExclusive ) |
63 |
63 |
|
throws IllegalArgumentException |
64 |
64 |
|
{ |
65 |
65 |
|
mToExclusive = checkRes( pToExclusive ); |
|
@@ -68,12 +68,12 @@ |
68 |
68 |
|
/** |
69 |
69 |
|
* @return null means infite future (e.g. rest of the day) |
70 |
70 |
|
*/ |
71 |
|
- |
public SimpleDate getToExclusive() |
|
71 |
+ |
public CalendarYMD getToExclusive() |
72 |
72 |
|
{ |
73 |
73 |
|
return mToExclusive; |
74 |
74 |
|
} |
75 |
75 |
|
|
76 |
|
- |
private SimpleDate checkRes( SimpleDate pToCheck ) |
|
76 |
+ |
private CalendarYMD checkRes( CalendarYMD pToCheck ) |
77 |
77 |
|
throws IllegalArgumentException |
78 |
78 |
|
{ |
79 |
79 |
|
if ( (pToCheck != null) ) |