[LMS-2282] minor: changed error message

SVN: 21495

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)

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()
             {