more helper methods on ViewRowIdsOrderedSelection

#330
metasfresh · May 3, 2017 · f2309d8 · f2309d8
1 parent ed132de
commit f2309d8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/main/java/de/metas/ui/web/view/SqlViewRowIdsOrderedSelectionFactory.java b/src/main/java/de/metas/ui/web/view/SqlViewRowIdsOrderedSelectionFactory.java
@@ -4,6 +4,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.adempiere.ad.dao.IQueryFilter;
 import org.adempiere.ad.security.IUserRolePermissions;
 import org.adempiere.ad.security.IUserRolePermissionsDAO;
 import org.adempiere.ad.security.UserRolePermissionsKey;
@@ -138,7 +139,7 @@ public ViewRowIdsOrderedSelection addRowIdsToSelection(final ViewRowIdsOrderedSe
 		// Add
 		boolean hasChanges = false;
 		final String selectionId = selection.getSelectionId();
-		for(final DocumentId rowId : rowIds)
+		for (final DocumentId rowId : rowIds)
 		{
 			final List<Object> sqlParams = new ArrayList<>();
 			final String sqlAdd = newSqlViewSelectionQueryBuilder().buildSqlAddRowIdsFromSelection(sqlParams, selectionId, rowId);
@@ -147,10 +148,10 @@ public ViewRowIdsOrderedSelection addRowIdsToSelection(final ViewRowIdsOrderedSe
 			{
 				continue;
 			}
-			
+
 			hasChanges = true;
 		}
-		if(!hasChanges)
+		if (!hasChanges)
 		{
 			// nothing changed
 			return selection;
@@ -196,7 +197,7 @@ public ViewRowIdsOrderedSelection removeRowIdsFromSelection(final ViewRowIdsOrde
 				.setSize(size)
 				.build();
 	}
-	
+
 	private final int retrieveSize(final String selectionId)
 	{
 		final List<Object> sqlParams = new ArrayList<>();
@@ -205,11 +206,16 @@ private final int retrieveSize(final String selectionId)
 		return size <= 0 ? 0 : size;
 	}
 
-	public boolean containsAnyOfRowIds(ViewRowIdsOrderedSelection defaultSelection, final Collection<DocumentId> rowIds)
+	public boolean containsAnyOfRowIds(final String selectionId, final Collection<DocumentId> rowIds)
 	{
 		final List<Object> sqlParams = new ArrayList<>();
-		final String sqlCount = newSqlViewSelectionQueryBuilder().buildSqlCount(sqlParams, defaultSelection.getSelectionId(), rowIds);
-		int count = DB.executeUpdateEx(sqlCount, sqlParams.toArray(), ITrx.TRXNAME_ThreadInherited);
+		final String sqlCount = newSqlViewSelectionQueryBuilder().buildSqlCount(sqlParams, selectionId, rowIds);
+		final int count = DB.executeUpdateEx(sqlCount, sqlParams.toArray(), ITrx.TRXNAME_ThreadInherited);
 		return count > 0;
 	}
+
+	public <T> IQueryFilter<T> createQueryFilter(final String selectionId)
+	{
+		return newSqlViewSelectionQueryBuilder().buildInSelectionQueryFilter(selectionId);
+	}
 }
diff --git a/src/main/java/de/metas/ui/web/view/ViewRowIdsOrderedSelection.java b/src/main/java/de/metas/ui/web/view/ViewRowIdsOrderedSelection.java
@@ -102,7 +102,7 @@ public long getSize()
 		return size;
 	}
 
-	ImmutableList<DocumentQueryOrderBy> getOrderBys()
+	public ImmutableList<DocumentQueryOrderBy> getOrderBys()
 	{
 		return orderBys;
 	}