SP-179, BIS-21: declare SimpleImageDataConfig.setPlate() deprecated

SVN: 26074

screening/source/core-plugins/cellomics/1/dss/drop-boxes/cellomics-dropbox/cellomics-dropbox.py

@@ -82,7 +82,6 @@ if incoming.isDirectory():
     imageDataset.setRawImageDatasetType()
     imageDataset.setGenerateThumbnails(True)
     imageDataset.setUseImageMagicToGenerateThumbnails(False)
-    imageDataset.setPlate(SPACE_CODE, PLATE_CODE)
     imageDataset.setImageLibrary('BioFormats', 'CellomicsReader##SINGLE_IMAGE')
     registrationDetails = factory.createImageRegistrationDetails(imageDataset, incoming)  
     transaction = service.transaction(incoming, factory)

screening/source/core-plugins/screening/1/dss/drop-boxes/hcs-dropbox/hcs-dropbox.py

@@ -79,7 +79,6 @@ def process(transaction):
         imageDataset.setRawImageDatasetType()
         imageDataset.setGenerateThumbnails(True)
         imageDataset.setUseImageMagicToGenerateThumbnails(False)
-        imageDataset.setPlate(SPACE_CODE, PLATE_CODE)
         plate = create_plate_if_needed(transaction)
         dataset = transaction.createNewImageDataSet(imageDataset, incoming);
         dataset.setSample(plate)

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/BasicDataSetInformation.java

@@ -18,6 +18,8 @@ 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;
@@ -50,7 +52,11 @@ public class BasicDataSetInformation extends DataSetInformation
         this.fileFormatTypeCode = fileFormatCode;
     }
 
-    /** Mandatory: sets attributes of the connected sample */
+    /**
+     * @deprecated instead invoke {@link IDataSet#setSample(ISampleImmutable)} on the
+     *             {@link IDataSet} object created.
+     */
+    @Deprecated
     public void setSample(String sampleSpaceCode, String sampleCode)
     {
         super.setSpaceCode(sampleSpaceCode);

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java

@@ -23,6 +23,7 @@ import java.util.List;
 
 import ch.systemsx.cisd.base.image.IImageTransformerFactory;
 import ch.systemsx.cisd.common.shared.basic.utils.StringUtils;
+import ch.systemsx.cisd.etlserver.registrator.api.v1.IDataSet;
 import ch.systemsx.cisd.openbis.dss.etl.dto.ImageLibraryInfo;
 import ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.thumbnails.DefaultThumbnailsConfiguration;
 import ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.thumbnails.IThumbnailsConfiguration;
@@ -31,6 +32,7 @@ import ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.thumbnails.ZoomLevelBasedThum
 import ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations.ConvertToolImageTransformerFactory;
 import ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations.ImageTransformation;
 import ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations.ImageTransformationBuffer;
+import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISampleImmutable;
 import ch.systemsx.cisd.openbis.dss.generic.shared.utils.ImageUtil;
 import ch.systemsx.cisd.openbis.generic.shared.basic.CodeNormalizer;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.Geometry;
@@ -353,7 +355,10 @@ 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;

screening/sourceTest/core-plugins/MiscellaneousDropBoxApiV2FeaturesTest/1/dss/drop-boxes/MiscellaneousDropBoxApiV2FeaturesTest-drop-box/data-set-handler.py

@@ -78,7 +78,6 @@ def process(transaction):
         imageDataset.setRawImageDatasetType()
         imageDataset.setGenerateThumbnails(True)
         imageDataset.setUseImageMagicToGenerateThumbnails(False)
-        imageDataset.setPlate(SPACE_CODE, PLATE_CODE)
         dataset = transaction.createNewImageDataSet(imageDataset, incoming);
         plateGeometry = dataset.figureGeometry()
         plate = create_plate_if_needed(transaction, plateGeometry)

screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/dropbox/hcs-simple-test.py

@@ -64,7 +64,6 @@ def process(transaction):
     imageDataset.setRawImageDatasetType()
     imageDataset.setGenerateThumbnails(True)
     imageDataset.setUseImageMagicToGenerateThumbnails(False)
-    imageDataset.setPlate(SPACE_CODE, PLATE_CODE)
     plate = create_plate_if_needed(transaction)
     dataset = transaction.createNewImageDataSet(imageDataset, incoming);
     dataset.setSample(plate)