Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 68603 invoked from network); 2 Nov 2004 14:25:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 2 Nov 2004 14:25:23 -0000 Received: (qmail 4366 invoked by uid 500); 2 Nov 2004 14:22:33 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 4201 invoked by uid 500); 2 Nov 2004 14:22:32 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 4111 invoked by uid 99); 2 Nov 2004 14:22:30 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 02 Nov 2004 06:22:29 -0800 Received: (qmail 64964 invoked by uid 65534); 2 Nov 2004 14:22:27 -0000 Date: 2 Nov 2004 14:22:27 -0000 Message-ID: <20041102142227.64960.qmail@minotaur.apache.org> From: vgritsenko@apache.org To: cvs@cocoon.apache.org Subject: svn commit: rev 56374 - cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: vgritsenko Date: Tue Nov 2 06:22:26 2004 New Revision: 56374 Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/ConvertDateTimeTag.java Log: Default values for timeStyle and dateStyle Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/ConvertDateTimeTag.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/ConvertDateTimeTag.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/ConvertDateTimeTag.java Tue Nov 2 06:22:26 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) {