diff --git a/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java b/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java index 79f7f406f632decac59ae2017cb97280fcc5a953..7e88a22c7ac1b134276bd968a4f2c720dce4c026 100644 --- a/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java +++ b/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java @@ -162,7 +162,7 @@ public class DataStructureV1_0 extends AbstractDataStructure /** * Sets the date of registration of the experiment. */ - public void setExperimentRegistartionDate(ExperimentRegistratorDate date) + public void setExperimentRegistrationDate(ExperimentRegistratorDate date) { assertOpenOrCreated(); date.saveTo(getMetaDataDirectory()); diff --git a/bds/source/java/ch/systemsx/cisd/bds/Utilities.java b/bds/source/java/ch/systemsx/cisd/bds/Utilities.java index 89eabf7e6c6ec26a84e987dc92de89b40da05891..01918eed3152305129ff9208011e3df0d458b4fe 100644 --- a/bds/source/java/ch/systemsx/cisd/bds/Utilities.java +++ b/bds/source/java/ch/systemsx/cisd/bds/Utilities.java @@ -43,7 +43,8 @@ public class Utilities { return (IDirectory) node; } - throw new DataStructureException("There is already a node named '" + name + "' but which isn't a directory."); + throw new DataStructureException("There is already a node named '" + name + "' but which isn't a directory (" + + node + ")."); } /** diff --git a/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureLoaderTest.java b/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureLoaderTest.java index 13899c31b63594812993e55daa3e23af3fc465dd..93a0ddaef881e6e99f503bb929a364de6649578b 100644 --- a/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureLoaderTest.java +++ b/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureLoaderTest.java @@ -47,7 +47,7 @@ public final class DataStructureLoaderTest extends AbstractFileSystemTestCase dataStructure.setExperimentIdentifier(experimentIdentifier); ExperimentRegistrator experimentRegistrator = new ExperimentRegistrator("john", "doe", "j@doe"); dataStructure.setExperimentRegistrator(experimentRegistrator); - dataStructure.setExperimentRegistartionDate(new ExperimentRegistratorDate(new Date(0))); + dataStructure.setExperimentRegistrationDate(new ExperimentRegistratorDate(new Date(0))); dataStructure.setMeasurementEntity(new MeasurementEntity("a", "b")); dataStructure.setProcessingType(ProcessingType.RAW_DATA); dataStructure.close(); diff --git a/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java b/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java index de45734868d8b8dea319aee6e84711e3886a636d..c98844fd8d21043d367f581d16c0ffb398a64888 100644 --- a/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java +++ b/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java @@ -290,7 +290,7 @@ public final class DataStructureV1_0Test extends AbstractFileSystemTestCase dataStructure.getOriginalData().addKeyValuePair("answer", "42"); dataStructure.setFormat(UnknownFormat1_0.UNKNOWN_1_0); dataStructure.setExperimentIdentifier(new ExperimentIdentifier("g", "p", "e")); - dataStructure.setExperimentRegistartionDate(new ExperimentRegistratorDate(new Date(0))); + dataStructure.setExperimentRegistrationDate(new ExperimentRegistratorDate(new Date(0))); try { dataStructure.close(); @@ -327,7 +327,7 @@ public final class DataStructureV1_0Test extends AbstractFileSystemTestCase dataStructure.setFormat(UnknownFormat1_0.UNKNOWN_1_0); dataStructure.setExperimentIdentifier(new ExperimentIdentifier("g", "p", "e")); dataStructure.setExperimentRegistrator(new ExperimentRegistrator("g", "p", "g@p")); - dataStructure.setExperimentRegistartionDate(new ExperimentRegistratorDate(new Date(0))); + dataStructure.setExperimentRegistrationDate(new ExperimentRegistratorDate(new Date(0))); try { dataStructure.close(); @@ -346,7 +346,7 @@ public final class DataStructureV1_0Test extends AbstractFileSystemTestCase dataStructure.setFormat(UnknownFormat1_0.UNKNOWN_1_0); dataStructure.setExperimentIdentifier(new ExperimentIdentifier("g", "p", "e")); dataStructure.setExperimentRegistrator(new ExperimentRegistrator("g", "p", "g@p")); - dataStructure.setExperimentRegistartionDate(new ExperimentRegistratorDate(new Date(0))); + dataStructure.setExperimentRegistrationDate(new ExperimentRegistratorDate(new Date(0))); dataStructure.setMeasurementEntity(new MeasurementEntity("a", "b")); try { @@ -368,7 +368,7 @@ public final class DataStructureV1_0Test extends AbstractFileSystemTestCase dataStructure.setExperimentIdentifier(experimentIdentifier); ExperimentRegistratorDate experimentRegistratorDate = new ExperimentRegistratorDate(new Date(4711L * 4711000L)); System.out.println(experimentRegistratorDate); - dataStructure.setExperimentRegistartionDate(experimentRegistratorDate); + dataStructure.setExperimentRegistrationDate(experimentRegistratorDate); ExperimentRegistrator experimentRegistrator = new ExperimentRegistrator("john", "doe", "j@doe"); dataStructure.setExperimentRegistrator(experimentRegistrator); MeasurementEntity measurementEntity = new MeasurementEntity("cp001", "plate");