Skip to content
Snippets Groups Projects
Commit 654cf03a authored by felmer's avatar felmer
Browse files

show not more than 5 entities per entity kind in column 'Entities' of the trash can view

SVN: 22772
parent a5291248
No related branches found
No related tags found
No related merge requests found
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
package ch.systemsx.cisd.openbis.generic.client.web.server.resultset; package ch.systemsx.cisd.openbis.generic.client.web.server.resultset;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.DeletionGridColumnIDs.DELETER; import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.DeletionGridColumnIDs.DELETER;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.DeletionGridColumnIDs.ENTITIES;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.DeletionGridColumnIDs.DELETION_DATE; import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.DeletionGridColumnIDs.DELETION_DATE;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.DeletionGridColumnIDs.ENTITIES;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.DeletionGridColumnIDs.REASON; import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.DeletionGridColumnIDs.REASON;
import java.util.List; import java.util.List;
...@@ -37,6 +37,8 @@ import ch.systemsx.cisd.openbis.generic.shared.util.TypedTableModelBuilder; ...@@ -37,6 +37,8 @@ import ch.systemsx.cisd.openbis.generic.shared.util.TypedTableModelBuilder;
*/ */
public class DeletionsProvider extends AbstractCommonTableModelProvider<Deletion> public class DeletionsProvider extends AbstractCommonTableModelProvider<Deletion>
{ {
private static final int MAX_NUMBER = 5;
public DeletionsProvider(ICommonServer commonServer, String sessionToken) public DeletionsProvider(ICommonServer commonServer, String sessionToken)
{ {
super(commonServer, sessionToken); super(commonServer, sessionToken);
...@@ -92,19 +94,29 @@ public class DeletionsProvider extends AbstractCommonTableModelProvider<Deletion ...@@ -92,19 +94,29 @@ public class DeletionsProvider extends AbstractCommonTableModelProvider<Deletion
} }
return builder.toString(); return builder.toString();
} }
private String createList(List<IEntityInformationHolderWithProperties> deletedEntities, private String createList(List<IEntityInformationHolderWithProperties> deletedEntities,
EntityKind entityKind) EntityKind entityKind)
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
int count = 0;
for (IEntityInformationHolderWithProperties entity : deletedEntities) for (IEntityInformationHolderWithProperties entity : deletedEntities)
{ {
if (entity.getEntityKind() == entityKind) if (entity.getEntityKind() == entityKind)
{ {
builder.append(" ").append(entity.getIdentifier()).append(" ("); if (count < MAX_NUMBER)
builder.append(entity.getEntityType().getCode()).append(")\n"); {
builder.append(" ").append(entity.getIdentifier()).append(" (");
builder.append(entity.getEntityType().getCode()).append(")\n");
}
count++;
} }
} }
int numberOfAdditionalEntities = count - MAX_NUMBER;
if (numberOfAdditionalEntities > 0)
{
builder.append(" and ").append(numberOfAdditionalEntities).append(" more");
}
return builder.toString(); return builder.toString();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment