From b8c3842c89ebe1a91d1bd0ee421b4873d9f37fa0 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Wed, 23 Mar 2011 12:51:04 +0000
Subject: [PATCH] LMS-2131 Added support for TopLevelDataHandler in the DSS-RPC
mechanism.
SVN: 20468
---
.../etl/jython/JythonPlateDataSetHandler.java | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/JythonPlateDataSetHandler.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/JythonPlateDataSetHandler.java
index 089757a26ac..eda87c85550 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/JythonPlateDataSetHandler.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/JythonPlateDataSetHandler.java
@@ -50,9 +50,10 @@ public class JythonPlateDataSetHandler extends JythonTopLevelDataSetHandler<Data
*/
@Override
protected IDataSetRegistrationDetailsFactory<DataSetInformation> createObjectFactory(
- PythonInterpreter interpreter)
+ PythonInterpreter interpreter, DataSetInformation userProvidedDataSetInformationOrNull)
{
- return new JythonPlateDatasetFactory(getRegistratorState());
+ return new JythonPlateDatasetFactory(getRegistratorState(),
+ userProvidedDataSetInformationOrNull);
}
public static class JythonPlateDatasetFactory extends JythonObjectFactory<DataSetInformation>
@@ -61,11 +62,14 @@ public class JythonPlateDataSetHandler extends JythonTopLevelDataSetHandler<Data
private final IDataSetRegistrationDetailsFactory<FeatureVectorDataSetInformation> featureVectorDatasetFactory;
- public JythonPlateDatasetFactory(OmniscientTopLevelDataSetRegistratorState registratorState)
+ public JythonPlateDatasetFactory(
+ OmniscientTopLevelDataSetRegistratorState registratorState,
+ DataSetInformation userProvidedDataSetInformationOrNull)
{
- super(registratorState);
+ super(registratorState, userProvidedDataSetInformationOrNull);
this.imageDatasetFactory =
- new JythonObjectFactory<ImageDataSetInformation>(this.registratorState)
+ new JythonObjectFactory<ImageDataSetInformation>(this.registratorState,
+ this.userProvidedDataSetInformationOrNull)
{
@Override
protected ImageDataSetInformation createDataSetInformation()
@@ -74,7 +78,8 @@ public class JythonPlateDataSetHandler extends JythonTopLevelDataSetHandler<Data
}
};
this.featureVectorDatasetFactory =
- new JythonObjectFactory<FeatureVectorDataSetInformation>(this.registratorState)
+ new JythonObjectFactory<FeatureVectorDataSetInformation>(this.registratorState,
+ this.userProvidedDataSetInformationOrNull)
{
@Override
protected FeatureVectorDataSetInformation createDataSetInformation()
--
GitLab