From 34208b9de8bab73aad0933bdd7e2d012801cc67c Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 16 Nov 2011 12:39:36 +0000
Subject: [PATCH] LMS-2607 getting rid of ISerializable marker interface and
using instead java.io.Serializable
SVN: 23687
---
.../jython/IPluginScriptRunnerFactory.java | 5 +-
.../framework/DisplaySettingsManager.java | 6 +--
.../client/application/ui/TypedTableGrid.java | 4 +-
.../ui/TypedTableGridColumnDefinitionUI.java | 5 +-
.../grid/ICellListenerAndLinkGenerator.java | 5 +-
.../application/ui/grid/ILinkGenerator.java | 4 +-
.../web/client/dto/EntityPropertyUpdates.java | 4 +-
.../dto/EntityPropertyUpdatesResult.java | 5 +-
.../client/web/client/dto/GridRowModels.java | 4 +-
.../web/client/dto/TypedTableResultSet.java | 6 ++-
.../web/server/AbstractClientService.java | 4 +-
.../AbstractCommonTableModelProvider.java | 5 +-
.../resultset/AbstractTableModelProvider.java | 4 +-
.../resultset/CachedResultSetManager.java | 5 +-
.../server/resultset/DataProviderAdapter.java | 8 +--
.../server/resultset/ITableModelProvider.java | 5 +-
.../server/jython/api/v1/DataType.java | 4 +-
.../server/jython/api/v1/EntityKind.java | 4 +-
.../basic/IEntityInformationHolder.java | 4 +-
.../shared/basic/IRegistratorHolder.java | 6 ++-
.../generic/shared/basic/ISerializable.java | 35 -------------
.../openbis/generic/shared/basic/TechId.java | 5 +-
.../shared/basic/dto/AbstractExpression.java | 4 +-
.../basic/dto/AbstractProjectUpdates.java | 4 +-
.../basic/dto/AbstractRegistrationHolder.java | 4 +-
.../basic/dto/ArchivingServiceKind.java | 4 +-
.../basic/dto/AssociatedEntityKind.java | 5 +-
.../basic/dto/AttachmentHolderKind.java | 4 +-
.../shared/basic/dto/AttachmentVersions.java | 5 +-
.../basic/dto/AuthorizationGroupUpdates.java | 4 +-
.../shared/basic/dto/BasicDataSetUpdates.java | 4 +-
.../basic/dto/BasicEntityDescription.java | 4 +-
.../basic/dto/BasicExperimentUpdates.java | 5 +-
.../basic/dto/BasicProjectIdentifier.java | 4 +-
.../shared/basic/dto/BasicSampleUpdates.java | 4 +-
.../shared/basic/dto/BatchOperationKind.java | 4 +-
.../basic/dto/BatchRegistrationResult.java | 4 +-
.../generic/shared/basic/dto/Code.java | 3 +-
.../shared/basic/dto/CodeAndLabel.java | 5 +-
.../shared/basic/dto/ColumnSetting.java | 5 +-
.../shared/basic/dto/CommonGridIDs.java | 4 +-
.../dto/DataSetAttributeSearchFieldKind.java | 4 +-
.../basic/dto/DataSetRelatedEntities.java | 4 +-
.../basic/dto/DataSetRelationshipRole.java | 4 +-
.../basic/dto/DataSetTypePropertyType.java | 4 +-
.../dto/DataSetTypeWithVocabularyTerms.java | 5 +-
.../shared/basic/dto/DataSetUpdateResult.java | 5 +-
.../basic/dto/DataStoreServiceKind.java | 4 +-
.../generic/shared/basic/dto/DataType.java | 4 +-
.../shared/basic/dto/DataTypeCode.java | 4 +-
.../basic/dto/DatabaseModificationKind.java | 5 +-
.../shared/basic/dto/DatasetLocation.java | 5 +-
.../dto/DatastoreServiceDescription.java | 4 +-
.../shared/basic/dto/DeletionType.java | 4 +-
.../basic/dto/DetailViewConfiguration.java | 5 +-
.../DetailedSearchAssociationCriteria.java | 5 +-
.../basic/dto/DetailedSearchCriteria.java | 5 +-
.../basic/dto/DetailedSearchCriterion.java | 4 +-
.../shared/basic/dto/DetailedSearchField.java | 7 ++-
.../basic/dto/DetailedSearchFieldKind.java | 6 +--
.../basic/dto/DetailedSearchSubCriteria.java | 4 +-
.../shared/basic/dto/DisplaySettings.java | 34 ++++++-------
.../generic/shared/basic/dto/EntityKind.java | 4 +-
.../shared/basic/dto/EntityReference.java | 5 +-
.../basic/dto/EntityTypePropertyType.java | 10 ++--
.../generic/shared/basic/dto/EntityVisit.java | 4 +-
.../ExperimentAttributeSearchFieldKind.java | 4 +-
.../dto/ExperimentBatchUpdateDetails.java | 5 +-
.../basic/dto/ExperimentTypePropertyType.java | 4 +-
.../basic/dto/ExperimentUpdateResult.java | 5 +-
.../generic/shared/basic/dto/Grantee.java | 6 +--
.../shared/basic/dto/IEntityProperty.java | 6 +--
.../shared/basic/dto/IExpressionUpdates.java | 5 +-
.../basic/dto/ISerializableComparable.java | 4 +-
.../generic/shared/basic/dto/Identifier.java | 5 +-
.../basic/dto/LastModificationState.java | 4 +-
.../generic/shared/basic/dto/LinkModel.java | 4 +-
.../dto/ListDataSetByPropertyCriteria.java | 4 +-
.../basic/dto/ListMaterialCriteria.java | 5 +-
.../shared/basic/dto/ListSampleCriteria.java | 4 +-
.../basic/dto/ManagedUiActionDescription.java | 4 +-
.../ManagedUiActionDescriptionFactory.java | 4 +-
.../basic/dto/ManagedUiDescription.java | 4 +-
.../dto/ManagedUiTableActionDescription.java | 4 +-
.../shared/basic/dto/MatchingEntity.java | 7 ++-
.../dto/MaterialAttributeSearchFieldKind.java | 4 +-
.../shared/basic/dto/MaterialIdentifier.java | 5 +-
.../basic/dto/MaterialTypePropertyType.java | 4 +-
.../shared/basic/dto/NewAttachment.java | 4 +-
.../basic/dto/NewAuthorizationGroup.java | 4 +-
.../shared/basic/dto/NewETPTAssignment.java | 4 +-
.../basic/dto/NewEntitiesWithTypes.java | 4 +-
.../shared/basic/dto/NewExpression.java | 4 +-
.../generic/shared/basic/dto/Null.java | 4 +-
.../shared/basic/dto/ParameterValue.java | 4 +-
.../shared/basic/dto/ParameterWithValue.java | 4 +-
.../basic/dto/PortletConfiguration.java | 8 +--
.../basic/dto/PropertyTypeWithVocabulary.java | 5 +-
.../shared/basic/dto/PropertyUpdates.java | 4 +-
.../generic/shared/basic/dto/QueryType.java | 4 +-
.../dto/RealNumberFormatingParameters.java | 4 +-
.../shared/basic/dto/RelationshipType.java | 4 +-
.../shared/basic/dto/ReportRowModel.java | 4 +-
.../shared/basic/dto/ReportingPluginType.java | 4 +-
.../shared/basic/dto/RoleWithHierarchy.java | 5 +-
.../dto/SampleAttributeSearchFieldKind.java | 4 +-
.../basic/dto/SampleBatchUpdateDetails.java | 5 +-
.../basic/dto/SampleParentWithDerived.java | 4 +-
.../generic/shared/basic/dto/SampleType.java | 4 +-
.../shared/basic/dto/SampleUpdateResult.java | 5 +-
.../generic/shared/basic/dto/ScriptType.java | 4 +-
.../basic/dto/SearchCriteriaConnection.java | 4 +-
.../generic/shared/basic/dto/SortInfo.java | 6 +--
.../generic/shared/basic/dto/TableModel.java | 4 +-
.../basic/dto/TableModelColumnHeader.java | 5 +-
.../shared/basic/dto/TableModelRow.java | 5 +-
.../basic/dto/TableModelRowWithObject.java | 6 +--
.../basic/dto/TrackingDataSetCriteria.java | 13 ++---
.../dto/TypedTableGridColumnDefinition.java | 6 +--
.../shared/basic/dto/TypedTableModel.java | 4 +-
.../dto/VocabularyTermBatchUpdateDetails.java | 4 +-
.../basic/dto/VocabularyTermReplacement.java | 4 +-
.../basic/dto/VocabularyTermWithStats.java | 5 +-
.../basic/dto/WebClientConfiguration.java | 4 +-
.../api/IManagedInputWidgetDescription.java | 4 +-
...IManagedInputWidgetDescriptionFactory.java | 4 +-
.../api/IManagedOutputWidgetDescription.java | 4 +-
.../basic/dto/api/IManagedProperty.java | 4 +-
.../basic/dto/api/IManagedUiAction.java | 5 +-
.../basic/dto/api/IManagedUiDescription.java | 5 +-
.../generic/shared/basic/dto/api/IPerson.java | 4 +-
.../shared/basic/dto/api/ITableModel.java | 4 +-
.../basic/dto/api/ManagedInputFieldType.java | 4 +-
.../dto/api/ManagedOutputWidgetType.java | 4 +-
.../ManagedTableActionRowSelectionType.java | 4 +-
.../openbis/generic/shared/dto/PermId.java | 5 +-
.../generic/shared/util/DataTypeUtils.java | 3 +-
.../shared/util/TypedTableModelBuilder.java | 4 +-
.../query/shared/basic/dto/QueryDatabase.java | 5 +-
.../basic/dto/QueryParameterBindings.java | 4 +-
.../web/server/CommonClientServiceTest.java | 6 +--
.../util/TypedTableModelBuilderTest.java | 51 ++++++++++---------
.../systemtest/TypedTableAssertions.java | 15 +++---
.../basic/dto/AbundanceColumnDefinition.java | 4 +-
.../basic/dto/AccessionNumberProvider.java | 5 +-
.../shared/basic/dto/AggregateFunction.java | 5 +-
.../shared/basic/dto/DataSetProtein.java | 5 +-
.../proteomics/shared/basic/dto/Peptide.java | 4 +-
.../shared/basic/dto/PeptideModification.java | 5 +-
.../shared/basic/dto/ProteinDetails.java | 4 +-
.../shared/basic/dto/ProteinInfo.java | 4 +-
.../basic/dto/ProteinRelatedSample.java | 4 +-
.../shared/basic/dto/ProteinSequence.java | 5 +-
.../shared/basic/dto/ProteinSummary.java | 5 +-
.../dto/SampleWithPropertiesAndAbundance.java | 4 +-
.../shared/basic/dto/Treatment.java | 5 +-
.../dss/etl/dto/api/v1/ChannelColorRGB.java | 5 +-
.../LibrarySampleBatchRegistrationForm.java | 5 +-
...erialBiologicalReplicateFeatureVector.java | 4 +-
...terialTechnicalReplicateFeatureVector.java | 5 +-
.../shared/basic/dto/AnalysisProcedures.java | 4 +-
.../shared/basic/dto/ChannelDescription.java | 5 +-
.../basic/dto/DatasetImagesReference.java | 5 +-
.../shared/basic/dto/DatasetReference.java | 4 +-
.../dto/ExperimentFeatureVectorSummary.java | 4 +-
.../shared/basic/dto/ExperimentReference.java | 5 +-
.../shared/basic/dto/FeatureValue.java | 5 +-
.../basic/dto/FeatureVectorDataset.java | 4 +-
.../shared/basic/dto/FeatureVectorValues.java | 4 +-
.../shared/basic/dto/ImageChannelStack.java | 5 +-
.../basic/dto/ImageDatasetParameters.java | 4 +-
.../shared/basic/dto/ImageSampleContent.java | 4 +-
.../basic/dto/InternalImageChannel.java | 4 +-
.../dto/InternalImageTransformationInfo.java | 5 +-
.../basic/dto/LibraryRegistrationInfo.java | 7 +--
.../shared/basic/dto/LogicalImageInfo.java | 4 +-
...rialBiologicalReplicateFeatureSummary.java | 5 +-
...erialFeatureVectorSummaryParametrized.java | 5 +-
...eatureVectorsFromAllExperimentsResult.java | 4 +-
.../dto/MaterialReplicaFeatureSummary.java | 4 +-
.../MaterialReplicaFeatureSummaryResult.java | 4 +-
...MaterialReplicaSummaryAggregationType.java | 4 +-
.../MaterialSimpleFeatureVectorSummary.java | 5 +-
.../basic/dto/MaterialSummarySettings.java | 4 +-
.../shared/basic/dto/NamedFeatureVector.java | 5 +-
.../shared/basic/dto/PlateContent.java | 4 +-
.../shared/basic/dto/PlateImages.java | 4 +-
.../shared/basic/dto/PlateMetadata.java | 4 +-
.../basic/dto/ScreeningDisplaySettings.java | 5 +-
.../shared/basic/dto/WellContent.java | 4 +-
.../basic/dto/WellFeatureVectorReference.java | 5 +-
.../screening/shared/basic/dto/WellImage.java | 5 +-
.../shared/basic/dto/WellLocation.java | 5 +-
.../shared/basic/dto/WellMetadata.java | 5 +-
.../shared/basic/dto/WellReference.java | 5 +-
.../shared/basic/dto/WellReplicaImage.java | 5 +-
.../shared/basic/dto/WellSearchCriteria.java | 19 ++++---
197 files changed, 506 insertions(+), 531 deletions(-)
delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ISerializable.java
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IPluginScriptRunnerFactory.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IPluginScriptRunnerFactory.java
index 7a89415f5b9..a87fd9c5c4b 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IPluginScriptRunnerFactory.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IPluginScriptRunnerFactory.java
@@ -16,13 +16,14 @@
package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
/**
* @author Piotr Buczek
*/
-public interface IPluginScriptRunnerFactory extends ISerializable
+public interface IPluginScriptRunnerFactory extends Serializable
{
String getScriptPath();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplaySettingsManager.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplaySettingsManager.java
index 0219b08469b..057b79dd0fd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplaySettingsManager.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplaySettingsManager.java
@@ -16,6 +16,7 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.framework;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -33,7 +34,6 @@ import com.extjs.gxt.ui.client.widget.grid.ColumnModel;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ColumnSetting;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DetailViewConfiguration;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings;
@@ -443,14 +443,14 @@ public class DisplaySettingsManager
/** @deprecated Should be used only by specific display settings manager */
@Deprecated
- public final ISerializable tryGetTechnologySpecificSettings(String technologyName)
+ public final Serializable tryGetTechnologySpecificSettings(String technologyName)
{
return displaySettings.getTechnologySpecificSettings().get(technologyName);
}
/** @deprecated Should be used only by specific display settings manager */
@Deprecated
- public final void setTechnologySpecificSettings(String technologyName, ISerializable newSettings)
+ public final void setTechnologySpecificSettings(String technologyName, Serializable newSettings)
{
displaySettings.getTechnologySpecificSettings().put(technologyName, newSettings);
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGrid.java
index dd7816f5dee..7edec7e8acc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGrid.java
@@ -16,6 +16,7 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -52,7 +53,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.TypedTableResultSe
import ch.systemsx.cisd.openbis.generic.shared.basic.GridRowModel;
import ch.systemsx.cisd.openbis.generic.shared.basic.IColumnDefinition;
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolder;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
@@ -68,7 +68,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TypedTableModel;
*
* @author Franz-Josef Elmer
*/
-public abstract class TypedTableGrid<T extends ISerializable>
+public abstract class TypedTableGrid<T extends Serializable>
extends
AbstractBrowserGrid<TableModelRowWithObject<T>, BaseEntityModel<TableModelRowWithObject<T>>>
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGridColumnDefinitionUI.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGridColumnDefinitionUI.java
index 20133498141..44e34ed2f92 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGridColumnDefinitionUI.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGridColumnDefinitionUI.java
@@ -16,9 +16,10 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.framework.IColumnDefinitionUI;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.ILinkGenerator;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ISerializableComparable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelColumnHeader;
@@ -29,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Vocabulary;
/**
* @author Franz-Josef Elmer
*/
-public class TypedTableGridColumnDefinitionUI<T extends ISerializable> extends
+public class TypedTableGridColumnDefinitionUI<T extends Serializable> extends
TypedTableGridColumnDefinition<T> implements
IColumnDefinitionUI<TableModelRowWithObject<T>>
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICellListenerAndLinkGenerator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICellListenerAndLinkGenerator.java
index dc407648da2..6c0dcf00352 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICellListenerAndLinkGenerator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICellListenerAndLinkGenerator.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelRowWithObject;
/**
@@ -25,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelRowWithObject
*
* @author Franz-Josef Elmer
*/
-public interface ICellListenerAndLinkGenerator<T extends ISerializable> extends ILinkGenerator<T>,
+public interface ICellListenerAndLinkGenerator<T extends Serializable> extends ILinkGenerator<T>,
ICellListener<TableModelRowWithObject<T>>
{
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ILinkGenerator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ILinkGenerator.java
index 05e3c2f3337..1193780b1eb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ILinkGenerator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ILinkGenerator.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid;
-import com.google.gwt.user.client.rpc.IsSerializable;
+import java.io.Serializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ISerializableComparable;
/**
* @author Franz-Josef Elmer
*/
-public interface ILinkGenerator<T extends IsSerializable>
+public interface ILinkGenerator<T extends Serializable>
{
public String tryGetLink(T entity, ISerializableComparable comparableValue);
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityPropertyUpdates.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityPropertyUpdates.java
index b776a69d741..74183385cd6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityPropertyUpdates.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityPropertyUpdates.java
@@ -16,10 +16,10 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.dto;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.PropertyUpdates;
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Piotr Buczek
*/
-public class EntityPropertyUpdates implements ISerializable
+public class EntityPropertyUpdates implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityPropertyUpdatesResult.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityPropertyUpdatesResult.java
index d58d66dedce..57af4244853 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityPropertyUpdatesResult.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityPropertyUpdatesResult.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -25,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Piotr Buczek
*/
-public class EntityPropertyUpdatesResult implements ISerializable
+public class EntityPropertyUpdatesResult implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridRowModels.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridRowModels.java
index db0fec1377b..9c055727ddc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridRowModels.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridRowModels.java
@@ -16,11 +16,11 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.dto;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import ch.systemsx.cisd.openbis.generic.shared.basic.GridRowModel;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelColumnHeader;
/**
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelColumnHeader;
*
* @author Tomasz Pylak
*/
-public class GridRowModels<T> extends ArrayList<GridRowModel<T>> implements ISerializable
+public class GridRowModels<T> extends ArrayList<GridRowModel<T>> implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/TypedTableResultSet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/TypedTableResultSet.java
index c2e23a9a8d7..2ede4c20271 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/TypedTableResultSet.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/TypedTableResultSet.java
@@ -16,9 +16,10 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.dto;
+import java.io.Serializable;
+
import com.google.gwt.user.client.rpc.IsSerializable;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.annotation.DoNotEscape;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelRowWithObject;
@@ -26,7 +27,8 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelRowWithObject
* @author Franz-Josef Elmer
*/
@DoNotEscape
-public class TypedTableResultSet<T extends ISerializable> implements IsSerializable, IResultSetHolder<TableModelRowWithObject<T>>
+public class TypedTableResultSet<T extends Serializable> implements IsSerializable,
+ IResultSetHolder<TableModelRowWithObject<T>>
{
private ResultSet<TableModelRowWithObject<T>> resultSet;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
index e8e7e9e3b1b..39f339a443d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
@@ -16,6 +16,7 @@
package ch.systemsx.cisd.openbis.generic.client.web.server;
+import java.io.Serializable;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
@@ -65,7 +66,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.server.util.XMLPropertyTransf
import ch.systemsx.cisd.openbis.generic.server.SessionConstants;
import ch.systemsx.cisd.openbis.generic.shared.IServer;
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolder;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BasicEntityType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings;
@@ -641,7 +641,7 @@ public abstract class AbstractClientService implements IClientService,
}
}
- protected <T extends ISerializable> TypedTableResultSet<T> listEntities(
+ protected <T extends Serializable> TypedTableResultSet<T> listEntities(
ITableModelProvider<T> provider,
IResultSetConfig<String, TableModelRowWithObject<T>> criteria)
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractCommonTableModelProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractCommonTableModelProvider.java
index cebd81f8129..7d5940bf470 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractCommonTableModelProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractCommonTableModelProvider.java
@@ -16,8 +16,9 @@
package ch.systemsx.cisd.openbis.generic.client.web.server.resultset;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
/**
* Superclass of {@link ITableModelProvider} which creates the table model lazily by using
@@ -25,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
*
* @author Franz-Josef Elmer
*/
-public abstract class AbstractCommonTableModelProvider<T extends ISerializable> extends
+public abstract class AbstractCommonTableModelProvider<T extends Serializable> extends
AbstractTableModelProvider<T>
{
protected final ICommonServer commonServer;
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 940363ee6d3..6598db5a88f 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
@@ -16,10 +16,10 @@
package ch.systemsx.cisd.openbis.generic.client.web.server.resultset;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelColumnHeader;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelRowWithObject;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TypedTableModel;
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TypedTableModel;
*
* @author Franz-Josef Elmer
*/
-public abstract class AbstractTableModelProvider<T extends ISerializable> implements
+public abstract class AbstractTableModelProvider<T extends Serializable> implements
ITableModelProvider<T>
{
private TypedTableModel<T> tableModel = null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java
index eff4ecd8b8c..4853ba173d6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java
@@ -60,7 +60,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.server.calculator.ITableDataP
import ch.systemsx.cisd.openbis.generic.client.web.server.util.XMLPropertyTransformer;
import ch.systemsx.cisd.openbis.generic.shared.basic.GridRowModel;
import ch.systemsx.cisd.openbis.generic.shared.basic.IColumnDefinition;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.PrimitiveValue;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.GridCustomColumn;
@@ -773,8 +772,8 @@ public final class CachedResultSetManager<K> implements IResultSetManager<K>, Se
{
@SuppressWarnings("unchecked")
IColumnDefinition<T> definition =
- (IColumnDefinition<T>) new TypedTableGridColumnDefinition<ISerializable>(
- header, null, "", null);
+ (IColumnDefinition<T>) new TypedTableGridColumnDefinition<Serializable>(header,
+ null, "", null);
newAvailableColumns.add(definition);
String id = header.getId();
if (header.isHidden() == false || idsOfPresentedColumns.contains(id))
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DataProviderAdapter.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DataProviderAdapter.java
index ba2cf943ec8..4df58b4410f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DataProviderAdapter.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DataProviderAdapter.java
@@ -16,25 +16,25 @@
package ch.systemsx.cisd.openbis.generic.client.web.server.resultset;
+import java.io.Serializable;
import java.util.Collections;
import java.util.List;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelColumnHeader;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelRowWithObject;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TypedTableModel;
/**
* Adapter which turns a {@link ITableModelProvider} into a {@link IOriginalDataProvider}.
- *
+ *
* @author Franz-Josef Elmer
*/
-public final class DataProviderAdapter<T extends ISerializable> implements
+public final class DataProviderAdapter<T extends Serializable> implements
IOriginalDataProvider<TableModelRowWithObject<T>>
{
private final ITableModelProvider<T> provider;
-
+
private TypedTableModel<T> tableModel;
public DataProviderAdapter(ITableModelProvider<T> provider)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ITableModelProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ITableModelProvider.java
index 8ebb043e825..d61df720188 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ITableModelProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ITableModelProvider.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.generic.client.web.server.resultset;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TypedTableModel;
/**
@@ -24,7 +25,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TypedTableModel;
*
* @author Franz-Josef Elmer
*/
-public interface ITableModelProvider<T extends ISerializable>
+public interface ITableModelProvider<T extends Serializable>
{
/**
* Returns the table model limited as specified. For {@link Integer#MAX_VALUE} the full table
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/DataType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/DataType.java
index 7ade3a47663..e366491e827 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/DataType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/DataType.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.server.jython.api.v1;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Available types for {@link IPropertyType}.
*
* @author Kaloyan Enimanev
*/
-public enum DataType implements ISerializable
+public enum DataType implements Serializable
{
INTEGER, VARCHAR, MULTILINE_VARCHAR, REAL, TIMESTAMP, BOOLEAN, CONTROLLEDVOCABULARY, MATERIAL,
HYPERLINK, XML;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/EntityKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/EntityKind.java
index fdf627d7ead..75e947ae994 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/EntityKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/EntityKind.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.server.jython.api.v1;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Available entity kinds.
*
* @author Kaloyan Enimanev
*/
-public enum EntityKind implements ISerializable
+public enum EntityKind implements Serializable
{
EXPERIMENT, SAMPLE, DATA_SET, MATERIAL;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolder.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolder.java
index 81818432038..d9d7f7a85fd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolder.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolder.java
@@ -16,6 +16,8 @@
package ch.systemsx.cisd.openbis.generic.shared.basic;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BasicEntityType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
@@ -25,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
*
* @author Piotr Buczek
*/
-public interface IEntityInformationHolder extends ISerializable, IIdAndCodeHolder
+public interface IEntityInformationHolder extends Serializable, IIdAndCodeHolder
{
/**
* Returns the entity type of this matching entity.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IRegistratorHolder.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IRegistratorHolder.java
index 1589dacff41..ec5e0e538d0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IRegistratorHolder.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IRegistratorHolder.java
@@ -16,14 +16,16 @@
package ch.systemsx.cisd.openbis.generic.shared.basic;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Person;
/**
* Interface of DTOs having a registrator attribute.
- *
+ *
* @author Franz-Josef Elmer
*/
-public interface IRegistratorHolder extends ISerializable
+public interface IRegistratorHolder extends Serializable
{
public Person getRegistrator();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ISerializable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ISerializable.java
deleted file mode 100644
index caf62b054a8..00000000000
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ISerializable.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2010 ETH Zuerich, CISD
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.systemsx.cisd.openbis.generic.shared.basic;
-
-import java.io.Serializable;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * Marker interface indicating that a type is both {@link Serializable} and {@link IsSerializable}
- * (can be used as 'basic' DTOs that can be transferred between GWT client and server).
- * <p>
- * NOTE: All 'basic' DTO's should implement interface this because of java.io serialization used by
- * ReflectiveStringEscaper and DisplaySettings.
- *
- * @author Piotr Buczek
- */
-public interface ISerializable extends IsSerializable, Serializable
-{
-
-}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TechId.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TechId.java
index 9f01f7115d0..309027b6cb1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TechId.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TechId.java
@@ -16,6 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -27,13 +28,13 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Piotr Buczek
*/
-public class TechId implements IIdHolder, ISerializable
+public class TechId implements IIdHolder, Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
private Long id;
- protected TechId()
+ public TechId()
{
// for serialization
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractExpression.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractExpression.java
index fd00b6a7cee..44614aa782d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractExpression.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractExpression.java
@@ -16,10 +16,10 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Date;
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
/**
* Stores information describing the common part of grid custom filter and column.
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
* @author Izabela Adamczyk
*/
public abstract class AbstractExpression extends AbstractRegistrationHolder implements
- ISerializable, IIdHolder, IExpressionUpdates
+ Serializable, IIdHolder, IExpressionUpdates
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractProjectUpdates.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractProjectUpdates.java
index 183a4ede8e4..0151561be24 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractProjectUpdates.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractProjectUpdates.java
@@ -16,9 +16,9 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Date;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
/**
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
*
* @author Tomasz Pylak
*/
-public class AbstractProjectUpdates implements ISerializable
+public class AbstractProjectUpdates implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractRegistrationHolder.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractRegistrationHolder.java
index ef613642c0e..5783b1bbd0b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractRegistrationHolder.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractRegistrationHolder.java
@@ -16,17 +16,17 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Date;
import ch.systemsx.cisd.openbis.generic.shared.basic.IRegistratorHolder;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
/**
* Super class of <i>DTO</i>s which hold registration data.
*
* @author Christian Ribeaud
*/
-public abstract class AbstractRegistrationHolder implements ISerializable, IRegistratorHolder
+public abstract class AbstractRegistrationHolder implements Serializable, IRegistratorHolder
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ArchivingServiceKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ArchivingServiceKind.java
index 2f3964ea1a8..7db6acf72b0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ArchivingServiceKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ArchivingServiceKind.java
@@ -16,12 +16,12 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* @author Piotr Buczek
*/
-public enum ArchivingServiceKind implements ISerializable
+public enum ArchivingServiceKind implements Serializable
{
ARCHIVE("Archiving"), UNARCHIVE("Unarchiving"), LOCK("Disable Archiving"), UNLOCK(
"Enable Archiving");
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AssociatedEntityKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AssociatedEntityKind.java
index 82e387d8b94..25737bfd7e7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AssociatedEntityKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AssociatedEntityKind.java
@@ -16,20 +16,19 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
import java.util.Set;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* The <i>GWT</i> counterpart to
* ch.systemsx.cisd.openbis.generic.shared.api.v1.SearchableEntityKind.
*
* @author Piotr Buczek
*/
-public enum AssociatedEntityKind implements ISerializable
+public enum AssociatedEntityKind implements Serializable
{
SAMPLE("Sample", EntityKind.SAMPLE, EnumSet.of(EntityKind.DATA_SET)),
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentHolderKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentHolderKind.java
index e1046f93a67..23ad8311218 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentHolderKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentHolderKind.java
@@ -16,12 +16,12 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* @author Izabela Adamczyk
*/
-public enum AttachmentHolderKind implements ISerializable
+public enum AttachmentHolderKind implements Serializable
{
PROJECT, EXPERIMENT, SAMPLE
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentVersions.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentVersions.java
index 0a5566e505f..ed3b5dfc79d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentVersions.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentVersions.java
@@ -16,17 +16,16 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Collections;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Encapsulation of all versions of an {@link Attachment} file.
*
* @author Piotr Buczek
*/
-public class AttachmentVersions implements Comparable<AttachmentVersions>, ISerializable
+public class AttachmentVersions implements Comparable<AttachmentVersions>, Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AuthorizationGroupUpdates.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AuthorizationGroupUpdates.java
index 5f445b05036..4842d8524cb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AuthorizationGroupUpdates.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AuthorizationGroupUpdates.java
@@ -16,9 +16,9 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Date;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
/**
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
*
* @author Izabela Adamczyk
*/
-public class AuthorizationGroupUpdates implements ISerializable
+public class AuthorizationGroupUpdates implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicDataSetUpdates.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicDataSetUpdates.java
index 89e3cbc1406..b84afdbe276 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicDataSetUpdates.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicDataSetUpdates.java
@@ -16,16 +16,16 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Date;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
/**
* @author Piotr Buczek
*/
-public class BasicDataSetUpdates implements ISerializable
+public class BasicDataSetUpdates implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicEntityDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicEntityDescription.java
index 75305a1d159..6bba92ccd46 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicEntityDescription.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicEntityDescription.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Entity kind and identifier.
*
* @author Izabela Adamczyk
*/
-public class BasicEntityDescription implements ISerializable
+public class BasicEntityDescription implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicExperimentUpdates.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicExperimentUpdates.java
index 240e4df004f..bac2f50e1c1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicExperimentUpdates.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicExperimentUpdates.java
@@ -16,15 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Date;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* @author Tomasz Pylak
*/
-public class BasicExperimentUpdates implements ISerializable
+public class BasicExperimentUpdates implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicProjectIdentifier.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicProjectIdentifier.java
index 929fb763ff1..fbf86cffd96 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicProjectIdentifier.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicProjectIdentifier.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* The <i>GWT</i> counterpart to
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
*
* @author Piotr Buczek
*/
-public class BasicProjectIdentifier implements ISerializable
+public class BasicProjectIdentifier implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicSampleUpdates.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicSampleUpdates.java
index 1a908b44055..853d3a48eed 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicSampleUpdates.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicSampleUpdates.java
@@ -16,16 +16,16 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Date;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
/**
* @author Izabela Adamczyk
*/
-public class BasicSampleUpdates implements ISerializable
+public class BasicSampleUpdates implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BatchOperationKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BatchOperationKind.java
index 8f8cf74b7af..44f10dffb78 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BatchOperationKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BatchOperationKind.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Enumeration for batch operation kinds.
*
* @author Piotr Buczek
*/
-public enum BatchOperationKind implements ISerializable
+public enum BatchOperationKind implements Serializable
{
REGISTRATION("Registration"), UPDATE("Update");
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BatchRegistrationResult.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BatchRegistrationResult.java
index 7d3dc6c902f..86b9da34ede 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BatchRegistrationResult.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BatchRegistrationResult.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Batch registration is based on file input. This class returns to the client a small message after
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
*
* @author Christian Ribeaud
*/
-public class BatchRegistrationResult implements ISerializable
+public class BatchRegistrationResult implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Code.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Code.java
index 5cddba3eb8a..4ef7582c6b6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Code.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Code.java
@@ -24,14 +24,13 @@ import java.util.List;
import ch.systemsx.cisd.common.annotation.BeanProperty;
import ch.systemsx.cisd.openbis.generic.shared.basic.ICodeHolder;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
/**
* A code.
*
* @author Christian Ribeaud
*/
-public class Code<T extends Code<T>> implements ISerializable, ICodeHolder, Comparable<T>
+public class Code<T extends Code<T>> implements Serializable, ICodeHolder, Comparable<T>
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CodeAndLabel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CodeAndLabel.java
index d3a3b9562e8..8bc977b9e5d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CodeAndLabel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CodeAndLabel.java
@@ -16,11 +16,10 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Value object which has a label and a normalized code. Normalized means that the original code
* arguments turn to upper case and any symbol which isn't from A-Z or 0-9 is replaced by an
@@ -28,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
*
* @author Franz-Josef Elmer
*/
-public class CodeAndLabel implements ISerializable
+public class CodeAndLabel implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ColumnSetting.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ColumnSetting.java
index f1dfc2907c6..61a1ca3fde5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ColumnSetting.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ColumnSetting.java
@@ -18,19 +18,16 @@ package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
import java.io.Serializable;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SortInfo.SortDir;
/**
* Class storing personalised display settings for a table column. This class implements
* {@link Serializable} not only for transferring it's content remotely but also to store it in the
* database. Thus, CHANGES IN THIS CLASS MIGHT LEAD TO A LOST OF PERSONAL SETTINGS.
- * <p>
- * Note: This class has to be Java serializable and GWT serializable.
*
* @author Franz-Josef Elmer
*/
-public class ColumnSetting implements ISerializable
+public class ColumnSetting implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CommonGridIDs.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CommonGridIDs.java
index 890de18ebaf..dc25d12650f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CommonGridIDs.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CommonGridIDs.java
@@ -16,12 +16,12 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* @author Franz-Josef Elmer
*/
-public class CommonGridIDs implements ISerializable
+public class CommonGridIDs implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetAttributeSearchFieldKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetAttributeSearchFieldKind.java
index c949441f26b..7b361bba5c8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetAttributeSearchFieldKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetAttributeSearchFieldKind.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Kinds of fields connected with Data Set attributes that can be used in detailed text queries.
*
* @author Piotr Buczek
*/
-public enum DataSetAttributeSearchFieldKind implements ISerializable, IAttributeSearchFieldKind
+public enum DataSetAttributeSearchFieldKind implements Serializable, IAttributeSearchFieldKind
{
CODE("Code"),
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetRelatedEntities.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetRelatedEntities.java
index a323f828ba3..0d7cb6ccd0b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetRelatedEntities.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetRelatedEntities.java
@@ -16,17 +16,17 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolder;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
/**
* Encapsulates entities related to data sets.
*
* @author Piotr Buczek
*/
-public class DataSetRelatedEntities implements ISerializable
+public class DataSetRelatedEntities implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetRelationshipRole.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetRelationshipRole.java
index f528453c79f..8e53888ff0e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetRelationshipRole.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetRelationshipRole.java
@@ -16,12 +16,12 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* @author Piotr Buczek
*/
-public enum DataSetRelationshipRole implements ISerializable
+public enum DataSetRelationshipRole implements Serializable
{
CONTAINER, PARENT, CHILD;
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetTypePropertyType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetTypePropertyType.java
index f36c3a1901d..98a92beb08d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetTypePropertyType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetTypePropertyType.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* The {@link EntityTypePropertyType} extension for <i>Data Set Type</i>.
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
* @author Izabela Adamczyk
*/
public class DataSetTypePropertyType extends EntityTypePropertyType<DataSetType> implements
- ISerializable
+ Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetTypeWithVocabularyTerms.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetTypeWithVocabularyTerms.java
index 9c02de19b50..11a8a782118 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetTypeWithVocabularyTerms.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetTypeWithVocabularyTerms.java
@@ -16,15 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* @author Franz-Josef Elmer
*/
-public class DataSetTypeWithVocabularyTerms implements ISerializable
+public class DataSetTypeWithVocabularyTerms implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetUpdateResult.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetUpdateResult.java
index 091b31db573..2199e7b659c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetUpdateResult.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetUpdateResult.java
@@ -16,17 +16,16 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Date;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Stores result of data set update.
*
* @author Piotr Buczek
*/
-public class DataSetUpdateResult implements ISerializable
+public class DataSetUpdateResult implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataStoreServiceKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataStoreServiceKind.java
index 4056c970e08..751b62bd725 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataStoreServiceKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataStoreServiceKind.java
@@ -16,12 +16,12 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* @author Tomasz Pylak
*/
-public enum DataStoreServiceKind implements ISerializable
+public enum DataStoreServiceKind implements Serializable
{
// Do not refactor names - they are stored in database.
PROCESSING("Processing"), QUERIES("Query");
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataType.java
index 95169cabc3f..c8f68de40eb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataType.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* A class that represents a data type.
*
* @author Izabela Adamczyk
*/
-public final class DataType implements ISerializable
+public final class DataType implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataTypeCode.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataTypeCode.java
index 5a643282b4d..fd9a90369ef 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataTypeCode.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataTypeCode.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Available types of entity properties.
*
* @author Izabela Adamczyk
*/
-public enum DataTypeCode implements ISerializable
+public enum DataTypeCode implements Serializable
{
// Do not refactor names - they are stored in database.
INTEGER, VARCHAR, MULTILINE_VARCHAR, REAL, TIMESTAMP, BOOLEAN, CONTROLLEDVOCABULARY, MATERIAL,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseModificationKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseModificationKind.java
index a2c14cd880c..0810d95fd6f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseModificationKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseModificationKind.java
@@ -16,20 +16,19 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import com.google.gwt.user.client.rpc.IsSerializable;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Stores the kind of database object that was modified and the kind of modification.
*
* @author Tomasz Pylak
*/
-public class DatabaseModificationKind implements ISerializable
+public class DatabaseModificationKind implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatasetLocation.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatasetLocation.java
index 8e49bd28a54..dc3e6af44ae 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatasetLocation.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatasetLocation.java
@@ -16,15 +16,16 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.ICodeHolder;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
/**
* Encapsulates location and code of a data set in a store.
*
* @author Piotr Buczek
*/
-public class DatasetLocation implements IDatasetLocation, ISerializable, ICodeHolder
+public class DatasetLocation implements IDatasetLocation, Serializable, ICodeHolder
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatastoreServiceDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatastoreServiceDescription.java
index 3b84cac5af4..c7f285a2f9d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatastoreServiceDescription.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatastoreServiceDescription.java
@@ -16,17 +16,17 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Arrays;
import ch.systemsx.cisd.openbis.generic.shared.basic.IReportInformationProvider;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
/**
* Description of one datastore server plugin task: key, label, dataset type codes.
*
* @author Tomasz Pylak
*/
-public class DatastoreServiceDescription implements IReportInformationProvider, ISerializable,
+public class DatastoreServiceDescription implements IReportInformationProvider, Serializable,
Comparable<DatastoreServiceDescription>
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletionType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletionType.java
index 28aab935fcb..665510f8a5e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletionType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletionType.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Types of deletion operations.
*
* @author Piotr Buczek
*/
-public enum DeletionType implements ISerializable
+public enum DeletionType implements Serializable
{
PERMANENT, TRASH
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailViewConfiguration.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailViewConfiguration.java
index 8413ce06235..5591f18abd6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailViewConfiguration.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailViewConfiguration.java
@@ -16,17 +16,16 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Entity detail view configuration.
*
* @author Izabela Adamczyk
*/
-public class DetailViewConfiguration implements ISerializable
+public class DetailViewConfiguration implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchAssociationCriteria.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchAssociationCriteria.java
index fe71e3e5691..434db53ec5e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchAssociationCriteria.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchAssociationCriteria.java
@@ -16,16 +16,15 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Collection;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Describes detailed search assiciation criteria for with specified entity kind.
*
* @author Piotr Buczek
*/
-public class DetailedSearchAssociationCriteria implements ISerializable
+public class DetailedSearchAssociationCriteria implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriteria.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriteria.java
index ec932652107..47afda719d6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriteria.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriteria.java
@@ -16,18 +16,17 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Describes detailed search criteria specific to an entity.
*
* @author Izabela Adamczyk
* @author Piotr Buczek
*/
-public class DetailedSearchCriteria implements ISerializable
+public class DetailedSearchCriteria implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriterion.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriterion.java
index c91b484a9b6..0af4c4ec8c9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriterion.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriterion.java
@@ -16,13 +16,13 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* @author Izabela Adamczyk
* @author Piotr Buczek
*/
-public class DetailedSearchCriterion implements ISerializable
+public class DetailedSearchCriterion implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchField.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchField.java
index de671983559..342085c9f26 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchField.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchField.java
@@ -16,10 +16,9 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Full specification of the field connected with an entity which can be used in detailed text
* queries.
@@ -27,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
* @author Tomasz Pylak
* @author Piotr Buczek
*/
-public class DetailedSearchField implements ISerializable
+public class DetailedSearchField implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
@@ -68,7 +67,7 @@ public class DetailedSearchField implements ISerializable
{
return new DetailedSearchField(DetailedSearchFieldKind.REGISTRATOR, null);
}
-
+
private static DetailedSearchField createAttributeField(String code)
{
assert code != null : "code not set";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchFieldKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchFieldKind.java
index d8dae13331d..2bb86f63c60 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchFieldKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchFieldKind.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* General kinds of fields that can be used in detailed text query for an entity.
*
* @author Piotr Buczek
*/
-public enum DetailedSearchFieldKind implements ISerializable
+public enum DetailedSearchFieldKind implements Serializable
{
ANY_FIELD("Any Field"),
@@ -32,7 +32,7 @@ public enum DetailedSearchFieldKind implements ISerializable
PROPERTY("Property"),
ATTRIBUTE(""),
-
+
REGISTRATOR("Registrator");
private final String description;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchSubCriteria.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchSubCriteria.java
index d01479f7db2..0ac7c0db68a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchSubCriteria.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchSubCriteria.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Describes detailed search sub criteria for specified associated entity kind.
*
* @author Piotr Buczek
*/
-public class DetailedSearchSubCriteria implements ISerializable
+public class DetailedSearchSubCriteria implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DisplaySettings.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DisplaySettings.java
index b6fdbe766d0..d856f42792e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DisplaySettings.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DisplaySettings.java
@@ -22,8 +22,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Class storing personalized display settings. This class implements {@link Serializable} not only
* for transferring it's content remotely but also to store it in the database. Thus, CHANGES IN
@@ -36,15 +34,15 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
*
* @author Franz-Josef Elmer
*/
-public class DisplaySettings implements ISerializable
+public class DisplaySettings implements Serializable
{
private static final long serialVersionUID = 1L;
private Map<String, List<ColumnSetting>> columnSettings =
new HashMap<String, List<ColumnSetting>>();
- private Map<String, ISerializable> technologySpecificSettings =
- new HashMap<String, ISerializable>();
+ private Map<String, Serializable> technologySpecificSettings =
+ new HashMap<String, Serializable>();
private Map<String, String> tabSettings = new HashMap<String, String>();
@@ -69,18 +67,18 @@ public class DisplaySettings implements ISerializable
private Map<String, Boolean> panelCollapsedSettings = new HashMap<String, Boolean>();
private Map<String, Integer> panelSizeSettings = new HashMap<String, Integer>();
-
+
private List<EntityVisit> visits;
-
+
private Map<String, PortletConfiguration> portletConfigurations;
/** @deprecated Should be used only by DisplaySettingsManager. */
@Deprecated
- public Map<String, ISerializable> getTechnologySpecificSettings()
+ public Map<String, Serializable> getTechnologySpecificSettings()
{
if (technologySpecificSettings == null)
{
- technologySpecificSettings = new HashMap<String, ISerializable>();
+ technologySpecificSettings = new HashMap<String, Serializable>();
}
return technologySpecificSettings;
}
@@ -161,7 +159,7 @@ public class DisplaySettings implements ISerializable
// for serialization
@SuppressWarnings("unused")
- private void setTechnologySpecificSettings(Map<String, ISerializable> technologySpecificSettings)
+ private void setTechnologySpecificSettings(Map<String, Serializable> technologySpecificSettings)
{
this.technologySpecificSettings = technologySpecificSettings;
}
@@ -259,14 +257,14 @@ public class DisplaySettings implements ISerializable
{
this.ignoreLastHistoryToken = ignoreLastHistoryToken;
}
-
+
/** @deprecated Should be used only by DisplaySettingsManager. */
@Deprecated
public void addEntityVisit(EntityVisit entityVisit)
{
getVisits().add(entityVisit);
}
-
+
/** @deprecated Should be used only by DisplaySettingsManager. */
@Deprecated
public List<EntityVisit> getVisits()
@@ -277,14 +275,14 @@ public class DisplaySettings implements ISerializable
}
return visits;
}
-
+
/** @deprecated Should be used only by DisplaySettingsManager. */
@Deprecated
public void addPortlet(PortletConfiguration portletConfiguration)
{
addPortlet(getPortletConfigurations(), portletConfiguration);
}
-
+
/** @deprecated Should be used only by DisplaySettingsManager. */
@Deprecated
public Map<String, PortletConfiguration> getPortletConfigurations()
@@ -293,12 +291,14 @@ public class DisplaySettings implements ISerializable
{
portletConfigurations = new HashMap<String, PortletConfiguration>();
// Default portlets
- addPortlet(portletConfigurations, new PortletConfiguration(StandardPortletNames.WELCOME));
- addPortlet(portletConfigurations, new PortletConfiguration(StandardPortletNames.HISTORY));
+ addPortlet(portletConfigurations,
+ new PortletConfiguration(StandardPortletNames.WELCOME));
+ addPortlet(portletConfigurations,
+ new PortletConfiguration(StandardPortletNames.HISTORY));
}
return portletConfigurations;
}
-
+
private void addPortlet(Map<String, PortletConfiguration> configurations,
PortletConfiguration portletConfiguration)
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityKind.java
index 1b7b2a9e340..a4d01c666a2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityKind.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* The <i>GWT</i> counterpart to
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
*
* @author Christian Ribeaud
*/
-public enum EntityKind implements ISerializable
+public enum EntityKind implements Serializable
{
MATERIAL("Material"), EXPERIMENT("Experiment"), SAMPLE("Sample"), DATA_SET("Data Set");
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityReference.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityReference.java
index 22fa06e29ad..2c17a58070a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityReference.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityReference.java
@@ -16,8 +16,9 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolderWithPermId;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
/**
* Reference to an entity with minimal information to uniquely identify it in the database and to
@@ -25,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
*
* @author Tomasz Pylak
*/
-public class EntityReference implements ISerializable, IEntityInformationHolderWithPermId
+public class EntityReference implements Serializable, IEntityInformationHolderWithPermId
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityTypePropertyType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityTypePropertyType.java
index 78a284c6ba3..69fb60c54d2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityTypePropertyType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityTypePropertyType.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* An <i>abstract</i> entity type property type.
*
* @author Christian Ribeaud
*/
-public abstract class EntityTypePropertyType<T extends EntityType> implements ISerializable,
+public abstract class EntityTypePropertyType<T extends EntityType> implements Serializable,
Comparable<EntityTypePropertyType<T>>
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
@@ -121,12 +121,12 @@ public abstract class EntityTypePropertyType<T extends EntityType> implements IS
* always use false for dynamically computed properties. Only dynamically managed properties
* take this value into account.
*
- * @param showInEditView Pass in true if this property should be shown in edit and
- * update views.
+ * @param showInEditView Pass in true if this property should be shown in edit and update views.
*/
public final void setShownInEditView(final boolean showInEditView)
{
- // Just set the value, the semantics of how this is applicable to dynamic / simple properties
+ // Just set the value, the semantics of how this is applicable to dynamic / simple
+ // properties
// is implemented in the getter.
this.showInEditView = showInEditView;
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityVisit.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityVisit.java
index c5e2649bafb..bd1fcdfc270 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityVisit.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityVisit.java
@@ -16,10 +16,10 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Date;
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolderWithIdentifier;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
/**
* Visit of an entity. Objects of this class are created when the detail view of an entity is opened
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
*
* @author Franz-Josef Elmer
*/
-public class EntityVisit implements ISerializable
+public class EntityVisit implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentAttributeSearchFieldKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentAttributeSearchFieldKind.java
index 44f0ebed202..e09747e3f4f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentAttributeSearchFieldKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentAttributeSearchFieldKind.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Kinds of fields connected with Experiment attributes that can be used in detailed text queries.
*
* @author Piotr Buczek
*/
-public enum ExperimentAttributeSearchFieldKind implements ISerializable, IAttributeSearchFieldKind
+public enum ExperimentAttributeSearchFieldKind implements Serializable, IAttributeSearchFieldKind
{
CODE("Code"),
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentBatchUpdateDetails.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentBatchUpdateDetails.java
index e93f0d4806b..e6882714d09 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentBatchUpdateDetails.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentBatchUpdateDetails.java
@@ -16,16 +16,15 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Set;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Holds information about which experiment attributes should be updated.
*
* @author Piotr Buczek
*/
-public class ExperimentBatchUpdateDetails implements ISerializable
+public class ExperimentBatchUpdateDetails implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentTypePropertyType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentTypePropertyType.java
index 2d20f41b214..28a8fe80672 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentTypePropertyType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentTypePropertyType.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* The {@link EntityTypePropertyType} extension for <i>Experiment Type</i>.
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
* @author Izabela Adamczyk
*/
public class ExperimentTypePropertyType extends EntityTypePropertyType<ExperimentType> implements
- ISerializable
+ Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentUpdateResult.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentUpdateResult.java
index 9ed1574c9b1..70225051896 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentUpdateResult.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentUpdateResult.java
@@ -16,17 +16,16 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Date;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Stores result of experiment update.
*
* @author Izabela Adamczyk
*/
-public class ExperimentUpdateResult implements ISerializable
+public class ExperimentUpdateResult implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Grantee.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Grantee.java
index b33286fab2c..20b216927e4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Grantee.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Grantee.java
@@ -16,16 +16,16 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import com.google.gwt.user.client.rpc.IsSerializable;
+import java.io.Serializable;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import com.google.gwt.user.client.rpc.IsSerializable;
/**
* Role grantee.
*
* @author Izabela Adamczyk
*/
-public class Grantee implements ISerializable
+public class Grantee implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IEntityProperty.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IEntityProperty.java
index 3e0c07d96f8..7181b6f59ce 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IEntityProperty.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IEntityProperty.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* An interface for entity properties.
*
* @author Bernd Rinn
*/
-public interface IEntityProperty extends ISerializable, Comparable<IEntityProperty>
+public interface IEntityProperty extends Serializable, Comparable<IEntityProperty>
{
public static final IEntityProperty[] EMPTY_ARRAY = new IEntityProperty[0];
@@ -56,7 +56,7 @@ public interface IEntityProperty extends ISerializable, Comparable<IEntityProper
Long getOrdinal();
boolean isManaged();
-
+
boolean isScriptable();
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IExpressionUpdates.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IExpressionUpdates.java
index b2f365b2a03..043f3b8fbc0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IExpressionUpdates.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IExpressionUpdates.java
@@ -16,8 +16,9 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
/**
* Description of the updates which should be performed on a stored expression (e.g. grid custom
@@ -25,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
*
* @author Piotr Buczek
*/
-public interface IExpressionUpdates extends IIdHolder, ISerializable
+public interface IExpressionUpdates extends IIdHolder, Serializable
{
String getDescription();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISerializableComparable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISerializableComparable.java
index 9618ead4554..b489934cb6e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISerializableComparable.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISerializableComparable.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Interface for objects which are comparable, java.io.Serializable and GWT serializable.
@@ -24,6 +24,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
*
* @author Franz-Josef Elmer
*/
-public interface ISerializableComparable extends ISerializable, Comparable<ISerializableComparable>
+public interface ISerializableComparable extends Serializable, Comparable<ISerializableComparable>
{
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Identifier.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Identifier.java
index 2dcd7c9fa05..9e7e2f2875d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Identifier.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Identifier.java
@@ -21,14 +21,13 @@ import java.util.Comparator;
import ch.systemsx.cisd.common.annotation.BeanProperty;
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdentifierHolder;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
/**
* An identifier.
*
* @author Christian Ribeaud
*/
-public class Identifier<T extends Identifier<T>> implements ISerializable, Comparable<T>,
+public class Identifier<T extends Identifier<T>> implements Serializable, Comparable<T>,
IIdentifierHolder
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
@@ -39,7 +38,7 @@ public class Identifier<T extends Identifier<T>> implements ISerializable, Compa
new IdentifierHolderComparator();
private String identifier;
-
+
private String permID;
public void setPermID(String permID)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LastModificationState.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LastModificationState.java
index 3e9a5200191..4d5588b572c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LastModificationState.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LastModificationState.java
@@ -16,12 +16,12 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.annotation.DoNotEscape;
/**
@@ -31,7 +31,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.annotation.DoNotEscape;
* @author Tomasz Pylak
*/
@DoNotEscape
-public class LastModificationState implements ISerializable
+public class LastModificationState implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkModel.java
index 60b6d4469c2..37ed54a57c1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkModel.java
@@ -22,8 +22,6 @@ import java.util.List;
import com.google.gwt.user.client.rpc.IsSerializable;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* A model for reporting plug-ins of type DSS_LINK. It keeps the different parts of the URL separate
* so that users can easily use only the parts they need.
@@ -41,7 +39,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
*
* @author Chandrasekhar Ramakrishnan
*/
-public class LinkModel implements ISerializable
+public class LinkModel implements Serializable
{
// Package visible constant
static final String SESSION_ID_PARAMETER_NAME = "sessionID";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListDataSetByPropertyCriteria.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListDataSetByPropertyCriteria.java
index ed3158f0af0..9ac0a46e44a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListDataSetByPropertyCriteria.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListDataSetByPropertyCriteria.java
@@ -16,12 +16,12 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* @author Izabela Adamczyk
*/
-public class ListDataSetByPropertyCriteria implements ISerializable
+public class ListDataSetByPropertyCriteria implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListMaterialCriteria.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListMaterialCriteria.java
index c0255f9b160..994394262ed 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListMaterialCriteria.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListMaterialCriteria.java
@@ -16,16 +16,15 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Collection;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Criteria for listing <i>materials</i>.
*
* @author Izabela Adamczyk
*/
-public final class ListMaterialCriteria implements ISerializable
+public final class ListMaterialCriteria implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListSampleCriteria.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListSampleCriteria.java
index be31d0c5d95..26516a708b3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListSampleCriteria.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListSampleCriteria.java
@@ -16,10 +16,10 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Arrays;
import java.util.Collection;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
/**
@@ -37,7 +37,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
* @author Tomasz Pylak
* @author Piotr Buczek
*/
-public class ListSampleCriteria implements ISerializable
+public class ListSampleCriteria implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiActionDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiActionDescription.java
index 1d93280a129..a77668bc3d6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiActionDescription.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiActionDescription.java
@@ -16,10 +16,10 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedInputWidgetDescription;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedUiAction;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IPerson;
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IPerson;
*
* @author Piotr Buczek
*/
-public class ManagedUiActionDescription implements IManagedUiAction, ISerializable
+public class ManagedUiActionDescription implements IManagedUiAction, Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiActionDescriptionFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiActionDescriptionFactory.java
index 183868c00ad..d755c94758e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiActionDescriptionFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiActionDescriptionFactory.java
@@ -16,9 +16,9 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Arrays;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedInputWidgetDescription;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedInputWidgetDescriptionFactory;
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedInputWidget
* @author Piotr Buczek
*/
public class ManagedUiActionDescriptionFactory implements IManagedInputWidgetDescriptionFactory,
- ISerializable
+ Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiDescription.java
index 2f23ff79ae5..c9faabbe0f3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiDescription.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiDescription.java
@@ -16,10 +16,10 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedOutputWidgetDescription;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedUiAction;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedUiDescription;
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.ITableModel;
*
* @author Piotr Buczek
*/
-public class ManagedUiDescription implements IManagedUiDescription, ISerializable
+public class ManagedUiDescription implements IManagedUiDescription, Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiTableActionDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiTableActionDescription.java
index c98c00fd19f..ddcb040c687 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiTableActionDescription.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiTableActionDescription.java
@@ -16,12 +16,12 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedUiTableAction;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.ManagedTableActionRowSelectionType;
@@ -32,7 +32,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.ManagedTableActionR
* @author Piotr Buczek
*/
public class ManagedUiTableActionDescription extends ManagedUiActionDescription implements
- IManagedUiTableAction, ISerializable
+ IManagedUiTableAction, Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MatchingEntity.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MatchingEntity.java
index 6057524dec3..1f1b8425fb4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MatchingEntity.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MatchingEntity.java
@@ -16,9 +16,10 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolderWithPermId;
import ch.systemsx.cisd.openbis.generic.shared.basic.IRegistratorHolder;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
/**
* An entity that matches the <i>Hibernate Search</i> query and which has been returned by the
@@ -26,7 +27,8 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
*
* @author Christian Ribeaud
*/
-public final class MatchingEntity implements ISerializable, IEntityInformationHolderWithPermId, IRegistratorHolder
+public final class MatchingEntity implements Serializable, IEntityInformationHolderWithPermId,
+ IRegistratorHolder
{
private static final long serialVersionUID = 1L;
@@ -156,6 +158,7 @@ public final class MatchingEntity implements ISerializable, IEntityInformationHo
return new IEntityInformationHolderWithPermId()
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
+
public Long getId()
{
return entity.getId();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialAttributeSearchFieldKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialAttributeSearchFieldKind.java
index f93d8fffea5..c271c350454 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialAttributeSearchFieldKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialAttributeSearchFieldKind.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Kinds of fields connected with Material attributes that can be used in detailed text queries.
*
* @author Piotr Buczek
*/
-public enum MaterialAttributeSearchFieldKind implements ISerializable, IAttributeSearchFieldKind
+public enum MaterialAttributeSearchFieldKind implements Serializable, IAttributeSearchFieldKind
{
CODE("Code"),
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialIdentifier.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialIdentifier.java
index d7cb823abb0..3ef5f050fcf 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialIdentifier.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialIdentifier.java
@@ -16,16 +16,17 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
+
import ch.systemsx.cisd.common.shared.basic.utils.StringUtils;
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolderWithPermId;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
/**
* Identifier for searching material through <i>Web Service</i> lookup methods in the database.
*
* @author Christian Ribeaud
*/
-public final class MaterialIdentifier implements ISerializable
+public final class MaterialIdentifier implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialTypePropertyType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialTypePropertyType.java
index 5395361000d..f5aeac36104 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialTypePropertyType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialTypePropertyType.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* The {@link EntityTypePropertyType} extension for <i>Material Type</i>.
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
* @author Izabela Adamczyk
*/
public class MaterialTypePropertyType extends EntityTypePropertyType<MaterialType> implements
- ISerializable
+ Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewAttachment.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewAttachment.java
index 0f58bca0154..a896426e4e3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewAttachment.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewAttachment.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* An attachment to register.
*
* @author Piotr Buczek
*/
-public class NewAttachment implements ISerializable
+public class NewAttachment implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewAuthorizationGroup.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewAuthorizationGroup.java
index 8aa4a02a6aa..74ca2a91628 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewAuthorizationGroup.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewAuthorizationGroup.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Details of new authorization group.
*
* @author Izabela Adamczyk
*/
-public class NewAuthorizationGroup implements ISerializable
+public class NewAuthorizationGroup implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewETPTAssignment.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewETPTAssignment.java
index b9abb5b91b1..def5860e03c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewETPTAssignment.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewETPTAssignment.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Stores data needed to create new entity type-property type assignment.
*
* @author Izabela Adamczyk
*/
-public class NewETPTAssignment implements ISerializable
+public class NewETPTAssignment implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewEntitiesWithTypes.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewEntitiesWithTypes.java
index 05717644f84..41b496be073 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewEntitiesWithTypes.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewEntitiesWithTypes.java
@@ -19,15 +19,13 @@ package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Contains a list of new entities and their type.
*
* @author Pawel Glyzewski
*/
public abstract class NewEntitiesWithTypes<T extends EntityType, E extends Serializable> implements
- ISerializable
+ Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewExpression.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewExpression.java
index ba2c1e90deb..8d88e7fad0d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewExpression.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewExpression.java
@@ -16,12 +16,12 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* @author Franz-Josef Elmer
*/
-public class NewExpression implements ISerializable
+public class NewExpression implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Null.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Null.java
index 8e15e9e7fe5..cb6dd64cdfa 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Null.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Null.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Serializable null object.
*
* @author Franz-Josef Elmer
*/
-public class Null implements ISerializable
+public class Null implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ParameterValue.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ParameterValue.java
index 08525bcca5e..7287bf78629 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ParameterValue.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ParameterValue.java
@@ -16,12 +16,12 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* @author Piotr Buczek
*/
-public class ParameterValue implements Comparable<ParameterValue>, ISerializable
+public class ParameterValue implements Comparable<ParameterValue>, Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ParameterWithValue.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ParameterWithValue.java
index 3c668ce2f6c..5f0c90ac7a5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ParameterWithValue.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ParameterWithValue.java
@@ -1,13 +1,13 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Stores parameter name and the value.
*
* @author Izabela Adamczyk
*/
-public class ParameterWithValue implements ISerializable
+public class ParameterWithValue implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PortletConfiguration.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PortletConfiguration.java
index 61258ee4567..42552d62f48 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PortletConfiguration.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PortletConfiguration.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Configuration parameters of a portlet.
@@ -26,10 +26,10 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
*
* @author Franz-Josef Elmer
*/
-public class PortletConfiguration implements ISerializable
+public class PortletConfiguration implements Serializable
{
private static final long serialVersionUID = 1L;
-
+
private String name;
// Needed by GWT for deserialization
@@ -39,7 +39,7 @@ public class PortletConfiguration implements ISerializable
}
/**
- * Creates a new instance for specified unique portlet name.
+ * Creates a new instance for specified unique portlet name.
*/
public PortletConfiguration(String name)
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyTypeWithVocabulary.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyTypeWithVocabulary.java
index e9b43582997..c93b706174d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyTypeWithVocabulary.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyTypeWithVocabulary.java
@@ -16,15 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Set;
import java.util.TreeSet;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* @author Franz-Josef Elmer
*/
-public class PropertyTypeWithVocabulary implements ISerializable
+public class PropertyTypeWithVocabulary implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyUpdates.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyUpdates.java
index a525096835d..b43bb8132aa 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyUpdates.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyUpdates.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Updates of a single property.
*
* @author Piotr Buczek
*/
-public class PropertyUpdates implements ISerializable
+public class PropertyUpdates implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/QueryType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/QueryType.java
index afd3f77a634..3865a690f1f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/QueryType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/QueryType.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Type of query.
*
* @author Izabela Adamczyk
*/
-public enum QueryType implements ISerializable
+public enum QueryType implements Serializable
{
GENERIC,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RealNumberFormatingParameters.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RealNumberFormatingParameters.java
index 8064b3d1298..e5e649cf63d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RealNumberFormatingParameters.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RealNumberFormatingParameters.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Parameters for formating real numbers in grids. It is part of {@link DisplaySettings}.
*
* @author Franz-Josef Elmer
*/
-public class RealNumberFormatingParameters implements ISerializable
+public class RealNumberFormatingParameters implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RelationshipType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RelationshipType.java
index 6b75f863db1..940cf75a3f9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RelationshipType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RelationshipType.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* The <i>GWT</i> version of RelationshipTypePE.
*
* @author Piotr Buczek
*/
-public class RelationshipType extends Code<PropertyType> implements ISerializable
+public class RelationshipType extends Code<PropertyType> implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ReportRowModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ReportRowModel.java
index 4ba87c317d0..bbde32f2ac3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ReportRowModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ReportRowModel.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Model of a report row.
*
* @author Piotr Buczek
*/
-public class ReportRowModel implements ISerializable
+public class ReportRowModel implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ReportingPluginType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ReportingPluginType.java
index 81e4a3b54d0..4d798fb4bad 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ReportingPluginType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ReportingPluginType.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Different kinds of reporting plug-ins that are supported. Also keeps track of which
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
*
* @author Chandrasekhar Ramakrishnan
*/
-public enum ReportingPluginType implements ISerializable
+public enum ReportingPluginType implements Serializable
{
TABLE_MODEL(ImplementedPluginMethods.CREATE_REPORT),
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleWithHierarchy.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleWithHierarchy.java
index ab0ffeaf0b9..e370e7786eb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleWithHierarchy.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleWithHierarchy.java
@@ -16,13 +16,12 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.LinkedHashSet;
import java.util.Set;
import com.google.gwt.user.client.rpc.IsSerializable;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Hierarchical role. Combines {@link RoleCode} with {@link RoleLevel} and a set of
* {@link RoleWithHierarchy}s that are stronger.
@@ -48,7 +47,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
*
* @author Izabela Adamczyk
*/
-public enum RoleWithHierarchy implements ISerializable
+public enum RoleWithHierarchy implements Serializable
{
//
// NOTE: Each role should match the following naming convention: <RoleLevel>_<RoleCode>,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleAttributeSearchFieldKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleAttributeSearchFieldKind.java
index ed844ebc6a2..e29e6da5a59 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleAttributeSearchFieldKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleAttributeSearchFieldKind.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Kinds of fields connected with Sample attributes that can be used in detailed text queries.
*
* @author Piotr Buczek
*/
-public enum SampleAttributeSearchFieldKind implements ISerializable, IAttributeSearchFieldKind
+public enum SampleAttributeSearchFieldKind implements Serializable, IAttributeSearchFieldKind
{
CODE("Code"),
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleBatchUpdateDetails.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleBatchUpdateDetails.java
index 1c26647161f..3ddc3bb98e8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleBatchUpdateDetails.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleBatchUpdateDetails.java
@@ -16,16 +16,15 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Set;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Holds information about which sample attributes should be updated.
*
* @author Piotr Buczek
*/
-public class SampleBatchUpdateDetails implements ISerializable
+public class SampleBatchUpdateDetails implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleParentWithDerived.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleParentWithDerived.java
index 7e74e3131b1..3a1c17267fc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleParentWithDerived.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleParentWithDerived.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* A <code>SampleParentWithDerived</code> encapsulates a <code>Sample</code> (the parent) and its
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
*
* @author Christian Ribeaud
*/
-public final class SampleParentWithDerived implements ISerializable
+public final class SampleParentWithDerived implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleType.java
index f112403d264..7637b046b27 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleType.java
@@ -16,6 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -23,14 +24,13 @@ import java.util.List;
import java.util.Set;
import ch.systemsx.cisd.common.annotation.CollectionMapping;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
/**
* A {@link EntityType} extension for <i>Sample Type</i>.
*
* @author Izabela Adamczyk
*/
-public final class SampleType extends EntityType implements ISerializable
+public final class SampleType extends EntityType implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleUpdateResult.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleUpdateResult.java
index 8c509886749..3923f867549 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleUpdateResult.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleUpdateResult.java
@@ -16,17 +16,16 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.Date;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Stores result of sample update.
*
* @author Piotr Buczek
*/
-public class SampleUpdateResult implements ISerializable
+public class SampleUpdateResult implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ScriptType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ScriptType.java
index ad777d5fc27..d8ceaf3a28b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ScriptType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ScriptType.java
@@ -16,12 +16,12 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* @author Piotr Buczek
*/
-public enum ScriptType implements ISerializable
+public enum ScriptType implements Serializable
{
DYNAMIC_PROPERTY("Dynamic Property Evaluator"), MANAGED_PROPERTY("Managed Property Handler");
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchCriteriaConnection.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchCriteriaConnection.java
index 2a7ac6031ad..3898ab943ad 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchCriteriaConnection.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchCriteriaConnection.java
@@ -16,12 +16,12 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* @author Izabela Adamczyk
*/
-public enum SearchCriteriaConnection implements ISerializable
+public enum SearchCriteriaConnection implements Serializable
{
MATCH_ALL("AND"), MATCH_ANY("OR");
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SortInfo.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SortInfo.java
index f96fdceefc3..fd257ed8c2e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SortInfo.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SortInfo.java
@@ -16,16 +16,16 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import com.google.gwt.user.client.rpc.IsSerializable;
+import java.io.Serializable;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import com.google.gwt.user.client.rpc.IsSerializable;
/**
* Aggregates sort field and sort direction.
*
* @author Christian Ribeaud
*/
-public final class SortInfo implements ISerializable
+public final class SortInfo implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModel.java
index 181784d9848..475aeb19fef 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModel.java
@@ -16,9 +16,9 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.ITableModel;
/**
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.ITableModel;
*
* @author Tomasz Pylak
*/
-public class TableModel implements ISerializable, ITableModel
+public class TableModel implements Serializable, ITableModel
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelColumnHeader.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelColumnHeader.java
index d85cb1c54bb..64487c866bc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelColumnHeader.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelColumnHeader.java
@@ -16,17 +16,16 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Column header for {@link TableModel}.
*
* @author Tomasz Pylak
*/
-public class TableModelColumnHeader implements ISerializable
+public class TableModelColumnHeader implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelRow.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelRow.java
index fd107c0630f..cac0f79a1ef 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelRow.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelRow.java
@@ -16,16 +16,15 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* The content of one row, without the header specification.
*
* @author Tomasz Pylak
*/
-public class TableModelRow implements ISerializable
+public class TableModelRow implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelRowWithObject.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelRowWithObject.java
index 44cc9e2fd19..004dfa8c0fb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelRowWithObject.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelRowWithObject.java
@@ -16,21 +16,21 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
/**
* @author Franz-Josef Elmer
*/
-public class TableModelRowWithObject<T extends ISerializable> extends TableModelRow implements
+public class TableModelRowWithObject<T extends Serializable> extends TableModelRow implements
IIdHolder
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
- public static <T extends ISerializable> List<T> getObjects(List<TableModelRowWithObject<T>> rows)
+ public static <T extends Serializable> List<T> getObjects(List<TableModelRowWithObject<T>> rows)
{
ArrayList<T> list = new ArrayList<T>();
for (TableModelRowWithObject<T> row : rows)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingDataSetCriteria.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingDataSetCriteria.java
index 6b407f0cb46..23ac5831b70 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingDataSetCriteria.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingDataSetCriteria.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Criteria for tracking <i>data sets</i> with technical id bigger than the specified one. Optional,
@@ -27,34 +27,35 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
*
* @author Piotr Buczek
*/
-public class TrackingDataSetCriteria implements ISerializable
+public class TrackingDataSetCriteria implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
private final String connectedSampleTypeCode;
private final long lastSeenDataSetId;
-
+
private final boolean enrichResult;
public TrackingDataSetCriteria(long lastSeenDataSetId)
{
this(null, lastSeenDataSetId, false);
}
-
+
public TrackingDataSetCriteria(String connectedSampleTypeCodeOrNull, long lastSeenDataSetId)
{
this(connectedSampleTypeCodeOrNull, lastSeenDataSetId, true);
assert connectedSampleTypeCodeOrNull != null;
}
- private TrackingDataSetCriteria(String connectedSampleTypeCodeOrNull, long lastSeenDataSetId, boolean enrichResult)
+ private TrackingDataSetCriteria(String connectedSampleTypeCodeOrNull, long lastSeenDataSetId,
+ boolean enrichResult)
{
this.enrichResult = enrichResult;
this.lastSeenDataSetId = lastSeenDataSetId;
this.connectedSampleTypeCode = connectedSampleTypeCodeOrNull;
}
-
+
public String getConnectedSampleTypeCode()
{
return connectedSampleTypeCode;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TypedTableGridColumnDefinition.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TypedTableGridColumnDefinition.java
index 4961e3e9d6d..43ee68057f7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TypedTableGridColumnDefinition.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TypedTableGridColumnDefinition.java
@@ -1,17 +1,17 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
import ch.systemsx.cisd.openbis.generic.shared.basic.GridRowModel;
import ch.systemsx.cisd.openbis.generic.shared.basic.IColumnDefinition;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.SimpleDateRenderer;
import ch.systemsx.cisd.openbis.generic.shared.basic.SimpleImageHtmlRenderer;
/**
* @author Franz-Josef Elmer
*/
-public class TypedTableGridColumnDefinition<T extends ISerializable> implements
+public class TypedTableGridColumnDefinition<T extends Serializable> implements
IColumnDefinition<TableModelRowWithObject<T>>
{
protected TableModelColumnHeader header;
@@ -46,7 +46,7 @@ public class TypedTableGridColumnDefinition<T extends ISerializable> implements
{
return header.getId();
}
-
+
public DataTypeCode tryToGetDataType()
{
return header.getDataType();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TypedTableModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TypedTableModel.java
index 01080de1b16..e83ad98cf6a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TypedTableModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TypedTableModel.java
@@ -16,10 +16,10 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.TypedTableGrid;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
/**
* Table model for {@link TypedTableGrid} classes. It contains column meta-data as a list of
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
*
* @author Franz-Josef Elmer
*/
-public class TypedTableModel<T extends ISerializable>
+public class TypedTableModel<T extends Serializable>
{
private final List<TableModelColumnHeader> header;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermBatchUpdateDetails.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermBatchUpdateDetails.java
index 7fcf7fa6bdd..936ac268b27 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermBatchUpdateDetails.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermBatchUpdateDetails.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Holds information about which vocabulary term attributes should be updated.
*
* @author Piotr Buczek
*/
-public class VocabularyTermBatchUpdateDetails implements ISerializable
+public class VocabularyTermBatchUpdateDetails implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermReplacement.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermReplacement.java
index 7239f2733f3..674381bed78 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermReplacement.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermReplacement.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Wrapper of a {@link VocabularyTerm} and its replacement.
*
* @author Franz-Josef Elmer
*/
-public class VocabularyTermReplacement implements ISerializable
+public class VocabularyTermReplacement implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermWithStats.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermWithStats.java
index f6b4d8b5fc9..e0a0181f5d6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermWithStats.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermWithStats.java
@@ -16,17 +16,16 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Vocabulary term and its usage statistics.
*
* @author Tomasz Pylak
*/
-public class VocabularyTermWithStats implements ISerializable
+public class VocabularyTermWithStats implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebClientConfiguration.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebClientConfiguration.java
index 10e29840489..c8b51854ab8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebClientConfiguration.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebClientConfiguration.java
@@ -16,13 +16,13 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
+import java.io.Serializable;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.ViewMode;
/**
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ViewMode;
*
* @author Izabela Adamczyk
*/
-public class WebClientConfiguration implements ISerializable
+public class WebClientConfiguration implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescription.java
index 2cbd184ca81..d9cda035907 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescription.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescription.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto.api;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Interface implemented by objects describing an input UI element (text field, combo box).
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
* @author Piotr Buczek
*/
// NOTE: All methods of this interface are part of the Managed Properties API.
-public interface IManagedInputWidgetDescription extends ISerializable
+public interface IManagedInputWidgetDescription extends Serializable
{
/**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescriptionFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescriptionFactory.java
index c56a8259716..3d450480752 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescriptionFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescriptionFactory.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto.api;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Factory for creation of instances of {@link IManagedInputWidgetDescription}.
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
* @author Piotr Buczek
*/
// NOTE: All methods of this interface are part of the Managed Properties API.
-public interface IManagedInputWidgetDescriptionFactory extends ISerializable
+public interface IManagedInputWidgetDescriptionFactory extends Serializable
{
/**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedOutputWidgetDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedOutputWidgetDescription.java
index e647d91deb0..d3505902dc1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedOutputWidgetDescription.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedOutputWidgetDescription.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto.api;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Interface implemented by objects describing an output UI element (table, label).
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
* @author Piotr Buczek
*/
// NOTE: All methods of this interface are part of the Managed Properties API.
-public interface IManagedOutputWidgetDescription extends ISerializable
+public interface IManagedOutputWidgetDescription extends Serializable
{
/**
* @return type of this output field
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedProperty.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedProperty.java
index 0d8c5e5e2c1..901985422ef 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedProperty.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedProperty.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto.api;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Interface implemented by managed property.
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
* @author Piotr Buczek
*/
// NOTE: All methods of this interface are part of the Managed Properties API.
-public interface IManagedProperty extends ISerializable
+public interface IManagedProperty extends Serializable
{
/** Return the code (or name) of the managed property. */
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiAction.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiAction.java
index 0bdb6feb39c..0ba850ca044 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiAction.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiAction.java
@@ -16,17 +16,16 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto.api;
+import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Description of action that a user can perform on the client side.
*
* @author Piotr Buczek
*/
// NOTE: All methods of this interface are part of the Managed Properties API.
-public interface IManagedUiAction extends ISerializable
+public interface IManagedUiAction extends Serializable
{
/** Returns string identifier of the action. */
public String getName();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiDescription.java
index 7838acf4319..024e9000cbf 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiDescription.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiDescription.java
@@ -16,17 +16,16 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto.api;
+import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* The interface exposed to the Managed Property script.
*
* @author Chandrasekhar Ramakrishnan
*/
// NOTE: All methods of this interface are part of the Managed Properties API.
-public interface IManagedUiDescription extends ISerializable
+public interface IManagedUiDescription extends Serializable
{
/**
* Sets the given table model to define an output that will be shown in detail view of the
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IPerson.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IPerson.java
index 7837acf7a49..f57508066d1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IPerson.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IPerson.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto.api;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Representation of a user, e.g. one who modifies a property.
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
* @author Piotr Buczek
*/
// NOTE: All methods of this interface are part of the Managed Properties API.
-public interface IPerson extends ISerializable
+public interface IPerson extends Serializable
{
/** @return id of the user */
String getUserId();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ITableModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ITableModel.java
index 882014a3aca..9d2a284c9c1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ITableModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ITableModel.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto.api;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Interface implemented by table models.
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
* @author Piotr Buczek
*/
// NOTE: For now the interface is empty. It was introduced not to expose internal API
-public interface ITableModel extends ISerializable
+public interface ITableModel extends Serializable
{
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedInputFieldType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedInputFieldType.java
index 6d472aa58b2..a685ce47981 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedInputFieldType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedInputFieldType.java
@@ -16,13 +16,13 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto.api;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* @author Chandrasekhar Ramakrishnan
*/
// NOTE: This enumeration is part of the Managed Properties API.
-public enum ManagedInputFieldType implements ISerializable
+public enum ManagedInputFieldType implements Serializable
{
TEXT, MULTILINE_TEXT, COMBO_BOX
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedOutputWidgetType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedOutputWidgetType.java
index 4459f5e720a..b3c7eb08017 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedOutputWidgetType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedOutputWidgetType.java
@@ -16,13 +16,13 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto.api;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* @author Piotr Buczek
*/
// NOTE: This enumeration is part of the Managed Properties API.
-public enum ManagedOutputWidgetType implements ISerializable
+public enum ManagedOutputWidgetType implements Serializable
{
TABLE, HTML;
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedTableActionRowSelectionType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedTableActionRowSelectionType.java
index 26e139bb033..b7ecc333c47 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedTableActionRowSelectionType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedTableActionRowSelectionType.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto.api;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Selection modes of table actions.
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
* @author Piotr Buczek
*/
// NOTE: This enumeration is part of the Managed Properties API.
-public enum ManagedTableActionRowSelectionType implements ISerializable
+public enum ManagedTableActionRowSelectionType implements Serializable
{
/** e.g. create/add action */
NOT_REQUIRED,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PermId.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PermId.java
index 9f81370c037..52c2f621843 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PermId.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PermId.java
@@ -16,8 +16,9 @@
package ch.systemsx.cisd.openbis.generic.shared.dto;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.IPermIdHolder;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -25,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Izabela Adamczyk
*/
-public class PermId implements ISerializable
+public class PermId implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DataTypeUtils.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DataTypeUtils.java
index f99746bc105..1a7e977240d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DataTypeUtils.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DataTypeUtils.java
@@ -22,7 +22,6 @@ import java.util.Map;
import ch.systemsx.cisd.common.shared.basic.utils.StringUtils;
import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DoubleTableCell;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ISerializableComparable;
@@ -38,7 +37,7 @@ public class DataTypeUtils
{
private static final Map<DataTypeCode, Converter> map = new HashMap<DataTypeCode, Converter>();
- private enum Converter implements ISerializable
+ private enum Converter implements Serializable
{
INTEGER(DataTypeCode.INTEGER)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilder.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilder.java
index 4f6ebb8bf7d..db5327628cd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilder.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilder.java
@@ -16,6 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.util;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -32,7 +33,6 @@ import org.apache.commons.lang.StringUtils;
import ch.systemsx.cisd.openbis.generic.shared.basic.DeletionUtils;
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolderWithIdentifier;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.SimplePersonRenderer;
import ch.systemsx.cisd.openbis.generic.shared.basic.TableCellUtil;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
@@ -59,7 +59,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.VocabularyTermTableCell
*
* @author Franz-Josef Elmer
*/
-public class TypedTableModelBuilder<T extends ISerializable>
+public class TypedTableModelBuilder<T extends Serializable>
{
private static final StringTableCell EMPTY_CELL = new StringTableCell("");
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryDatabase.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryDatabase.java
index 6d14d41d705..d450461e2d8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryDatabase.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryDatabase.java
@@ -16,13 +16,14 @@
package ch.systemsx.cisd.openbis.plugin.query.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
* @author Piotr Buczek
*/
-public class QueryDatabase implements ISerializable, Comparable<QueryDatabase>
+public class QueryDatabase implements Serializable, Comparable<QueryDatabase>
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryParameterBindings.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryParameterBindings.java
index 021f36a5056..e6b0d24a57f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryParameterBindings.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryParameterBindings.java
@@ -16,11 +16,11 @@
package ch.systemsx.cisd.openbis.plugin.query.shared.basic.dto;
+import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ParameterWithValue;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
@@ -29,7 +29,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Piotr Buczek
*/
-public class QueryParameterBindings implements ISerializable
+public class QueryParameterBindings implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java
index 6bbcb898b14..c1f354cb273 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java
@@ -16,6 +16,7 @@
package ch.systemsx.cisd.openbis.generic.client.web.server;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -49,7 +50,6 @@ import ch.systemsx.cisd.openbis.generic.server.SessionConstants;
import ch.systemsx.cisd.openbis.generic.server.business.ManagerTestTool;
import ch.systemsx.cisd.openbis.generic.shared.CommonTestUtils;
import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSet;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetArchivingStatus;
@@ -320,7 +320,7 @@ public final class CommonClientServiceTest extends AbstractClientServiceTest
});
}
- private final <T extends ISerializable> void prepareListEntities2(List<T> entities,
+ private final <T extends Serializable> void prepareListEntities2(List<T> entities,
final DefaultResultSetConfig<String, TableModelRowWithObject<T>> criteria)
{
final String resultSetKey = "131";
@@ -370,7 +370,7 @@ public final class CommonClientServiceTest extends AbstractClientServiceTest
assertEquals(entities.size(), resultSet.getTotalLength());
}
- private <T extends ISerializable> void assertEqualEntities2(List<T> entities,
+ private <T extends Serializable> void assertEqualEntities2(List<T> entities,
final TypedTableResultSet<T> resultSet)
{
GridRowModels<TableModelRowWithObject<T>> resultSetList =
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilderTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilderTest.java
index ec7d5de2ce7..a63c3146138 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilderTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilderTest.java
@@ -16,6 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.util;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -24,7 +25,6 @@ import java.util.List;
import org.testng.AssertJUnit;
import org.testng.annotations.Test;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DateTableCell;
@@ -43,7 +43,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TypedTableModel;
*/
public class TypedTableModelBuilderTest extends AssertJUnit
{
- private static final class MockSerializable implements ISerializable
+ private static final class MockSerializable implements Serializable
{
private static final long serialVersionUID = 1L;
}
@@ -51,7 +51,7 @@ public class TypedTableModelBuilderTest extends AssertJUnit
@Test
public void testSimpleBuilding()
{
- TypedTableModelBuilder<ISerializable> builder = new TypedTableModelBuilder<ISerializable>();
+ TypedTableModelBuilder<Serializable> builder = new TypedTableModelBuilder<Serializable>();
builder.addColumn("A").withTitle("Alpha").hideByDefault();
builder.addColumn("B").withDataType(DataTypeCode.REAL).withDefaultWidth(500);
MockSerializable object = new MockSerializable();
@@ -59,7 +59,7 @@ public class TypedTableModelBuilderTest extends AssertJUnit
builder.column("A").addString("hello");
builder.column("B").addDouble(42.5);
- TypedTableModel<ISerializable> model = builder.getModel();
+ TypedTableModel<Serializable> model = builder.getModel();
List<TableModelColumnHeader> headers = model.getHeader();
assertHeadersOrder(headers, "A", "B");
assertEquals("Alpha", headers.get(0).getTitle());
@@ -70,7 +70,7 @@ public class TypedTableModelBuilderTest extends AssertJUnit
assertEquals(false, headers.get(1).isHidden());
assertEquals(500, headers.get(1).getDefaultColumnWidth());
assertEquals(DataTypeCode.REAL, headers.get(1).getDataType());
- List<TableModelRowWithObject<ISerializable>> rows = model.getRows();
+ List<TableModelRowWithObject<Serializable>> rows = model.getRows();
assertSame(object, rows.get(0).getObjectOrNull());
assertEquals(new StringTableCell("hello"), rows.get(0).getValues().get(0));
assertEquals(new DoubleTableCell(42.5), rows.get(0).getValues().get(1));
@@ -81,7 +81,7 @@ public class TypedTableModelBuilderTest extends AssertJUnit
@Test
public void testBuildingWithGroups()
{
- TypedTableModelBuilder<ISerializable> builder = new TypedTableModelBuilder<ISerializable>();
+ TypedTableModelBuilder<Serializable> builder = new TypedTableModelBuilder<Serializable>();
MockSerializable object = new MockSerializable();
builder.addRow(object);
builder.columnGroup("g1").column("a1").addDate(new Date(4711));
@@ -89,14 +89,14 @@ public class TypedTableModelBuilderTest extends AssertJUnit
builder.columnGroup("g1").column("b1").addString("hello");
builder.columnGroup("g2").column("b2").addInteger(42L);
- TypedTableModel<ISerializable> model = builder.getModel();
+ TypedTableModel<Serializable> model = builder.getModel();
List<TableModelColumnHeader> headers = model.getHeader();
assertHeadersOrder(headers, "a1", "b1", "a2", "b2");
assertEquals(DataTypeCode.TIMESTAMP, headers.get(0).getDataType());
assertEquals(DataTypeCode.VARCHAR, headers.get(1).getDataType());
assertEquals(DataTypeCode.REAL, headers.get(2).getDataType());
assertEquals(DataTypeCode.INTEGER, headers.get(3).getDataType());
- List<TableModelRowWithObject<ISerializable>> rows = model.getRows();
+ List<TableModelRowWithObject<Serializable>> rows = model.getRows();
assertEquals(new DateTableCell(4711), rows.get(0).getValues().get(0));
assertEquals(new StringTableCell("hello"), rows.get(0).getValues().get(1));
assertEquals(new DoubleTableCell(2.125), rows.get(0).getValues().get(2));
@@ -107,10 +107,11 @@ public class TypedTableModelBuilderTest extends AssertJUnit
@Test
public void testAddProperties()
{
- TypedTableModelBuilder<ISerializable> builder = new TypedTableModelBuilder<ISerializable>();
+ TypedTableModelBuilder<Serializable> builder = new TypedTableModelBuilder<Serializable>();
builder.addRow(new MockSerializable());
IEntityProperty p1 = property("beta", "3.25", true, DataTypeCode.REAL);
- IEntityProperty p2 = property("alpha", "hello\nworld", false, DataTypeCode.MULTILINE_VARCHAR);
+ IEntityProperty p2 =
+ property("alpha", "hello\nworld", false, DataTypeCode.MULTILINE_VARCHAR);
IEntityProperty p3 = property("gamma", "hello", false, DataTypeCode.VARCHAR);
builder.columnGroup("g").addProperties("MY-", Arrays.asList(p1, p2, p3));
builder.addRow(new MockSerializable());
@@ -118,10 +119,11 @@ public class TypedTableModelBuilderTest extends AssertJUnit
IEntityProperty p5 = property("kappa", "42", false, DataTypeCode.INTEGER);
builder.columnGroup("g").addProperties("MY-", Arrays.asList(p4, p5));
- TypedTableModel<ISerializable> model = builder.getModel();
+ TypedTableModel<Serializable> model = builder.getModel();
List<TableModelColumnHeader> headers = model.getHeader();
- System.out.println("HEADERS:"+headers);
- assertHeadersOrder(headers, "MY-USER-ALPHA", "MY-INTERN-BETA", "MY-USER-GAMMA", "MY-USER-KAPPA");
+ System.out.println("HEADERS:" + headers);
+ assertHeadersOrder(headers, "MY-USER-ALPHA", "MY-INTERN-BETA", "MY-USER-GAMMA",
+ "MY-USER-KAPPA");
assertEquals("alpha", headers.get(0).getTitle());
assertEquals(DataTypeCode.MULTILINE_VARCHAR, headers.get(0).getDataType());
assertEquals("beta", headers.get(1).getTitle());
@@ -130,7 +132,7 @@ public class TypedTableModelBuilderTest extends AssertJUnit
assertEquals(DataTypeCode.VARCHAR, headers.get(2).getDataType());
assertEquals("kappa", headers.get(3).getTitle());
assertEquals(DataTypeCode.INTEGER, headers.get(3).getDataType());
- List<TableModelRowWithObject<ISerializable>> rows = model.getRows();
+ List<TableModelRowWithObject<Serializable>> rows = model.getRows();
assertEquals(new StringTableCell("hello\nworld"), rows.get(0).getValues().get(0));
assertEquals(new DoubleTableCell(3.25), rows.get(0).getValues().get(1));
assertEquals(new StringTableCell("hello"), rows.get(0).getValues().get(2));
@@ -143,7 +145,8 @@ public class TypedTableModelBuilderTest extends AssertJUnit
assertEquals(2, rows.size());
}
- private IEntityProperty property(String key, String value, boolean internalNamespace, DataTypeCode type)
+ private IEntityProperty property(String key, String value, boolean internalNamespace,
+ DataTypeCode type)
{
EntityProperty property = new EntityProperty();
PropertyType propertyType = new PropertyType();
@@ -161,7 +164,7 @@ public class TypedTableModelBuilderTest extends AssertJUnit
@Test
public void testAddIntegerValueToColumn()
{
- TypedTableModelBuilder<ISerializable> builder = new TypedTableModelBuilder<ISerializable>();
+ TypedTableModelBuilder<Serializable> builder = new TypedTableModelBuilder<Serializable>();
MockSerializable object0 = new MockSerializable();
builder.addRow(object0);
builder.column("A").withTitle("Alpha").addInteger(42L);
@@ -171,12 +174,12 @@ public class TypedTableModelBuilderTest extends AssertJUnit
builder.addRow(null);
builder.column("A").withTitle("a").addInteger(4711L);
- TypedTableModel<ISerializable> model = builder.getModel();
+ TypedTableModel<Serializable> model = builder.getModel();
List<TableModelColumnHeader> headers = model.getHeader();
assertHeadersOrder(headers, "A");
assertEquals("a", headers.get(0).getTitle());
assertEquals(DataTypeCode.INTEGER, headers.get(0).getDataType());
- List<TableModelRowWithObject<ISerializable>> rows = model.getRows();
+ List<TableModelRowWithObject<Serializable>> rows = model.getRows();
assertSame(object0, rows.get(0).getObjectOrNull());
assertEquals(new IntegerTableCell(42), rows.get(0).getValues().get(0));
assertSame(object1, rows.get(1).getObjectOrNull());
@@ -189,7 +192,7 @@ public class TypedTableModelBuilderTest extends AssertJUnit
@Test
public void testAddDoubleValueToColumn()
{
- TypedTableModelBuilder<ISerializable> builder = new TypedTableModelBuilder<ISerializable>();
+ TypedTableModelBuilder<Serializable> builder = new TypedTableModelBuilder<Serializable>();
MockSerializable object0 = new MockSerializable();
builder.addRow(object0);
builder.column("A").withTitle("Alpha").addDouble(4.25);
@@ -199,12 +202,12 @@ public class TypedTableModelBuilderTest extends AssertJUnit
builder.addRow(null);
builder.column("A").withTitle("a").addDouble(4711.5);
- TypedTableModel<ISerializable> model = builder.getModel();
+ TypedTableModel<Serializable> model = builder.getModel();
List<TableModelColumnHeader> headers = model.getHeader();
assertHeadersOrder(headers, "A");
assertEquals("a", headers.get(0).getTitle());
assertEquals(DataTypeCode.REAL, headers.get(0).getDataType());
- List<TableModelRowWithObject<ISerializable>> rows = model.getRows();
+ List<TableModelRowWithObject<Serializable>> rows = model.getRows();
assertSame(object0, rows.get(0).getObjectOrNull());
assertEquals(new DoubleTableCell(4.25), rows.get(0).getValues().get(0));
assertSame(object1, rows.get(1).getObjectOrNull());
@@ -217,15 +220,15 @@ public class TypedTableModelBuilderTest extends AssertJUnit
@Test
public void testRowsWithEmptyCells()
{
- TypedTableModelBuilder<ISerializable> builder = new TypedTableModelBuilder<ISerializable>();
+ TypedTableModelBuilder<Serializable> builder = new TypedTableModelBuilder<Serializable>();
builder.addRow(null);
builder.column("A").addString("a");
builder.addRow(null);
builder.column("B").addString("b");
- TypedTableModel<ISerializable> model = builder.getModel();
+ TypedTableModel<Serializable> model = builder.getModel();
assertHeadersOrder(model.getHeader(), "A", "B");
- List<TableModelRowWithObject<ISerializable>> rows = model.getRows();
+ List<TableModelRowWithObject<Serializable>> rows = model.getRows();
assertEquals("[a, ]", rows.get(0).getValues().toString());
assertEquals("[, b]", rows.get(1).getValues().toString());
assertEquals(2, rows.size());
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/TypedTableAssertions.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/TypedTableAssertions.java
index 3fafc15d332..6f126b9c427 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/TypedTableAssertions.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/TypedTableAssertions.java
@@ -1,5 +1,6 @@
package ch.systemsx.cisd.openbis.systemtest;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -13,7 +14,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.TypedTa
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.GridRowModels;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.TypedTableResultSet;
import ch.systemsx.cisd.openbis.generic.shared.basic.GridRowModel;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.Row;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ISerializableComparable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelColumnHeader;
@@ -25,14 +25,14 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelRowWithObject
*
* @author Kaloyan Enimanev
*/
-public class TypedTableAssertions<T extends ISerializable> extends AssertJUnit
+public class TypedTableAssertions<T extends Serializable> extends AssertJUnit
{
/**
* a convenience method, that can be used as a static import to achieve a fluent-API like
* programming style.
*/
- public static <S extends ISerializable> TypedTableAssertions<S> assertTable(
+ public static <S extends Serializable> TypedTableAssertions<S> assertTable(
TypedTableResultSet<S> tableResultSet)
{
return new TypedTableAssertions<S>(tableResultSet);
@@ -42,14 +42,12 @@ public class TypedTableAssertions<T extends ISerializable> extends AssertJUnit
* a convenience method, that can be used as a static import to achieve a fluent-API like
* programming style.
*/
- public static <S extends ISerializable> TypedTableAssertions<S>.ColumnAssertions assertColumn(
- TypedTableResultSet<S> tableResultSet,
- String columnName)
+ public static <S extends Serializable> TypedTableAssertions<S>.ColumnAssertions assertColumn(
+ TypedTableResultSet<S> tableResultSet, String columnName)
{
return new TypedTableAssertions<S>(tableResultSet).hasColumn(columnName);
}
-
private TypedTableResultSet<T> tableResultSet;
private Map<String, TableModelColumnHeader> headers;
@@ -92,7 +90,7 @@ public class TypedTableAssertions<T extends ISerializable> extends AssertJUnit
{
hasColumn(columnName);
}
-
+
boolean rowFound = false;
GridRowModels<TableModelRowWithObject<T>> list = tableResultSet.getResultSet().getList();
for (GridRowModel<TableModelRowWithObject<T>> rowModel : list)
@@ -115,7 +113,6 @@ public class TypedTableAssertions<T extends ISerializable> extends AssertJUnit
return this;
}
-
public ColumnAssertions hasColumn(String columnId)
{
return new ColumnAssertions(columnId);
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/AbundanceColumnDefinition.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/AbundanceColumnDefinition.java
index 6254cf87fac..16dc4763134 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/AbundanceColumnDefinition.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/AbundanceColumnDefinition.java
@@ -16,16 +16,16 @@
package ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.dto;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
* @author Franz-Josef Elmer
*/
-public class AbundanceColumnDefinition implements ISerializable,
+public class AbundanceColumnDefinition implements Serializable,
Comparable<AbundanceColumnDefinition>
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/AccessionNumberProvider.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/AccessionNumberProvider.java
index 28b7a2dd718..9b3c2dc7d97 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/AccessionNumberProvider.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/AccessionNumberProvider.java
@@ -16,13 +16,14 @@
package ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
* @author Franz-Josef Elmer
*/
-public class AccessionNumberProvider implements ISerializable
+public class AccessionNumberProvider implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/AggregateFunction.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/AggregateFunction.java
index b6bf91c9040..cf515ba4cbb 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/AggregateFunction.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/AggregateFunction.java
@@ -16,16 +16,15 @@
package ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.dto;
+import java.io.Serializable;
import java.util.Arrays;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Aggregate functions.
*
* @author Franz-Josef Elmer
*/
-public enum AggregateFunction implements ISerializable
+public enum AggregateFunction implements Serializable
{
MEAN("mean")
{
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/DataSetProtein.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/DataSetProtein.java
index 82a4fb377f1..24bcfe9de56 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/DataSetProtein.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/DataSetProtein.java
@@ -16,14 +16,15 @@
package ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
* @author Franz-Josef Elmer
*/
-public class DataSetProtein implements ISerializable
+public class DataSetProtein implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/Peptide.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/Peptide.java
index 2623ae22a3a..977f9afd62a 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/Peptide.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/Peptide.java
@@ -16,10 +16,10 @@
package ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.dto;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class Peptide implements ISerializable
+public class Peptide implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/PeptideModification.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/PeptideModification.java
index f7532fb24d3..e79527e90e8 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/PeptideModification.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/PeptideModification.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -24,7 +25,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Franz-Josef Elmer
*/
-public class PeptideModification implements ISerializable
+public class PeptideModification implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinDetails.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinDetails.java
index 084c01c6ec2..2edd1672ba6 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinDetails.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinDetails.java
@@ -16,16 +16,16 @@
package ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
* @author Tomasz Pylak
*/
-public class ProteinDetails implements ISerializable
+public class ProteinDetails implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinInfo.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinInfo.java
index f4e6160c971..fe8de1acc8f 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinInfo.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinInfo.java
@@ -16,16 +16,16 @@
package ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.dto;
+import java.io.Serializable;
import java.util.Map;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
* @author Franz-Josef Elmer
*/
-public class ProteinInfo implements ISerializable, IBasicProteinInfo
+public class ProteinInfo implements Serializable, IBasicProteinInfo
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinRelatedSample.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinRelatedSample.java
index d3bf3e66b1e..5796b956e15 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinRelatedSample.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinRelatedSample.java
@@ -16,10 +16,10 @@
package ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolderWithProperties;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BasicEntityType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Franz-Josef Elmer
*/
-public class ProteinRelatedSample implements ISerializable, IEntityInformationHolderWithProperties
+public class ProteinRelatedSample implements Serializable, IEntityInformationHolderWithProperties
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinSequence.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinSequence.java
index b15d84fb622..7f9a97bd494 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinSequence.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinSequence.java
@@ -16,14 +16,15 @@
package ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
* @author Franz-Josef Elmer
*/
-public class ProteinSequence implements ISerializable
+public class ProteinSequence implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinSummary.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinSummary.java
index afe99ee79ed..b7d74edca2b 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinSummary.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/ProteinSummary.java
@@ -16,13 +16,14 @@
package ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
* @author Franz-Josef Elmer
*/
-public class ProteinSummary implements ISerializable
+public class ProteinSummary implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/SampleWithPropertiesAndAbundance.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/SampleWithPropertiesAndAbundance.java
index 0d94f3b1529..fa9d2eadc03 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/SampleWithPropertiesAndAbundance.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/SampleWithPropertiesAndAbundance.java
@@ -16,10 +16,10 @@
package ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolderWithPermId;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityPropertiesHolder;
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
* @author Franz-Josef Elmer
*/
-public class SampleWithPropertiesAndAbundance implements ISerializable,
+public class SampleWithPropertiesAndAbundance implements Serializable,
IEntityInformationHolderWithPermId, IEntityPropertiesHolder
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/Treatment.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/Treatment.java
index 14dc3a793aa..5edfa604aab 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/Treatment.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/basic/dto/Treatment.java
@@ -16,13 +16,14 @@
package ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
* @author Franz-Josef Elmer
*/
-public class Treatment implements ISerializable, Comparable<Treatment>
+public class Treatment implements Serializable, Comparable<Treatment>
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ChannelColorRGB.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ChannelColorRGB.java
index b352a9e0485..55d3e8bb53a 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ChannelColorRGB.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ChannelColorRGB.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -24,7 +25,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class ChannelColorRGB implements ISerializable
+public class ChannelColorRGB implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/sample/LibrarySampleBatchRegistrationForm.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/sample/LibrarySampleBatchRegistrationForm.java
index 5e38c4b8ab7..d30cbb5617c 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/sample/LibrarySampleBatchRegistrationForm.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/sample/LibrarySampleBatchRegistrationForm.java
@@ -16,6 +16,8 @@
package ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.sample;
+import java.io.Serializable;
+
import com.extjs.gxt.ui.client.widget.form.ComboBox.TriggerAction;
import com.extjs.gxt.ui.client.widget.form.FormPanel;
import com.extjs.gxt.ui.client.widget.form.SimpleComboBox;
@@ -33,7 +35,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.field.E
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.field.VocabularyTermSelectionWidget;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.FieldUtil;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExperimentIdentifier;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Vocabulary;
import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sample.AbstractSampleBatchRegistrationForm;
import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.IScreeningClientServiceAsync;
@@ -49,7 +50,7 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.ScreeningConst
public final class LibrarySampleBatchRegistrationForm extends AbstractSampleBatchRegistrationForm
{
- public enum Separator implements ISerializable
+ public enum Separator implements Serializable
{
TAB('\t'), COMMA(','), SEMICOLON(';');
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/dto/MaterialBiologicalReplicateFeatureVector.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/dto/MaterialBiologicalReplicateFeatureVector.java
index c1167af2ae0..a653363b665 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/dto/MaterialBiologicalReplicateFeatureVector.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/dto/MaterialBiologicalReplicateFeatureVector.java
@@ -1,8 +1,8 @@
package ch.systemsx.cisd.openbis.plugin.screening.server.logic.dto;
+import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.MaterialReplicaSummaryAggregationType;
@@ -12,7 +12,7 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.MaterialReplic
*
* @author Tomasz Pylak
*/
-public class MaterialBiologicalReplicateFeatureVector implements ISerializable
+public class MaterialBiologicalReplicateFeatureVector implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/dto/MaterialTechnicalReplicateFeatureVector.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/dto/MaterialTechnicalReplicateFeatureVector.java
index 97bf703ecba..09328bfb503 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/dto/MaterialTechnicalReplicateFeatureVector.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/dto/MaterialTechnicalReplicateFeatureVector.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.plugin.screening.server.logic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -24,7 +25,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class MaterialTechnicalReplicateFeatureVector implements ISerializable
+public class MaterialTechnicalReplicateFeatureVector implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/AnalysisProcedures.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/AnalysisProcedures.java
index 2a1ccdce6fe..2e121915dab 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/AnalysisProcedures.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/AnalysisProcedures.java
@@ -16,12 +16,12 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Kaloyan Enimanev
*/
-public class AnalysisProcedures implements ISerializable
+public class AnalysisProcedures implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ChannelDescription.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ChannelDescription.java
index e767b386994..2b33ccf4ce7 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ChannelDescription.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ChannelDescription.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -24,7 +25,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Izabela Adamczyk
*/
-public class ChannelDescription implements ISerializable
+public class ChannelDescription implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/DatasetImagesReference.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/DatasetImagesReference.java
index 581c7f8aca4..7561e6b9b73 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/DatasetImagesReference.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/DatasetImagesReference.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -24,7 +25,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class DatasetImagesReference implements ISerializable
+public class DatasetImagesReference implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/DatasetReference.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/DatasetReference.java
index 71e4bf47bad..7482686dfdf 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/DatasetReference.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/DatasetReference.java
@@ -16,10 +16,10 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.Date;
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolderWithPermId;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BasicEntityType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
@@ -29,7 +29,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class DatasetReference implements ISerializable, IEntityInformationHolderWithPermId
+public class DatasetReference implements Serializable, IEntityInformationHolderWithPermId
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ExperimentFeatureVectorSummary.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ExperimentFeatureVectorSummary.java
index 2b8033f6d47..435a3d44a4d 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ExperimentFeatureVectorSummary.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ExperimentFeatureVectorSummary.java
@@ -16,9 +16,9 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class ExperimentFeatureVectorSummary implements ISerializable
+public class ExperimentFeatureVectorSummary implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ExperimentReference.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ExperimentReference.java
index 6473e4f7b5e..f1bfcd44b66 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ExperimentReference.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ExperimentReference.java
@@ -16,8 +16,9 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolderWithIdentifier;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BasicEntityType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
@@ -27,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class ExperimentReference implements ISerializable, IEntityInformationHolderWithIdentifier
+public class ExperimentReference implements Serializable, IEntityInformationHolderWithIdentifier
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/FeatureValue.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/FeatureValue.java
index 4490f7203cd..4cbff53d359 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/FeatureValue.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/FeatureValue.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -24,7 +25,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class FeatureValue implements ISerializable
+public class FeatureValue implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/FeatureVectorDataset.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/FeatureVectorDataset.java
index b959653240c..183ede5af8c 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/FeatureVectorDataset.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/FeatureVectorDataset.java
@@ -16,9 +16,9 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.annotation.DoNotEscape;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
@@ -29,7 +29,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
* @author Tomasz Pylak
*/
@DoNotEscape
-public class FeatureVectorDataset implements ISerializable
+public class FeatureVectorDataset implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/FeatureVectorValues.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/FeatureVectorValues.java
index 8a4f5944357..6800c92ef31 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/FeatureVectorValues.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/FeatureVectorValues.java
@@ -16,10 +16,10 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.LinkedHashMap;
import java.util.Map;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.annotation.DoNotEscape;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
@@ -31,7 +31,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
* @author Tomasz Pylak
*/
@DoNotEscape
-public class FeatureVectorValues implements ISerializable
+public class FeatureVectorValues implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ImageChannelStack.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ImageChannelStack.java
index 6b97736df15..a2dab548ea7 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ImageChannelStack.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ImageChannelStack.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -26,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class ImageChannelStack implements ISerializable
+public class ImageChannelStack implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ImageDatasetParameters.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ImageDatasetParameters.java
index 04345eab99d..8a4b35f10e6 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ImageDatasetParameters.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ImageDatasetParameters.java
@@ -16,10 +16,10 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class ImageDatasetParameters implements ISerializable
+public class ImageDatasetParameters implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ImageSampleContent.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ImageSampleContent.java
index b672f2b0b2e..d64ebca0149 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ImageSampleContent.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ImageSampleContent.java
@@ -16,9 +16,9 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
* @author Tomasz Pylak
*/
// NOTE: this is a good place to add information about other connected plate/well/sample datasets.
-public class ImageSampleContent implements ISerializable
+public class ImageSampleContent implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/InternalImageChannel.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/InternalImageChannel.java
index 08fd406d96c..87b7214ea38 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/InternalImageChannel.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/InternalImageChannel.java
@@ -16,9 +16,9 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class InternalImageChannel implements ISerializable
+public class InternalImageChannel implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/InternalImageTransformationInfo.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/InternalImageTransformationInfo.java
index 228ba33ecd7..b88375a97ce 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/InternalImageTransformationInfo.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/InternalImageTransformationInfo.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -24,7 +25,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class InternalImageTransformationInfo implements ISerializable
+public class InternalImageTransformationInfo implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/LibraryRegistrationInfo.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/LibraryRegistrationInfo.java
index 8b1f0e82da2..53564ccd48b 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/LibraryRegistrationInfo.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/LibraryRegistrationInfo.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -24,10 +25,10 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Izabela Adamczyk
*/
-public class LibraryRegistrationInfo implements ISerializable
+public class LibraryRegistrationInfo implements Serializable
{
- public enum RegistrationScope implements ISerializable
+ public enum RegistrationScope implements Serializable
{
PLATES, SIRNAS_PLATES, GENES_SIRNAS_PLATES;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/LogicalImageInfo.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/LogicalImageInfo.java
index 18f8586bda7..478870f7994 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/LogicalImageInfo.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/LogicalImageInfo.java
@@ -16,9 +16,9 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class LogicalImageInfo implements ISerializable
+public class LogicalImageInfo implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialBiologicalReplicateFeatureSummary.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialBiologicalReplicateFeatureSummary.java
index bb8cc2126fe..188f07adc2b 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialBiologicalReplicateFeatureSummary.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialBiologicalReplicateFeatureSummary.java
@@ -16,13 +16,14 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
* @author Kaloyan Enimanev
*/
-public class MaterialBiologicalReplicateFeatureSummary implements ISerializable
+public class MaterialBiologicalReplicateFeatureSummary implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialFeatureVectorSummaryParametrized.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialFeatureVectorSummaryParametrized.java
index 1fd6ce82f9a..d3bde549c1b 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialFeatureVectorSummaryParametrized.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialFeatureVectorSummaryParametrized.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -25,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class MaterialFeatureVectorSummaryParametrized<T> implements ISerializable
+public class MaterialFeatureVectorSummaryParametrized<T> implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialFeatureVectorsFromAllExperimentsResult.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialFeatureVectorsFromAllExperimentsResult.java
index faccf8aeb70..4d26307daeb 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialFeatureVectorsFromAllExperimentsResult.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialFeatureVectorsFromAllExperimentsResult.java
@@ -16,9 +16,9 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Material;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Kaloyan Enimanev
*/
-public class MaterialFeatureVectorsFromAllExperimentsResult implements ISerializable
+public class MaterialFeatureVectorsFromAllExperimentsResult implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialReplicaFeatureSummary.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialReplicaFeatureSummary.java
index a5e5d35e584..4630ac862ab 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialReplicaFeatureSummary.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialReplicaFeatureSummary.java
@@ -16,16 +16,16 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
* @author Kaloyan Enimanev
*/
-public class MaterialReplicaFeatureSummary implements ISerializable
+public class MaterialReplicaFeatureSummary implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialReplicaFeatureSummaryResult.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialReplicaFeatureSummaryResult.java
index 4dbb554f836..e8d5ad82830 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialReplicaFeatureSummaryResult.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialReplicaFeatureSummaryResult.java
@@ -16,10 +16,10 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.Collections;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Kaloyan Enimanev
*/
-public class MaterialReplicaFeatureSummaryResult implements ISerializable
+public class MaterialReplicaFeatureSummaryResult implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialReplicaSummaryAggregationType.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialReplicaSummaryAggregationType.java
index 57b6e586af1..8dbebf5d1fa 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialReplicaSummaryAggregationType.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialReplicaSummaryAggregationType.java
@@ -16,14 +16,14 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
/**
* Type of the aggregation method for material replicas.
*
* @author Tomasz Pylak
*/
-public enum MaterialReplicaSummaryAggregationType implements ISerializable
+public enum MaterialReplicaSummaryAggregationType implements Serializable
{
MEDIAN,
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialSimpleFeatureVectorSummary.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialSimpleFeatureVectorSummary.java
index 09850659f3b..a4cf63acc7b 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialSimpleFeatureVectorSummary.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialSimpleFeatureVectorSummary.java
@@ -16,12 +16,11 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.ExperimentReference;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -29,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class MaterialSimpleFeatureVectorSummary implements ISerializable
+public class MaterialSimpleFeatureVectorSummary implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialSummarySettings.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialSummarySettings.java
index 08aceb09feb..01099a5fe9f 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialSummarySettings.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/MaterialSummarySettings.java
@@ -16,16 +16,16 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
* @author Tomasz Pylak
*/
-public class MaterialSummarySettings implements ISerializable
+public class MaterialSummarySettings implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/NamedFeatureVector.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/NamedFeatureVector.java
index 028b66fde00..854f26aa71f 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/NamedFeatureVector.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/NamedFeatureVector.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -24,7 +25,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class NamedFeatureVector implements ISerializable
+public class NamedFeatureVector implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateContent.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateContent.java
index 1bc2d9b6901..8be794e5aad 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateContent.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateContent.java
@@ -16,9 +16,9 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.annotation.DoNotEscape;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
@@ -29,7 +29,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
* @author Tomasz Pylak
*/
@DoNotEscape
-public class PlateContent implements ISerializable
+public class PlateContent implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateImages.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateImages.java
index 223fddd039a..6ee82191ec5 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateImages.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateImages.java
@@ -16,9 +16,9 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
@@ -34,7 +34,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
* @author Tomasz Pylak
*/
-public class PlateImages implements ISerializable
+public class PlateImages implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateMetadata.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateMetadata.java
index 2980fdb26c3..ad1232fa51e 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateMetadata.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateMetadata.java
@@ -16,9 +16,9 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class PlateMetadata implements ISerializable
+public class PlateMetadata implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ScreeningDisplaySettings.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ScreeningDisplaySettings.java
index b09d3f8edcc..eef49223dcc 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ScreeningDisplaySettings.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ScreeningDisplaySettings.java
@@ -16,17 +16,16 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
-
/**
* Screening specific display settings.
*
* @author Piotr Buczek
*/
-public class ScreeningDisplaySettings implements ISerializable
+public class ScreeningDisplaySettings implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellContent.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellContent.java
index 0c4f8eefa8c..1430f52a1cb 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellContent.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellContent.java
@@ -16,11 +16,11 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityReference;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityPropertiesHolder;
@@ -34,7 +34,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class WellContent extends WellImage implements ISerializable, IEntityPropertiesHolder
+public class WellContent extends WellImage implements Serializable, IEntityPropertiesHolder
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellFeatureVectorReference.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellFeatureVectorReference.java
index f17d5e0000e..bddf9a73a4e 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellFeatureVectorReference.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellFeatureVectorReference.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -24,7 +25,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class WellFeatureVectorReference implements ISerializable
+public class WellFeatureVectorReference implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellImage.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellImage.java
index a4e896c2b93..28fe7b52063 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellImage.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellImage.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityReference;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
@@ -25,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class WellImage implements ISerializable
+public class WellImage implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellLocation.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellLocation.java
index 97b808cfb0d..c5232c32574 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellLocation.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellLocation.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.PlateUtils;
@@ -25,7 +26,7 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.PlateUtils;
*
* @author Tomasz Pylak
*/
-public class WellLocation implements ISerializable
+public class WellLocation implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellMetadata.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellMetadata.java
index db126ad7bb9..417af22f600 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellMetadata.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellMetadata.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
@@ -26,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class WellMetadata implements ISerializable
+public class WellMetadata implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellReference.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellReference.java
index 714332afbfc..fbc3e59fc8d 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellReference.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellReference.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -24,7 +25,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class WellReference implements ISerializable
+public class WellReference implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellReplicaImage.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellReplicaImage.java
index eba7366ace1..b654444f47d 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellReplicaImage.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellReplicaImage.java
@@ -16,7 +16,8 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+import java.io.Serializable;
+
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -25,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Tomasz Pylak
*/
-public class WellReplicaImage implements ISerializable
+public class WellReplicaImage implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellSearchCriteria.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellSearchCriteria.java
index 9d079cc84b4..30e246e000f 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellSearchCriteria.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellSearchCriteria.java
@@ -23,7 +23,6 @@ import com.google.gwt.user.client.rpc.IsSerializable;
import ch.systemsx.cisd.common.shared.basic.utils.StringUtils;
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolderWithIdentifier;
-import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BasicProjectIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
@@ -34,12 +33,12 @@ import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.d
*
* @author Tomasz Pylak
*/
-public class WellSearchCriteria implements ISerializable
+public class WellSearchCriteria implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
/** points to one experiment */
- public static final class SingleExperimentSearchCriteria implements ISerializable
+ public static final class SingleExperimentSearchCriteria implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
@@ -305,7 +304,7 @@ public class WellSearchCriteria implements ISerializable
}
}
- public static final class MaterialSearchCodesCriteria implements ISerializable
+ public static final class MaterialSearchCodesCriteria implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
@@ -358,7 +357,7 @@ public class WellSearchCriteria implements ISerializable
}
}
- public static final class MaterialSearchCriteria implements ISerializable
+ public static final class MaterialSearchCriteria implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
@@ -432,7 +431,7 @@ public class WellSearchCriteria implements ISerializable
}
}
- public static class AbstractMaterialFeaturesCriteria implements ISerializable
+ public static class AbstractMaterialFeaturesCriteria implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
@@ -464,7 +463,7 @@ public class WellSearchCriteria implements ISerializable
}
public static final class MaterialFeaturesOneExpCriteria extends
- AbstractMaterialFeaturesCriteria implements ISerializable
+ AbstractMaterialFeaturesCriteria implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
@@ -490,7 +489,7 @@ public class WellSearchCriteria implements ISerializable
}
public static final class MaterialFeaturesManyExpCriteria extends
- AbstractMaterialFeaturesCriteria implements ISerializable
+ AbstractMaterialFeaturesCriteria implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
@@ -516,11 +515,11 @@ public class WellSearchCriteria implements ISerializable
}
}
- public static final class AnalysisProcedureCriteria implements ISerializable
+ public static final class AnalysisProcedureCriteria implements Serializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
- public static enum MatchType implements ISerializable
+ public static enum MatchType implements Serializable
{
/** match data sets for explicitly specified analysis procedure code. */
BY_CODE,
--
GitLab