From d4e963118a9a7bfcfb7b1cdb36f95d32689b4208 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Tue, 9 Feb 2010 13:47:52 +0000
Subject: [PATCH] LMS-1338 minor: javadoc, refactoring
SVN: 14653
---
.../screening/shared/basic/dto/PlateContent.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
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 caa9efc4428..b3e3114cc8b 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
@@ -23,7 +23,8 @@ import com.google.gwt.user.client.rpc.IsSerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
/**
- * Describes the whole plate - images and metadata of each non-empty well.
+ * Describes the whole plate - metadata of each non-empty well, references to datasets with images
+ * and analysis results.
*
* @author Tomasz Pylak
*/
@@ -31,7 +32,7 @@ public class PlateContent implements IsSerializable
{
private Sample plate;
- private List<WellMetadata> wells;
+ private List<WellMetadata> wellsMetadata;
// not null if exactly one image dataset exists
private DatasetImagesReference imagesOrNull;
@@ -49,16 +50,16 @@ public class PlateContent implements IsSerializable
{
}
- public PlateContent(Sample plate, List<WellMetadata> wells, DatasetImagesReference imagesOrNull,
- int imageDatasetsNumber, DatasetReference imageAnalysisDatasetOrNull,
- int imageAnalysisDatasetsNumber)
+ public PlateContent(Sample plate, List<WellMetadata> wells,
+ DatasetImagesReference imagesOrNull, int imageDatasetsNumber,
+ DatasetReference imageAnalysisDatasetOrNull, int imageAnalysisDatasetsNumber)
{
assert (imagesOrNull != null && imageDatasetsNumber == 1)
|| (imagesOrNull == null && imageDatasetsNumber != 1);
assert (imageAnalysisDatasetOrNull != null && imageAnalysisDatasetsNumber == 1)
|| (imageAnalysisDatasetOrNull == null && imageAnalysisDatasetsNumber != 1);
this.plate = plate;
- this.wells = wells;
+ this.wellsMetadata = wells;
this.imagesOrNull = imagesOrNull;
this.imageDatasetsNumber = imageDatasetsNumber;
this.imageAnalysisDatasetOrNull = imageAnalysisDatasetOrNull;
@@ -67,7 +68,7 @@ public class PlateContent implements IsSerializable
public List<WellMetadata> getWells()
{
- return wells;
+ return wellsMetadata;
}
/** can be null */
--
GitLab