From 35a19b04967ab7654fe98c97b65748eb8508db3f Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Mon, 6 Sep 2010 11:34:22 +0000
Subject: [PATCH] minor refactoring
SVN: 17722
---
.../api/v1/dto/FeatureVectorDatasetReference.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDatasetReference.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDatasetReference.java
index 530135bf8b4..7fba00145e4 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDatasetReference.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDatasetReference.java
@@ -28,7 +28,7 @@ public class FeatureVectorDatasetReference extends DatasetReference implements
{
private static final long serialVersionUID = 1L;
- private final IImageDatasetIdentifier imageDatasetIdentifier;
+ private final IImageDatasetIdentifier imageDatasetIdentifierOrNull;
@Deprecated
public FeatureVectorDatasetReference(String datasetCode, String datastoreServerUrl,
@@ -36,17 +36,17 @@ public class FeatureVectorDatasetReference extends DatasetReference implements
IImageDatasetIdentifier imageDatasetIdentifier)
{
super(datasetCode, datastoreServerUrl, plate, plateGeometry, registrationDate);
- this.imageDatasetIdentifier = imageDatasetIdentifier;
+ this.imageDatasetIdentifierOrNull = imageDatasetIdentifier;
}
public FeatureVectorDatasetReference(String datasetCode, String datastoreServerUrl,
PlateIdentifier plate, ExperimentIdentifier experimentIdentifier,
Geometry plateGeometry, Date registrationDate,
- IImageDatasetIdentifier imageDatasetIdentifier)
+ IImageDatasetIdentifier imageDatasetIdentifierOrNull)
{
super(datasetCode, datastoreServerUrl, plate, experimentIdentifier, plateGeometry,
registrationDate);
- this.imageDatasetIdentifier = imageDatasetIdentifier;
+ this.imageDatasetIdentifierOrNull = imageDatasetIdentifierOrNull;
}
/**
@@ -55,19 +55,19 @@ public class FeatureVectorDatasetReference extends DatasetReference implements
*/
public IImageDatasetIdentifier getParentImageDataset()
{
- return imageDatasetIdentifier;
+ return imageDatasetIdentifierOrNull;
}
@Override
public String toString()
{
- if (imageDatasetIdentifier == null)
+ if (imageDatasetIdentifierOrNull == null)
{
return super.toString() + " (no image data set)";
} else
{
return super.toString() + " from image dataset "
- + imageDatasetIdentifier.getDatasetCode();
+ + imageDatasetIdentifierOrNull.getDatasetCode();
}
}
}
--
GitLab