litesoft
Diff Revisions
850
vs
851
for /trunk/Java/core/Anywhere/src/org/litesoft/core/simpletypes/temporal/nonpublic/TemporalParser.java
|
@@ -5,6 +5,7 @@ |
5 |
5 |
|
|
6 |
6 |
|
import org.litesoft.core.simpletypes.temporal.*; |
7 |
7 |
|
import org.litesoft.core.typeutils.*; |
|
8 |
+ |
import org.litesoft.core.typeutils.gregorian.*; |
8 |
9 |
|
|
9 |
10 |
|
public class TemporalParser implements TemporalParsingSupport |
10 |
11 |
|
{ |
|
@@ -102,7 +103,7 @@ |
102 |
103 |
|
{ |
103 |
104 |
|
case 1: // assume Day only, add month |
104 |
105 |
|
pInadequatePartsSource = ensurePartsSource( pInadequatePartsSource ); |
105 |
|
- |
pParts.add( new MonthAsTextPC( CalendarSupport.MONTH_NAMES[pInadequatePartsSource.getMonth()] ) ); |
|
106 |
+ |
pParts.add( new MonthAsTextPC( Month.nameFromMonthNumber(pInadequatePartsSource.getMonth()) ) ); |
106 |
107 |
|
case 2: // assume Month & Day, add Year |
107 |
108 |
|
pInadequatePartsSource = ensurePartsSource( pInadequatePartsSource ); |
108 |
109 |
|
pParts.add( new NumericPC( "" + pInadequatePartsSource.getYear() ) ); |
|
@@ -366,7 +367,8 @@ |
366 |
367 |
|
private SimpleDate toDate( String pDateFormat, // |
367 |
368 |
|
AbstractRealPC[] pParts, int pYearNdx, int pMonthNdx, int pDayNdx ) |
368 |
369 |
|
{ |
369 |
|
- |
return new SimpleDate( pDateFormat, pParts[pYearNdx].getYear(), pParts[pMonthNdx].getMonth(), pParts[pDayNdx].getDay() ); |
|
370 |
+ |
return new SimpleDate( null, // TODO: XXX pDateFormat, |
|
371 |
+ |
pParts[pYearNdx].getYear(), pParts[pMonthNdx].getMonth(), pParts[pDayNdx].getDay() ); |
370 |
372 |
|
} |
371 |
373 |
|
|
372 |
374 |
|
private transient LateBooleanFieldOrder mYearBeforeMonth = new LateBooleanFieldOrder(); |