litesoft

URLs

Explore

Commits

Diff Revisions 859 vs 860 for /trunk/Java/core/Anywhere/src/org/litesoft/core/simpletypes/temporal/nonpublic/TemporalParser.java

		@@ -23,7 +23,7 @@
23	23		return mFieldOrder;
24	24		}
25	25
26		-	public SimpleDate parseDate( String pText, DateRes pDateRes, UtilDateAdaptor pInadequatePartsSource ) throws IllegalArgumentException
	26	+	public CalendarYMD parseDate( String pText, DateRes pDateRes, UtilDateAdaptor pInadequatePartsSource ) throws IllegalArgumentException
27	27		{
28	28		String zWhat = "Date";
29	29		List<PartCollector> zParts = LLparseToParts( pText, true );
		@@ -41,7 +41,7 @@
41	41		AbstractRealPC[] realPCs = LLinitialPartsValidate( pText, zParts, zWhat, 3 + pTimeFields );
42	42		LLpartsValidateForDate( realPCs, zWhat );
43	43		LLpartsValidateForTime( pText, realPCs, 3, pTimeFields );
44		-	SimpleDate date = LLparseDate( realPCs, DateRes.ToDAY, zWhat );
	44	+	CalendarYMD date = LLparseDate( realPCs, DateRes.ToDAY, zWhat );
45	45		SimpleTime time = LLparseTime( realPCs, 3, pTimeFields );
46	46		return new SimpleTimestamp( date, time );
47	47		}
		@@ -250,7 +250,7 @@
250	250		}
251	251		}
252	252
253		-	private SimpleDate LLparseDate( AbstractRealPC[] pParts, DateRes pDateRes, String pWhat )
	253	+	private CalendarYMD LLparseDate( AbstractRealPC[] pParts, DateRes pDateRes, String pWhat )
254	254		{
255	255		int zSwitchValue = 0;
256	256		int bucketFactor = 1;
		@@ -369,7 +369,7 @@
369	369		return new IllegalArgumentException( zWhy );
370	370		}
371	371
372		-	private SimpleDate toDate( DateRes pDateRes, //
	372	+	private CalendarYMD toDate( DateRes pDateRes, //
373	373		AbstractRealPC[] pParts, int pYearNdx, int pMonthNdx, int pDayNdx )
374	374		{
375	375		int zYear = pParts[pYearNdx].getYear();
		@@ -377,13 +377,13 @@
377	377		int zDay = pParts[pDayNdx].getDay();
378	378		if ( pDateRes.isValidToDay() )
379	379		{
380		-	return new SimpleDate( zYear, zMonth, zDay );
	380	+	return new CalendarYMD( zYear, zMonth, zDay );
381	381		}
382	382		if ( pDateRes.isValidToMonth() )
383	383		{
384		-	return new SimpleDate( zYear, zMonth );
	384	+	return new CalendarYMD( zYear, zMonth );
385	385		}
386		-	return new SimpleDate( zYear );
	386	+	return new CalendarYMD( zYear );
387	387		}
388	388
389	389		private transient LateBooleanFieldOrder mYearBeforeMonth = new LateBooleanFieldOrder();

View View this file contents

History View the full history

Feeds

Commits for /trunk/Java/core/Anywhere/src/org/litesoft/core/simpletypes/temporal/nonpublic/TemporalParser.java