litesoft

Explore

Commits

Diff Revisions 803 vs 804 for /trunk/Java/core/Anywhere/src/org/litesoft/bo/views/FilterUtil.java

		@@ -6,7 +6,6 @@
6	6		import org.litesoft.bo.*;
7	7		import org.litesoft.core.simpletypes.*;
8	8		import org.litesoft.core.typeutils.*;
9		-	import org.litesoft.core.util.*;
10	9
11	10		public class FilterUtil
12	11		{
		@@ -78,9 +77,9 @@
78	77		@SuppressWarnings({"SimplifiableIfStatement"})
79	78		public static boolean needsRefresh( BoMetaData pMetaData, BoAccessorFilters pBase, BoAccessorFilters pCurrent )
80	79		{
81		-	UtilsCommon.assertNotNull( "pMetaData", pMetaData );
82		-	UtilsCommon.assertNotNull( "pBase", pBase );
83		-	UtilsCommon.assertNotNull( "pCurrent", pCurrent );
	80	+	Objects.assertNotNull( "pMetaData", pMetaData );
	81	+	Objects.assertNotNull( "pBase", pBase );
	82	+	Objects.assertNotNull( "pCurrent", pCurrent );
84	83
85	84		return (!pBase.isUniqueEmpty() && pCurrent.isUniqueEmpty()) \|\| //
86	85		needsRefresh( pMetaData, pBase.getFilters(), pCurrent.getFilters() );
		@@ -220,7 +219,7 @@
220	219
221	220		private static boolean isCurrentLessRestrictive( boolean pEquals, BoAttribute pAttribute, String pBaseValue, String pCurrentValue )
222	221		{
223		-	if ( UtilsCommon.areNonArraysEqual( pBaseValue, pCurrentValue ) ) // handle both null
	222	+	if ( Objects.areNonArraysEqual( pBaseValue, pCurrentValue ) ) // handle both null
224	223		{
225	224		return false; // equal implicitly means NOT Less Restrictive
226	225		}