litesoft

Explore

Commits

Diff Revisions 860 vs 862 for /trunk/Java/core/Anywhere/src/org/litesoft/core/simpletypes/temporal/SimpleDateRange.java

		@@ -91,7 +91,7 @@
91	91
92	92		public boolean isValidRangeValid()
93	93		{
94		-	return (mFromInclusive == null) \|\| (mToExclusive == null) \|\| mFromInclusive.before( mToExclusive );
	94	+	return (mFromInclusive == null) \|\| (mToExclusive == null) \|\| !mToExclusive.afterOrEqual( mFromInclusive );
95	95		}
96	96
97	97		@Override
		@@ -105,7 +105,7 @@
105	105		{
106	106		return (this == them) \|\| //
107	107		((them != null) //
108		-	// TODO: XXX && equal( this.getDateRes(), them.getDateRes() ) //
	108	+	// TODO: XXX && equal( this.getDateRes(), them.getDateRes() ) //
109	109		&& equal( this.mFromInclusive, them.mFromInclusive ) //
110	110		&& equal( this.mToExclusive, them.mToExclusive ) //
111	111		);
		@@ -142,10 +142,10 @@
142	142		{
143	143		return mFromInclusive + "-Whenever";
144	144		}
145		-	if ( mFromInclusive.before( mToExclusive ) )
	145	+	if ( mToExclusive.afterOrEqual( mFromInclusive ) )
146	146		{
147		-	return mFromInclusive + "-" + mToExclusive;
	147	+	return mFromInclusive + "!<" + mToExclusive;
148	148		}
149		-	return mFromInclusive + "!<" + mToExclusive;
	149	+	return mFromInclusive + "-" + mToExclusive;
150	150		}
151	151		}