svn commit: r529301 - in /incubator/adffaces/trunk/trinidad/trinidad-impl/src/main: java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java javascript/META-INF/adf/jsLibs/CoreFormat.js

[matzew]

Author: matzew
Date: Mon Apr 16 09:05:30 2007
New Revision: 529301

URL: http://svn.apache.org/viewvc?view=rev&rev=529301
Log:
ADFFACES-450. enabled messageDetailConvertNumber for the client side version of 
the NumberConverter

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=529301&r1=529300&r2=529301
==============================================================================
--- 
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
 Mon Apr 16 09:05:30 2007
@@ -77,11 +77,13 @@
   public String getClientConversion(FacesContext context, UIComponent 
component)
   {
     String hintPattern = this.getHintPattern();
+    String messageDetailConvertNumber = this.getMessageDetailConvertNumber();
     Map<String, String> cMessages = null;
-    if(hintPattern != null)
+    if(hintPattern != null || messageDetailConvertNumber != null)
     {
       cMessages = new HashMap<String, String>();
       cMessages.put("hintPattern", hintPattern);
+      cMessages.put("number", messageDetailConvertNumber);
     }
     
     return _getTrNumberConverter(context, component, cMessages);

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=529301&r1=529300&r2=529301
==============================================================================
--- 
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
 Mon Apr 16 09:05:30 2007
@@ -98,17 +98,17 @@
 {
        if(this._isConvertible())
        {
-    return _decimalParse(numberString, 
-                       this._messages,
-                       "org.apache.myfaces.trinidad.convert.NumberConverter",
-                       null,
-                       null,
-                       null,
-                       null,
-                       label,
-                       null);
-       }
-       else
+               return _decimalParse(numberString, 
+                         this._messages,
+                         "org.apache.myfaces.trinidad.convert.NumberConverter",
+                         null,
+                         null,
+                         null,
+                         null,
+                         label,
+                         null);
+  }
+  else
        {
     return undefined;
        }
@@ -1013,6 +1013,7 @@
     }
   }
   var usedKey = null;
+  var custom = false;
   if(standardKey.indexOf("NumberConverter")==-1)
   {
     usedKey = standardKey+".CONVERT";
@@ -1020,10 +1021,22 @@
   else
   {
     usedKey = standardKey+".CONVERT_NUMBER";
+    if(message && message["number"])
+    {
+      facesMessage = 
_createCustomFacesMessage(TrMessageFactory.getSummaryString(usedKey),
+                                        message["number"],
+                                        label,
+                                        numberString);
+      custom = true;
+    }
   }
-  facesMessage = _createFacesMessage( usedKey,
+  if(!custom)
+  {
+    facesMessage = _createFacesMessage( usedKey,
                                         label,
                                         numberString);
+  }
+
   throw new TrConverterException(facesMessage);
 }