cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: rev 36340 - cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding
Date Fri, 13 Aug 2004 12:28:59 GMT
Author: cziegeler
Date: Fri Aug 13 05:28:59 2004
New Revision: 36340

Modified:
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/MultiValueJXPathBindingBuilder.java
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/ValueJXPathBindingBuilder.java
Log:
Fix locale handling

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/MultiValueJXPathBindingBuilder.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/MultiValueJXPathBindingBuilder.java
(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/MultiValueJXPathBindingBuilder.java
Fri Aug 13 05:28:59 2004
@@ -37,7 +37,7 @@
  * </fb:multi-value>
  * </code></pre>
  *
- * @version CVS $Id: MultiValueJXPathBindingBuilder.java,v 1.4 2004/04/06 18:39:58 mpo Exp
$
+ * @version CVS $Id$
  */
 public class MultiValueJXPathBindingBuilder
     extends JXPathBindingBuilderBase {
@@ -62,8 +62,8 @@
             Element convertorEl = DomHelper.getChildElement(bindingElem, Constants.DEFINITION_NS,
"convertor");
             if (convertorEl != null) {
                 String datatype = DomHelper.getAttribute(convertorEl, "datatype");
-                String localeStr = convertorEl.getAttribute("datatype");
-                if (!localeStr.equals("")) {
+                String localeStr = convertorEl.getAttribute("locale");
+                if (localeStr != null && !localeStr.equals("")) {
                     convertorLocale = I18nUtils.parseLocale(localeStr);
                 }
 

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/ValueJXPathBindingBuilder.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/ValueJXPathBindingBuilder.java
(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/ValueJXPathBindingBuilder.java
Fri Aug 13 05:28:59 2004
@@ -37,7 +37,7 @@
  * &lt;/fb:value&gt;
  * </code></pre>
  *
- * @version CVS $Id: ValueJXPathBindingBuilder.java,v 1.3 2004/04/01 12:59:57 mpo Exp $
+ * @version CVS $Id$
  */
 public class ValueJXPathBindingBuilder extends JXPathBindingBuilderBase {
 
@@ -61,8 +61,8 @@
             Element convertorEl = DomHelper.getChildElement(bindingElm, Constants.DEFINITION_NS,
"convertor");
             if (convertorEl != null) {
                 String datatype = DomHelper.getAttribute(convertorEl, "datatype");
-                String localeStr = convertorEl.getAttribute("datatype");
-                if (!localeStr.equals("")) {
+                String localeStr = convertorEl.getAttribute("locale");
+                if (localeStr != null && !localeStr.equals("")) {
                     convertorLocale = I18nUtils.parseLocale(localeStr);
                 }
 

Mime
View raw message