From e83c352a1d0f4875c84a86c9e87baff2f61172a4 Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Wed, 18 Jun 2008 09:38:49 +0000
Subject: [PATCH] [LMS-460] change: - BDS does not write 'TRUE' but 'true' for
flag parameters.
SVN: 6673
---
bds/source/java/ch/systemsx/cisd/bds/Utilities.java | 5 +++--
.../java/ch/systemsx/cisd/bds/check/AbstractChecker.java | 4 ++--
.../ch/systemsx/cisd/bds/hcs/FormatParameterFactory.java | 5 +++--
.../java/ch/systemsx/cisd/bds/hcs/HCSImageFormattedData.java | 3 ++-
.../ch/systemsx/cisd/bds/hcs/HCSDataStructureTestV1_0.java | 3 ++-
.../ch/systemsx/cisd/bds/hcs/HCSImageFormattedDataTest.java | 5 +++--
6 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/bds/source/java/ch/systemsx/cisd/bds/Utilities.java b/bds/source/java/ch/systemsx/cisd/bds/Utilities.java
index 738fb493ff0..80281d396a6 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/Utilities.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/Utilities.java
@@ -242,11 +242,12 @@ public class Utilities
* A boolean object that only accepts <code>TRUE</code> or <code>FALSE</code> as value
* (case-sensitive).
*/
- private static enum Boolean
+ public static enum Boolean
{
TRUE, FALSE;
- final boolean toBoolean()
+ /** Converts this object to corresponding <code>boolean</code>. */
+ public final boolean toBoolean()
{
return this == TRUE ? true : false;
}
diff --git a/bds/source/java/ch/systemsx/cisd/bds/check/AbstractChecker.java b/bds/source/java/ch/systemsx/cisd/bds/check/AbstractChecker.java
index 2e0158e2445..a67bc7ea209 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/check/AbstractChecker.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/check/AbstractChecker.java
@@ -73,9 +73,9 @@ public abstract class AbstractChecker
public static final String WAVELENGTH = "wavelength";
- public static final String FALSE = "FALSE";
+ public static final String FALSE = ch.systemsx.cisd.bds.Utilities.Boolean.FALSE.toString();
- public static final String TRUE = "TRUE";
+ public static final String TRUE = ch.systemsx.cisd.bds.Utilities.Boolean.TRUE.toString();
public static final String FIRST_NAME = "first_name";
diff --git a/bds/source/java/ch/systemsx/cisd/bds/hcs/FormatParameterFactory.java b/bds/source/java/ch/systemsx/cisd/bds/hcs/FormatParameterFactory.java
index b6a16934b35..d3641d1b086 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/hcs/FormatParameterFactory.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/hcs/FormatParameterFactory.java
@@ -18,6 +18,7 @@ package ch.systemsx.cisd.bds.hcs;
import ch.systemsx.cisd.bds.FormatParameter;
import ch.systemsx.cisd.bds.IFormatParameterFactory;
+import ch.systemsx.cisd.bds.Utilities;
import ch.systemsx.cisd.bds.storage.IDirectory;
import ch.systemsx.cisd.bds.storage.INode;
@@ -76,7 +77,7 @@ public final class FormatParameterFactory implements IFormatParameterFactory
.parseInt(value));
} else if (nodeName.equals(HCSImageFormatV1_0.CONTAINS_ORIGINAL_DATA))
{
- return new FormatParameter(HCSImageFormatV1_0.CONTAINS_ORIGINAL_DATA, Boolean
+ return new FormatParameter(HCSImageFormatV1_0.CONTAINS_ORIGINAL_DATA, Utilities.Boolean
.valueOf(value));
}
return formatParameter;
@@ -103,7 +104,7 @@ public final class FormatParameterFactory implements IFormatParameterFactory
return new FormatParameter(name, Integer.parseInt(value));
} else if (name.equals(HCSImageFormatV1_0.CONTAINS_ORIGINAL_DATA))
{
- return new FormatParameter(name, Boolean.valueOf(value));
+ return new FormatParameter(name, Utilities.Boolean.valueOf(value));
}
return IFormatParameterFactory.DEFAULT_FORMAT_PARAMETER_FACTORY.createFormatParameter(name,
value);
diff --git a/bds/source/java/ch/systemsx/cisd/bds/hcs/HCSImageFormattedData.java b/bds/source/java/ch/systemsx/cisd/bds/hcs/HCSImageFormattedData.java
index 1431c801929..94da08eeab0 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/hcs/HCSImageFormattedData.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/hcs/HCSImageFormattedData.java
@@ -56,7 +56,8 @@ public final class HCSImageFormattedData extends AbstractFormattedData implement
public final boolean containsOriginalData()
{
- return (Boolean) getFormatParameters().getValue(HCSImageFormatV1_0.CONTAINS_ORIGINAL_DATA);
+ return ((Utilities.Boolean) getFormatParameters().getValue(
+ HCSImageFormatV1_0.CONTAINS_ORIGINAL_DATA)).toBoolean();
}
public final Geometry getWellGeometry()
diff --git a/bds/sourceTest/java/ch/systemsx/cisd/bds/hcs/HCSDataStructureTestV1_0.java b/bds/sourceTest/java/ch/systemsx/cisd/bds/hcs/HCSDataStructureTestV1_0.java
index f0049755000..3c0f9e74160 100644
--- a/bds/sourceTest/java/ch/systemsx/cisd/bds/hcs/HCSDataStructureTestV1_0.java
+++ b/bds/sourceTest/java/ch/systemsx/cisd/bds/hcs/HCSDataStructureTestV1_0.java
@@ -33,6 +33,7 @@ import ch.systemsx.cisd.bds.Format;
import ch.systemsx.cisd.bds.FormatParameter;
import ch.systemsx.cisd.bds.IDataStructure;
import ch.systemsx.cisd.bds.IFormattedData;
+import ch.systemsx.cisd.bds.Utilities;
import ch.systemsx.cisd.bds.exception.DataStructureException;
import ch.systemsx.cisd.bds.storage.filesystem.FileStorage;
import ch.systemsx.cisd.common.utilities.AbstractFileSystemTestCase;
@@ -53,7 +54,7 @@ public final class HCSDataStructureTestV1_0 extends AbstractFileSystemTestCase
{
dataStructure.setFormat(HCSImageFormatV1_0.HCS_IMAGE_1_0);
dataStructure.addFormatParameter(new FormatParameter(
- HCSImageFormatV1_0.CONTAINS_ORIGINAL_DATA, Boolean.TRUE));
+ HCSImageFormatV1_0.CONTAINS_ORIGINAL_DATA, Utilities.Boolean.TRUE));
dataStructure.addFormatParameter(new FormatParameter(HCSImageFormatV1_0.NUMBER_OF_CHANNELS,
new Integer(2)));
dataStructure.addFormatParameter(new FormatParameter(PlateGeometry.PLATE_GEOMETRY,
diff --git a/bds/sourceTest/java/ch/systemsx/cisd/bds/hcs/HCSImageFormattedDataTest.java b/bds/sourceTest/java/ch/systemsx/cisd/bds/hcs/HCSImageFormattedDataTest.java
index 2ad1ff093cf..964bc702eec 100644
--- a/bds/sourceTest/java/ch/systemsx/cisd/bds/hcs/HCSImageFormattedDataTest.java
+++ b/bds/sourceTest/java/ch/systemsx/cisd/bds/hcs/HCSImageFormattedDataTest.java
@@ -36,6 +36,7 @@ import ch.systemsx.cisd.bds.DataStructureV1_0;
import ch.systemsx.cisd.bds.Format;
import ch.systemsx.cisd.bds.FormattedDataFactory;
import ch.systemsx.cisd.bds.IFormatParameters;
+import ch.systemsx.cisd.bds.Utilities;
import ch.systemsx.cisd.bds.hcs.IHCSImageFormattedData.NodePath;
import ch.systemsx.cisd.bds.storage.IDirectory;
import ch.systemsx.cisd.bds.storage.IFile;
@@ -197,7 +198,7 @@ public class HCSImageFormattedDataTest extends AbstractFileSystemTestCase
will(returnValue(originalNode));
one(formatParameters).getValue(HCSImageFormatV1_0.CONTAINS_ORIGINAL_DATA);
- will(returnValue(Boolean.TRUE));
+ will(returnValue(Utilities.Boolean.TRUE));
}
});
final NodePath nodePath =
@@ -232,7 +233,7 @@ public class HCSImageFormattedDataTest extends AbstractFileSystemTestCase
will(returnValue(standardNode));
one(formatParameters).getValue(HCSImageFormatV1_0.CONTAINS_ORIGINAL_DATA);
- will(returnValue(Boolean.FALSE));
+ will(returnValue(Utilities.Boolean.FALSE));
}
});
final NodePath nodePath =
--
GitLab