From 31103e4096f929ba3212982f159a828310a0f3ba Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Wed, 18 Jul 2012 08:18:58 +0000
Subject: [PATCH] SP-179, BIS-21: Revert making
SimpleImageDataConfig.setPlate() deprecated
SVN: 26139
---
.../dss/etl/dto/api/v1/BasicDataSetInformation.java | 8 +-------
.../openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java | 3 ---
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/BasicDataSetInformation.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/BasicDataSetInformation.java
index f1eadcc3e69..84e47523830 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/BasicDataSetInformation.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/BasicDataSetInformation.java
@@ -18,8 +18,6 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
import java.util.Arrays;
-import ch.systemsx.cisd.etlserver.registrator.api.v1.IDataSet;
-import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISampleImmutable;
import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.IServer;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetType;
@@ -52,11 +50,7 @@ public class BasicDataSetInformation extends DataSetInformation
this.fileFormatTypeCode = fileFormatCode;
}
- /**
- * @deprecated instead invoke {@link IDataSet#setSample(ISampleImmutable)} on the
- * {@link IDataSet} object created.
- */
- @Deprecated
+ /** Mandatory: sets attributes of the connected sample */
public void setSample(String sampleSpaceCode, String sampleCode)
{
super.setSpaceCode(sampleSpaceCode);
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java
index 9e6e681d620..cc705f76551 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java
@@ -369,10 +369,7 @@ abstract public class SimpleImageDataConfig
*
* @param spaceCode space where the plate for which the dataset has been acquired exist
* @param plateCode code of the plate to which the dataset will belong
- * @deprecated instead invoke {@link IDataSet#setSample(ISampleImmutable)} on the
- * {@link IDataSet} object created.
*/
- @Deprecated
public void setPlate(String spaceCode, String plateCode)
{
this.spaceCode = spaceCode;
--
GitLab