From 1d06ee5c97cfdb831b327e4a303fc19133b8767e Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Fri, 27 May 2011 13:16:14 +0000
Subject: [PATCH] [LMS-2282] minor: changed error message
SVN: 21495
---
.../cisd/openbis/generic/server/business/bo/DataBO.java | 8 ++++----
.../openbis/generic/server/business/bo/DataBOTest.java | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBO.java
index bb5debc0096..0a59d6c0603 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBO.java
@@ -230,7 +230,7 @@ public class DataBO extends AbstractDataSetBusinessObject implements IDataBO
{
final DataPE contained = getOrCreateData(containedCode, experiment);
data.addComponent(contained);
- checkSameSpace(data, contained); // needed for already existing data sets
+ checkSameSpace(data, contained);
}
}
}
@@ -508,9 +508,9 @@ public class DataBO extends AbstractDataSetBusinessObject implements IDataBO
{
return;
}
- throw UserFailureException.fromTemplate("Data set's '%s' space ('%s') needs to be the same"
- + " as its container's '%s' space ('%s').", component.getCode(), component
- .getSpace().getCode(), container.getCode(), container.getSpace().getCode());
+ throw UserFailureException.fromTemplate(
+ "Data set '%s' must be in the same space ('%s') as its container.",
+ component.getCode(), container.getSpace().getCode());
}
private void checkSameSpace(DataPE container, List<DataPE> components)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java
index 3ef8ec0ada9..09219551463 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java
@@ -515,8 +515,8 @@ public class DataBOTest extends AbstractBOTest
fail("Expected UserFailureException");
} catch (UserFailureException ex)
{
- assertEquals("Data set's '" + COMPONENT_CODE + "' space ('S2') needs to be the same"
- + " as its container's 'DS1' space ('S1').", ex.getMessage());
+ assertEquals("Data set '" + COMPONENT_CODE
+ + "' must be in the same space ('S1') as its container.", ex.getMessage());
}
context.assertIsSatisfied();
@@ -644,7 +644,7 @@ public class DataBOTest extends AbstractBOTest
createDataSetUpdates(dataSet, null, EXPERIMENT_IDENTIFIER);
String[] componentCodes =
{ COMPONENT_CODE };
- dataSetUpdatesDTO.setModifiedParentDatasetCodesOrNull(componentCodes);
+ dataSetUpdatesDTO.setModifiedContainedDatasetCodesOrNull(componentCodes);
prepareForUpdate(dataSet, experiment);
context.checking(new Expectations()
{
--
GitLab