From 6b7556341fa3d8e559a8e482e91adfce2ca7ed6d Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Tue, 23 Mar 2010 17:49:22 +0000
Subject: [PATCH] LMS-1459 Added support for M/d/yy HH:mm timestamp format +
test.
SVN: 15239
---
.../cisd/openbis/generic/server/util/PropertyValidator.java | 4 +++-
.../generic/server/business/bo/PropertyValidatorTest.java | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/PropertyValidator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/PropertyValidator.java
index a13bcfc74c8..6209165db87 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/PropertyValidator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/PropertyValidator.java
@@ -59,9 +59,11 @@ public final class PropertyValidator implements IPropertyValueValidator
SECONDS_DATE_PATTERN("yyyy-MM-dd HH:mm:ss"),
US_DATE_PATTERN("M/d/yy"),
-
+
US_DATE_TIME_PATTERN("M/d/yy h:mm a"),
+ US_DATE_TIME_24_PATTERN("M/d/yy HH:mm"),
+
CANONICAL_DATE_PATTERN(BasicConstant.CANONICAL_DATE_FORMAT_PATTERN),
RENDERED_CANONICAL_DATE_PATTERN(BasicConstant.RENDERED_CANONICAL_DATE_FORMAT_PATTERN);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyValidatorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyValidatorTest.java
index 16aa398b54c..cffed695abb 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyValidatorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyValidatorTest.java
@@ -121,6 +121,10 @@ public final class PropertyValidatorTest extends AbstractBOTest
createTimestampPropertyType(),
DateFormatUtils.format(new Date(),
SupportedDatePattern.CANONICAL_DATE_PATTERN.getPattern()) },
+ {
+ createTimestampPropertyType(),
+ DateFormatUtils.format(new Date(),
+ SupportedDatePattern.US_DATE_TIME_24_PATTERN.getPattern()) },
{ createIntegerPropertyType(), "1" },
{ createRealPropertyType(), "1" },
{ createRealPropertyType(), "1.1" },
--
GitLab