litesoft

Explore

Commits

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

		@@ -81,19 +81,8 @@
81	81		UtilsCommon.assertNotNull( "pBase", pBase );
82	82		UtilsCommon.assertNotNull( "pCurrent", pCurrent );
83	83
84		-	SSMap zBaseFilters = pBase.getUniqueFilters();
85		-	SSMap zCurrentFilters = pCurrent.getUniqueFilters();
86		-
87		-	if ( !zBaseFilters.isEmpty() )
88		-	{
89		-	return needsRefresh( pMetaData, zBaseFilters, zCurrentFilters );
90		-	}
91		-	if ( !zCurrentFilters.isEmpty() )
92		-	{
93		-	return true;
94		-	}
95		-
96		-	return needsRefresh( pMetaData, pBase.getNonUniqueFilters(), pCurrent.getNonUniqueFilters() );
	84	+	return (!pBase.isUniqueEmpty() && pCurrent.isUniqueEmpty()) \|\| //
	85	+	needsRefresh( pMetaData, pBase.getFilters(), pCurrent.getFilters() );
97	86		}
98	87
99	88		private static MapForm determineForm( SSMap pFilters )