svn commit: r559000 - /myfaces/trinidad/branches/matzew1211-core/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java

[ma...@apache.org]

Author: matzew
Date: Tue Jul 24 03:25:06 2007
New Revision: 559000

URL: http://svn.apache.org/viewvc?view=rev&rev=559000
Log:
modified NumberConverter on tmp branch

Modified:
    myfaces/trinidad/branches/matzew1211-core/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java

Modified: myfaces/trinidad/branches/matzew1211-core/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzew1211-core/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java?view=diff&rev=559000&r1=558999&r2=559000
==============================================================================
--- myfaces/trinidad/branches/matzew1211-core/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java (original)
+++ myfaces/trinidad/branches/matzew1211-core/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java Tue Jul 24 03:25:06 2007
@@ -232,7 +232,20 @@
     if (pp.getIndex() != value.length())
     {
       Object label = ConverterUtils.getComponentLabel(component);
-      Object[] params = {label, value, getPattern()};
+      Object[] params = null;
+      if("currency".equals(type))
+      {
+        params = new Object[] {label, getPattern(), fmt.format(_EXAMPLE_CURRENCY)};
+      }
+      else if("percent".equals(type))
+      {
+        params = new Object[] {label, getPattern(), fmt.format(_EXAMPLE_PERCENT)};
+      }
+      else
+      {
+        params = new Object[] {label, getPattern()};
+      }
+
       throw new ConverterException(
         getConvertMessage(context, component, value, params));
     }
@@ -946,22 +959,22 @@
 
     formatter.setGroupingUsed(isGroupingUsed());
 
-    if (_maxFractionDigitsSpecified())
+    if (isMaximumFractionDigitsSet())
     {
         formatter.setMaximumFractionDigits(getMaxFractionDigits());
     }
 
-    if (_maxIntegerDigitsSpecified())
+    if (isMaximumIntegerDigitsSet())
     {
       formatter.setMaximumIntegerDigits(getMaxIntegerDigits());
     }
 
-    if (_minFractionDigitsSpecified())
+    if (isMinimumFractionDigitsSet())
     {
       formatter.setMinimumFractionDigits(getMinFractionDigits());
     }
 
-    if (_minIntegerDigitsSpecified())
+    if (isMinimumIntegerDigitsSet())
     {
       formatter.setMinimumIntegerDigits(getMinIntegerDigits());
     }
@@ -1171,22 +1184,22 @@
         "NOT_VALID_TYPE", type));
   }
 
-  private boolean _maxFractionDigitsSpecified()
+  protected boolean isMaximumFractionDigitsSet()
   {
     return _facesBean.getProperty(_MAX_FRACTION_DIGITS_KEY) != null;
   }
 
-  private boolean _minFractionDigitsSpecified()
+  protected boolean isMinimumFractionDigitsSet()
   {
     return _facesBean.getProperty(_MIN_FRACTION_DIGITS_KEY) != null;
   }
 
-  private boolean _maxIntegerDigitsSpecified()
+  protected boolean isMaximumIntegerDigitsSet()
   {
     return _facesBean.getProperty(_MAX_INTEGER_DIGITS_KEY) != null;
   }
 
-  private boolean _minIntegerDigitsSpecified()
+  protected boolean isMinimumIntegerDigitsSet()
   {
     return _facesBean.getProperty(_MIN_INTEGER_DIGITS_KEY) != null;
   }
@@ -1275,6 +1288,13 @@
   private static final int _PERCENT_TYPE  = 3;
 
   private static final int _PATTERN_TYPE  = 4;
-}
 
+  private static final Number _EXAMPLE_PERCENT;
+  private static final Number _EXAMPLE_CURRENCY;
 
+  static
+  {
+    _EXAMPLE_PERCENT = 0.3423d;
+    _EXAMPLE_CURRENCY = 10250;
+  }
+}