From 7a02d4ac99cfcf5356cddb291816647b2ba97505 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Mon, 6 May 2013 14:29:57 +0000
Subject: [PATCH] BIS-413 SP-645 improve error message
SVN: 29008
---
.../etl/dto/api/impl/FeatureVectorDataSetInformation.java | 4 ++--
.../openbis/dss/etl/jython/v1/JythonPlateDatasetFactory.java | 5 +++--
.../openbis/dss/etl/jython/v2/JythonPlateDatasetFactory.java | 5 +++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/FeatureVectorDataSetInformation.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/FeatureVectorDataSetInformation.java
index 4415f1b0ab1..467dad50c78 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/FeatureVectorDataSetInformation.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/FeatureVectorDataSetInformation.java
@@ -39,7 +39,7 @@ public class FeatureVectorDataSetInformation extends DataSetInformation
private static final long serialVersionUID = IServer.VERSION;
private List<FeatureDefinition> features;
-
+
public FeatureVectorDataSetInformation()
{
this.features = new ArrayList<FeatureDefinition>();
@@ -61,7 +61,7 @@ public class FeatureVectorDataSetInformation extends DataSetInformation
}
/** are all necessary fields filled? */
- public boolean isValid()
+ public boolean isNotEmpty()
{
return features != null && features.size() > 0;
}
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v1/JythonPlateDatasetFactory.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v1/JythonPlateDatasetFactory.java
index 49ca626638c..2ed635ec352 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v1/JythonPlateDatasetFactory.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v1/JythonPlateDatasetFactory.java
@@ -190,9 +190,10 @@ public class JythonPlateDatasetFactory extends ProgrammableDropboxObjectFactory<
featureVectorDataSet.setFeatures(featureDefinitions);
registrationDetails.setDataSetType(ScreeningConstants.DEFAULT_ANALYSIS_WELL_DATASET_TYPE);
registrationDetails.setMeasuredData(false);
- if (false == featureVectorDataSet.isValid())
+ if (false == featureVectorDataSet.isNotEmpty())
{
- throw new UserFailureException("The feature vector dataset is invalid.");
+ throw new UserFailureException(
+ "The feature vector dataset does not contain any features.");
}
return registrationDetails;
}
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/JythonPlateDatasetFactory.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/JythonPlateDatasetFactory.java
index fbafbffbd5e..1c89c46c68e 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/JythonPlateDatasetFactory.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/JythonPlateDatasetFactory.java
@@ -190,9 +190,10 @@ public class JythonPlateDatasetFactory extends ProgrammableDropboxObjectFactory<
featureVectorDataSet.setFeatures(featureDefinitions);
registrationDetails.setDataSetType(ScreeningConstants.DEFAULT_ANALYSIS_WELL_DATASET_TYPE);
registrationDetails.setMeasuredData(false);
- if (false == featureVectorDataSet.isValid())
+ if (false == featureVectorDataSet.isNotEmpty())
{
- throw new UserFailureException("The feature vector dataset is invalid.");
+ throw new UserFailureException(
+ "The feature vector dataset does not contain any features.");
}
return registrationDetails;
}
--
GitLab