litesoft

Explore

Commits

Diff Revisions 862 vs 863 for /trunk/Java/core/jvm1.4/src/org/litesoft/ui/support/nonpublic/CreditsData.java

		@@ -13,9 +13,9 @@
13	13
14	14		public CreditsData( String pStartDateYYYY_MM_DD, String pWho, String pEndDateYYYY_MM_DD )
15	15		{
16		-	mStartDate = CalendarYMD.fromYMD( pStartDateYYYY_MM_DD );
	16	+	mStartDate = CalendarYMD.fromYMD( Strings.assertNotNullNotEmpty( "StartDate", pStartDateYYYY_MM_DD ) );
17	17		mWho = Strings.assertNotNullNotEmpty( "Who", pWho );
18		-	if ( pEndDateYYYY_MM_DD != null )
	18	+	if ( null != (pEndDateYYYY_MM_DD = Strings.noEmpty( pEndDateYYYY_MM_DD )) )
19	19		{
20	20		mEndDate = CalendarYMD.fromYMD( pEndDateYYYY_MM_DD );
21	21		}
		@@ -43,9 +43,8 @@
43	43
44	44		public boolean wasActiveDuring( int pYear, int pMonth, int pFromDay, int pThruDay )
45	45		{
46		-	CalendarYMD fromDate = new CalendarYMD( pYear, pMonth, pFromDay );
47		-	CalendarYMD thruDate = new CalendarYMD( pYear, pMonth, pThruDay );
48		-	return !mStartDate.after( thruDate ) && !fromDate.after( getEndDate() );
	46	+	return new CalendarYMDRange( new CalendarYMD( pYear, pMonth, pFromDay ),
	47	+	new CalendarYMD( pYear, pMonth, pThruDay ) ).sharesDates( new CalendarYMDRange( getStartDate(), getEndDate() ) );
49	48		}
50	49
51	50		private Integer getActiveDuration()