diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/GeneMaterialViewer.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/GeneMaterialViewer.java
index 55bfda87e2c3a9fd3d6fc86a673ce482e52cf0a3..6e8336f18483ada664c210e45dcc1e37cec2c08e 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/GeneMaterialViewer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/GeneMaterialViewer.java
@@ -54,7 +54,7 @@ import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.IScreeningCli
import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.detailviewers.ChannelChooser.DefaultChannelState;
import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.detailviewers.ChannelChooser.IChanneledViewerFactory;
import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.utils.GuiUtils;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.TileImages;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.DatasetImagesReference;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellContent;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellLocation;
@@ -190,7 +190,7 @@ public class GeneMaterialViewer extends AbstractViewer<Material>
int max = 0;
for (WellContent well : wells)
{
- TileImages images = well.tryGetImages();
+ DatasetImagesReference images = well.tryGetImages();
if (images != null)
{
max = Math.max(max, images.getImageParameters().getChannelsNum());
@@ -227,7 +227,7 @@ public class GeneMaterialViewer extends AbstractViewer<Material>
Widget contentLink = createEntityLink(wellContent.getMaterialContent());
container.add(withLabel(contentLink, "Content: ", margin));
- TileImages images = wellContent.tryGetImages();
+ DatasetImagesReference images = wellContent.tryGetImages();
if (images != null)
{
Widget datasetLink = createEntityLink(images.getDatasetReference(), "browse");
@@ -238,7 +238,7 @@ public class GeneMaterialViewer extends AbstractViewer<Material>
return container;
}
- private Widget createImageViewer(TileImages images, WellLocation locationOrNull, int channel)
+ private Widget createImageViewer(DatasetImagesReference images, WellLocation locationOrNull, int channel)
{
if (locationOrNull == null)
{
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/WellData.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/WellData.java
index dae9ad6173281ddae8e12a5420d413166fe8fd72..9503d5a496db223e50b1509d83661a852ff8779d 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/WellData.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/WellData.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExperimentIdentifier;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateContent;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.TileImages;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.DatasetImagesReference;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellLocation;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellMetadata;
@@ -49,7 +49,7 @@ class WellData
private static WellImages tryCreateWellImages(PlateContent plateContent, WellLocation location)
{
- TileImages images = plateContent.tryGetImages();
+ DatasetImagesReference images = plateContent.tryGetImages();
if (images != null)
{
return new WellImages(images.getImageParameters(), images.getDownloadUrl(), location);
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/WellImages.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/WellImages.java
index 299fcbc9fa994f7f3cd5ef69e9cdceaadc433ba3..8660c2fd82d6042146fdb8f4c1080e227e0f5f80 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/WellImages.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/WellImages.java
@@ -17,7 +17,7 @@
package ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.detailviewers;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateImageParameters;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.TileImages;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.DatasetImagesReference;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellLocation;
/**
@@ -49,7 +49,7 @@ public class WellImages
this.location = location;
}
- public WellImages(TileImages images, WellLocation location)
+ public WellImages(DatasetImagesReference images, WellLocation location)
{
this(images.getImageParameters(), images.getDownloadUrl(), location);
}
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/GenePlateLocationsLoader.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/GenePlateLocationsLoader.java
index 56fa0dcecbbe8674cae42003d8ecfa028db8996c..c3210620d96f563a441d833784b581fc409053e3 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/GenePlateLocationsLoader.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/GenePlateLocationsLoader.java
@@ -44,7 +44,7 @@ import ch.systemsx.cisd.openbis.plugin.screening.server.IScreeningBusinessObject
import ch.systemsx.cisd.openbis.plugin.screening.server.dataaccess.IScreeningQuery;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.DatasetReference;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateImageParameters;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.TileImages;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.DatasetImagesReference;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellContent;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellLocation;
@@ -110,8 +110,8 @@ public class GenePlateLocationsLoader
{
DatasetReference datasetReference =
ScreeningUtils.createDatasetReference(dataset);
- TileImages wellImages =
- TileImages.create(datasetReference, imageParameters);
+ DatasetImagesReference wellImages =
+ DatasetImagesReference.create(datasetReference, imageParameters);
WellContent wellWithImages = wellContent.cloneWithImages(wellImages);
wellsWithImages.add(wellWithImages);
imagesExist = true;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/PlateContentLoader.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/PlateContentLoader.java
index d2a8995ca0464ae22376206f562801e7707f50d6..caa98fed997b63fd3ed3d7eef906662d7b65b3fb 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/PlateContentLoader.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/PlateContentLoader.java
@@ -40,7 +40,7 @@ import ch.systemsx.cisd.openbis.plugin.screening.server.IScreeningBusinessObject
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.DatasetReference;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateContent;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateImageParameters;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.TileImages;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.DatasetImagesReference;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellLocation;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellMetadata;
@@ -77,7 +77,7 @@ public class PlateContentLoader
List<ExternalDataPE> datasets = loadDatasets(plateId, externalDataTable);
List<WellMetadata> wells = loadWells(plateId);
- TileImages images = null;
+ DatasetImagesReference images = null;
int imageDatasetsNumber = countDatasets(datasets, ScreeningConstants.IMAGE_DATASET_TYPE);
if (imageDatasetsNumber == 1)
{
@@ -132,7 +132,7 @@ public class PlateContentLoader
return createWells(wells);
}
- private TileImages tryLoadImages(List<ExternalDataPE> datasets,
+ private DatasetImagesReference tryLoadImages(List<ExternalDataPE> datasets,
IExternalDataTable externalDataTable)
{
ExternalDataPE dataset = tryFindDataset(datasets, ScreeningConstants.IMAGE_DATASET_TYPE);
@@ -153,10 +153,10 @@ public class PlateContentLoader
return externalData;
}
- private TileImages loadImages(IExternalDataTable externalDataTable, ExternalDataPE dataset)
+ private DatasetImagesReference loadImages(IExternalDataTable externalDataTable, ExternalDataPE dataset)
{
PlateImageParameters imageParameters = loadImageParams(dataset, externalDataTable);
- return TileImages.create(ScreeningUtils.createDatasetReference(dataset), imageParameters);
+ return DatasetImagesReference.create(ScreeningUtils.createDatasetReference(dataset), imageParameters);
}
private PlateImageParameters loadImageParams(ExternalDataPE dataset,
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/TileImages.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/DatasetImagesReference.java
similarity index 78%
rename from screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/TileImages.java
rename to screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/DatasetImagesReference.java
index c5dcb427ba2efde1fbb263443506dd7217a15df6..ca1b486df015d7a025ffc1eba616ebab53e6daf9 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/TileImages.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/DatasetImagesReference.java
@@ -25,11 +25,12 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolder;
*
* @author Tomasz Pylak
*/
-public class TileImages implements IsSerializable
+public class DatasetImagesReference implements IsSerializable
{
- public static final TileImages create(DatasetReference dataset, PlateImageParameters imageParams)
+ public static final DatasetImagesReference create(DatasetReference dataset,
+ PlateImageParameters imageParams)
{
- return new TileImages(dataset, imageParams);
+ return new DatasetImagesReference(dataset, imageParams);
}
private DatasetReference dataset;
@@ -38,11 +39,11 @@ public class TileImages implements IsSerializable
// GWT only
@SuppressWarnings("unused")
- private TileImages()
+ private DatasetImagesReference()
{
}
- public TileImages(DatasetReference dataset, PlateImageParameters imageParameters)
+ public DatasetImagesReference(DatasetReference dataset, PlateImageParameters imageParameters)
{
this.dataset = dataset;
this.imageParameters = imageParameters;
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 0c15e5d580d3a05897cfb0308c6875ef581ca744..caa9efc4428f84f0fa1627a8871717f47058b890 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
@@ -34,7 +34,7 @@ public class PlateContent implements IsSerializable
private List<WellMetadata> wells;
// not null if exactly one image dataset exists
- private TileImages imagesOrNull;
+ private DatasetImagesReference imagesOrNull;
// not null if exactly one image analysis dataset exists
private DatasetReference imageAnalysisDatasetOrNull;
@@ -49,7 +49,7 @@ public class PlateContent implements IsSerializable
{
}
- public PlateContent(Sample plate, List<WellMetadata> wells, TileImages imagesOrNull,
+ public PlateContent(Sample plate, List<WellMetadata> wells, DatasetImagesReference imagesOrNull,
int imageDatasetsNumber, DatasetReference imageAnalysisDatasetOrNull,
int imageAnalysisDatasetsNumber)
{
@@ -71,7 +71,7 @@ public class PlateContent implements IsSerializable
}
/** can be null */
- public TileImages tryGetImages()
+ public DatasetImagesReference tryGetImages()
{
return imagesOrNull;
}
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 4b9ad7fcab7a27802988d09c3d3b87dc23e804ed..b0d8eec669cdf082f5fb3a8368ddd6330163c8a2 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
@@ -37,7 +37,7 @@ public class WellContent implements IsSerializable
private EntityReference materialContent;
// contains only images for this well, null if no images have been acquired
- private TileImages imagesOrNull;
+ private DatasetImagesReference imagesOrNull;
// GWT only
@SuppressWarnings("unused")
@@ -74,12 +74,12 @@ public class WellContent implements IsSerializable
return materialContent;
}
- public TileImages tryGetImages()
+ public DatasetImagesReference tryGetImages()
{
return imagesOrNull;
}
- public WellContent cloneWithImages(TileImages images)
+ public WellContent cloneWithImages(DatasetImagesReference images)
{
WellContent clone = new WellContent(locationOrNull, well, plate, materialContent);
clone.imagesOrNull = images;