From adffaces-commits-return-2339-apmail-incubator-adffaces-commits-archive=incubator.apache.org@incubator.apache.org Tue Apr 17 16:32:47 2007 Return-Path: Delivered-To: apmail-incubator-adffaces-commits-archive@locus.apache.org Received: (qmail 85968 invoked from network); 17 Apr 2007 16:32:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Apr 2007 16:32:47 -0000 Received: (qmail 61889 invoked by uid 500); 17 Apr 2007 16:32:53 -0000 Delivered-To: apmail-incubator-adffaces-commits-archive@incubator.apache.org Received: (qmail 61869 invoked by uid 500); 17 Apr 2007 16:32:53 -0000 Mailing-List: contact adffaces-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: adffaces-dev@incubator.apache.org Delivered-To: mailing list adffaces-commits@incubator.apache.org Received: (qmail 61860 invoked by uid 99); 17 Apr 2007 16:32:53 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Apr 2007 09:32:53 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Apr 2007 09:32:46 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 2353A1A9838; Tue, 17 Apr 2007 09:32:25 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r529668 - in /incubator/adffaces/trunk/trinidad/trinidad-impl/src/main: java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java javascript/META-INF/adf/jsLibs/CoreFormat.js Date: Tue, 17 Apr 2007 16:32:24 -0000 To: adffaces-commits@incubator.apache.org From: matzew@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070417163226.2353A1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: matzew Date: Tue Apr 17 09:32:16 2007 New Revision: 529668 URL: http://svn.apache.org/viewvc?view=rev&rev=529668 Log: ADFFACES-454 Client side number converter not working, when locale is set since number converter isn't working well on the client, we do only server side conversion, when locale has been set by the developer. Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java?view=diff&rev=529668&r1=529667&r2=529668 ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java Tue Apr 17 09:32:16 2007 @@ -21,6 +21,7 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; +import java.util.Locale; import java.util.Map; import javax.faces.component.UIComponent; @@ -115,6 +116,10 @@ String pattern = this.getPattern(); String type = this.getType(); + String localeString = "null"; + Locale locale = this.getLocale(); + if(locale != null) + localeString = locale.toString(); try { @@ -127,6 +132,14 @@ try { JsonUtils.writeString(outBuffer, type, false); + } catch (Exception e) + { + outBuffer.append("null"); + } + outBuffer.append(','); + try + { + JsonUtils.writeString(outBuffer, localeString, false); } catch (Exception e) { outBuffer.append("null"); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js?view=diff&rev=529668&r1=529667&r2=529668 ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js Tue Apr 17 09:32:16 2007 @@ -19,10 +19,12 @@ function TrNumberConverter( pattern, type, + locale, messages) { this._pattern = pattern; this._type = type; + this._locale = locale; this._messages = messages; // for debugging @@ -37,7 +39,7 @@ */ TrNumberConverter.prototype._isConvertible = function() { - if(this._pattern == null && this._type=="number") + if(this._pattern == null && this._locale == null && this._type=="number") { return true; }