diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractTableModelProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractTableModelProvider.java
index 4ef63c7d91b44e07a071d73a2903e8b0dfc0ee86..ba38c5a7f8850bf81c984e035d0fc169b9dacafa 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractTableModelProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractTableModelProvider.java
@@ -40,7 +40,7 @@ public abstract class AbstractTableModelProvider<T extends ISerializable> implem
*/
public TypedTableModel<T> getTableModel(int maxSize)
{
- TypedTableModel<T> tableModel = createTableModel(Integer.MAX_VALUE);
+ TypedTableModel<T> tableModel = createTableModel();
List<TableModelColumnHeader> headers = tableModel.getHeader();
List<TableModelRowWithObject<T>> rows = tableModel.getRows();
List<TableModelRowWithObject<T>> limitedRows = new ArrayList<TableModelRowWithObject<T>>();
@@ -57,8 +57,7 @@ public abstract class AbstractTableModelProvider<T extends ISerializable> implem
/**
* Creates the complete table model.
- * @param maxSize TODO
*/
- protected abstract TypedTableModel<T> createTableModel(int maxSize);
+ protected abstract TypedTableModel<T> createTableModel();
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AuthorizationGroupProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AuthorizationGroupProvider.java
index 91a6e7588b3fa8dc3928152cc9574d2d74903c3d..c8916345f86a9f5aa0cf05fc186caebfc2093a68 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AuthorizationGroupProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AuthorizationGroupProvider.java
@@ -42,7 +42,7 @@ public class AuthorizationGroupProvider extends AbstractCommonTableModelProvider
}
@Override
- protected TypedTableModel<AuthorizationGroup> createTableModel(int maxSize)
+ protected TypedTableModel<AuthorizationGroup> createTableModel()
{
List<AuthorizationGroup> groups = commonServer.listAuthorizationGroups(sessionToken);
TypedTableModelBuilder<AuthorizationGroup> builder =
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/FileFormatTypesProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/FileFormatTypesProvider.java
index 6afc08d1d0ac9b4d5a50ee0849019aabf0022479..ea88ba19f6ef16cc862194dd4072521fb458681c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/FileFormatTypesProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/FileFormatTypesProvider.java
@@ -38,7 +38,7 @@ public class FileFormatTypesProvider extends AbstractCommonTableModelProvider<Fi
}
@Override
- protected TypedTableModel<FileFormatType> createTableModel(int maxSize)
+ protected TypedTableModel<FileFormatType> createTableModel()
{
List<FileFormatType> fileFormats = commonServer.listFileFormatTypes(sessionToken);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/MaterialProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/MaterialProvider.java
index 8764597a1ebb357b22ad094ba63f7b0ae556bb39..af20885d9afb429556113c9872baca4ea3afedfe 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/MaterialProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/MaterialProvider.java
@@ -44,7 +44,7 @@ public class MaterialProvider extends AbstractTableModelProvider<Material>
}
@Override
- protected TypedTableModel<Material> createTableModel(int maxSize)
+ protected TypedTableModel<Material> createTableModel()
{
TypedTableModelBuilder<Material> builder = new TypedTableModelBuilder<Material>();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/PersonsProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/PersonsProvider.java
index 5f692d8030b691ec5c4177fd5dd9f5922cabedbf..4315e874e18f395833b7a1f2f96fca46664dfbbc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/PersonsProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/PersonsProvider.java
@@ -48,7 +48,7 @@ public class PersonsProvider extends AbstractCommonTableModelProvider<Person>
}
@Override
- protected TypedTableModel<Person> createTableModel(int maxSize)
+ protected TypedTableModel<Person> createTableModel()
{
List<Person> persons;
if (authorizationGroupIdOrNull == null)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ProjectsProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ProjectsProvider.java
index 7380246d8932f3753128c1d0fc6dd96449114519..5b0fc2204bbc1f7632f81b87f983d1c75f5723ed 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ProjectsProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ProjectsProvider.java
@@ -43,7 +43,7 @@ public class ProjectsProvider extends AbstractCommonTableModelProvider<Project>
}
@Override
- protected TypedTableModel<Project> createTableModel(int maxSize)
+ protected TypedTableModel<Project> createTableModel()
{
List<Project> projects = commonServer.listProjects(sessionToken);
TypedTableModelBuilder<Project> builder = new TypedTableModelBuilder<Project>();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/RoleAssignmentProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/RoleAssignmentProvider.java
index 75ef6c627eacb0bd90bb7181503ec03f8db2ff44..915fa0bf67c2350fba21091e9d437114dbd16d3c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/RoleAssignmentProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/RoleAssignmentProvider.java
@@ -47,7 +47,7 @@ public class RoleAssignmentProvider extends AbstractCommonTableModelProvider<Rol
}
@Override
- protected TypedTableModel<RoleAssignment> createTableModel(int maxSize)
+ protected TypedTableModel<RoleAssignment> createTableModel()
{
List<RoleAssignment> roles = commonServer.listRoleAssignments(sessionToken);
TypedTableModelBuilder<RoleAssignment> builder = new TypedTableModelBuilder<RoleAssignment>();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProvider.java
index 20e39ca47a86d98581ccde8ab3352c5ccc029681..19bab51b8f9b8e4d258d9d5ff6e42871a18b6c06 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProvider.java
@@ -70,7 +70,7 @@ public class SampleProvider extends AbstractCommonTableModelProvider<Sample>
}
@Override
- protected TypedTableModel<Sample> createTableModel(int maxSize)
+ protected TypedTableModel<Sample> createTableModel()
{
List<Sample> samples = getSamples();
TypedTableModelBuilder<Sample> builder = new TypedTableModelBuilder<Sample>();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ScriptProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ScriptProvider.java
index 0816678ad9a828286eb444bd4671b40e97630136..16df63953f8399600b2e6392e4b9810ab174a6b3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ScriptProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ScriptProvider.java
@@ -52,7 +52,7 @@ public class ScriptProvider extends AbstractCommonTableModelProvider<Script>
}
@Override
- protected TypedTableModel<Script> createTableModel(int maxSize)
+ protected TypedTableModel<Script> createTableModel()
{
List<Script> scripts = commonServer.listScripts(sessionToken, scriptTypeOrNull, entityKindOrNull);
TypedTableModelBuilder<Script> builder = new TypedTableModelBuilder<Script>();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SpacesProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SpacesProvider.java
index 25887e588ebfbc34d240936697c7067e7d04f27e..ab687ebda08ffb4d719028b0eb676101c5e0f840 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SpacesProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SpacesProvider.java
@@ -42,7 +42,7 @@ public class SpacesProvider extends AbstractCommonTableModelProvider<Space>
}
@Override
- protected TypedTableModel<Space> createTableModel(int maxSize)
+ protected TypedTableModel<Space> createTableModel()
{
DatabaseInstanceIdentifier identifier = new DatabaseInstanceIdentifier(null);
List<Space> spaces = commonServer.listSpaces(sessionToken, identifier);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabulariesProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabulariesProvider.java
index c80b497333329b49827f53ba5ef376970915de6d..fc2e14b7d54891e111a9eec76477daf5aaf7fef5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabulariesProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabulariesProvider.java
@@ -51,7 +51,7 @@ public class VocabulariesProvider extends AbstractCommonTableModelProvider<Vocab
}
@Override
- protected TypedTableModel<Vocabulary> createTableModel(int maxSize)
+ protected TypedTableModel<Vocabulary> createTableModel()
{
List<Vocabulary> vocabularies =
commonServer.listVocabularies(sessionToken, withTerms, excludeInternal);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabularyTermsProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabularyTermsProvider.java
index a3d9672e8181ee632e9559282b77df68068cb0e8..fac647a6ce7d0ccb0584755ece42f81d423e55c0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabularyTermsProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabularyTermsProvider.java
@@ -57,7 +57,7 @@ public class VocabularyTermsProvider extends AbstractCommonTableModelProvider<Vo
}
@Override
- protected TypedTableModel<VocabularyTermWithStats> createTableModel(int maxSize)
+ protected TypedTableModel<VocabularyTermWithStats> createTableModel()
{
TypedTableModelBuilder<VocabularyTermWithStats> builder =
new TypedTableModelBuilder<VocabularyTermWithStats>();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/resultset/QueryExpressionProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/resultset/QueryExpressionProvider.java
index e0fcaea092582447611cebaa8e0ae0be51bd44a4..b9df7049127e4f5ffb26f7e5d7bea3c4d1a42621 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/resultset/QueryExpressionProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/resultset/QueryExpressionProvider.java
@@ -54,7 +54,7 @@ public class QueryExpressionProvider extends AbstractTableModelProvider<QueryExp
}
@Override
- protected TypedTableModel<QueryExpression> createTableModel(int maxSize)
+ protected TypedTableModel<QueryExpression> createTableModel()
{
List<QueryExpression> expressions = server.listQueries(sessionToken,
QueryType.UNSPECIFIED, BasicEntityType.UNSPECIFIED);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/RoleAssignmentProviderTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/RoleAssignmentProviderTest.java
index 3455cbc11f78b2924c415b419193716a43aee776..fa59b8c51ce0d06c765d89438056fc4a65dcf89d 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/RoleAssignmentProviderTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/RoleAssignmentProviderTest.java
@@ -66,7 +66,7 @@ public class RoleAssignmentProviderTest extends AbstractProviderTest
});
RoleAssignmentProvider provider = new RoleAssignmentProvider(server, SESSION_TOKEN);
- TypedTableModel<RoleAssignment> model = provider.createTableModel(Integer.MAX_VALUE);
+ TypedTableModel<RoleAssignment> model = provider.createTableModel();
assertEquals("[PERSON, AUTHORIZATION_GROUP, SPACE, ROLE, DATABASE_INSTANCE]",
getHeaderIDs(model).toString());
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ScriptProviderTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ScriptProviderTest.java
index 9f680dc20e5b6d6afc8598b644fcdbcaa63386b0..b784c10d55727f70bedac441f05ae96a0dc4d0ff 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ScriptProviderTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ScriptProviderTest.java
@@ -55,7 +55,7 @@ public class ScriptProviderTest extends AbstractProviderTest
new ScriptProvider(server, SESSION_TOKEN, ScriptType.DYNAMIC_PROPERTY,
EntityKind.EXPERIMENT);
- TypedTableModel<Script> tableModel = scriptProvider.createTableModel(Integer.MAX_VALUE);
+ TypedTableModel<Script> tableModel = scriptProvider.createTableModel();
assertEquals(
"[NAME, DESCRIPTION, SCRIPT, ENTITY_KIND, SCRIPT_TYPE, REGISTRATOR, REGISTRATION_DATE]",
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/PlateMetadataProvider.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/PlateMetadataProvider.java
index b867e8f8a1179331a6caa73ca2b7f5fcad071539..0a682370db8a4477cb8dc65263873a4ac10a10b0 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/PlateMetadataProvider.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/PlateMetadataProvider.java
@@ -52,7 +52,7 @@ class PlateMetadataProvider extends AbstractTableModelProvider<WellMetadata>
}
@Override
- public TypedTableModel<WellMetadata> createTableModel(int maxSize)
+ public TypedTableModel<WellMetadata> createTableModel()
{
TypedTableModelBuilder<WellMetadata> builder = new TypedTableModelBuilder<WellMetadata>();
PlateContent plateContent = server.getPlateContent(sessionToken, plateId);
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/WellContentProvider.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/WellContentProvider.java
index 5a9bd70879c5a3ebd7ec7ac3b121dd0e4f1b1156..3cfc45e26b45887b720f22de855fac570077a490 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/WellContentProvider.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/WellContentProvider.java
@@ -71,7 +71,7 @@ public class WellContentProvider extends AbstractTableModelProvider<WellContent>
}
@Override
- protected TypedTableModel<WellContent> createTableModel(int maxSize)
+ protected TypedTableModel<WellContent> createTableModel()
{
TypedTableModelBuilder<WellContent> builder = new TypedTableModelBuilder<WellContent>();
addStandardWellColumns(builder);