You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2004/11/02 15:23:11 UTC

svn commit: rev 56375 - cocoon/trunk/src/blocks/faces/java/org/apache/cocoon/faces/taglib

Author: vgritsenko
Date: Tue Nov  2 06:23:10 2004
New Revision: 56375

Modified:
   cocoon/trunk/src/blocks/faces/java/org/apache/cocoon/faces/taglib/ConvertDateTimeTag.java
Log:
Default values for dateStyle and timeStyle


Modified: cocoon/trunk/src/blocks/faces/java/org/apache/cocoon/faces/taglib/ConvertDateTimeTag.java
==============================================================================
--- cocoon/trunk/src/blocks/faces/java/org/apache/cocoon/faces/taglib/ConvertDateTimeTag.java	(original)
+++ cocoon/trunk/src/blocks/faces/java/org/apache/cocoon/faces/taglib/ConvertDateTimeTag.java	Tue Nov  2 06:23:10 2004
@@ -72,9 +72,12 @@
         final UIComponentTag tag = FacesUtils.findParentUIComponentTag(this);
         DateTimeConverter converter = (DateTimeConverter) super.createConverter();
 
-        converter.setDateStyle((String) tag.evaluate(dateStyle));
         converter.setPattern((String) tag.evaluate(pattern));
-        converter.setTimeStyle((String) tag.evaluate(timeStyle));
+
+        String ds = dateStyle == null? "default": (String) tag.evaluate(dateStyle);
+        String ts = timeStyle == null? "default": (String) tag.evaluate(timeStyle);
+        converter.setDateStyle(ds);
+        converter.setTimeStyle(ts);
 
         String t = null;
         if (type != null) {