You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2007/04/20 09:27:04 UTC
svn commit: r530713 -
/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java
Author: matzew
Date: Fri Apr 20 02:27:03 2007
New Revision: 530713
URL: http://svn.apache.org/viewvc?view=rev&rev=530713
Log:
ADFFACES-460 CONVERTNUMBER ERROR MESSAGE MISLEADING WHEN INTEGERONLY IS TRUE
ADFFACES-461 NumberConverter renders "null", when locale is null
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java
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=530713&r1=530712&r2=530713
==============================================================================
--- 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 Fri Apr 20 02:27:03 2007
@@ -29,6 +29,7 @@
import javax.faces.convert.ConverterException;
import org.apache.myfaces.trinidad.convert.ClientConverter;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
import org.apache.myfaces.trinidadinternal.util.JsonUtils;
public final class NumberConverter extends org.apache.myfaces.trinidad.convert.NumberConverter
@@ -110,49 +111,62 @@
UIComponent component,
Map<?, ?> messages)
{
- StringBuilder outBuffer = new StringBuilder(250);
-
- outBuffer.append("new TrNumberConverter(");
-
+
String pattern = this.getPattern();
- String type = this.getType();
- String localeString = "null";
- Locale locale = this.getLocale();
- if(locale != null)
- localeString = locale.toString();
-
- try
- {
- JsonUtils.writeString(outBuffer, pattern, false);
- } catch (Exception e)
- {
- outBuffer.append("null");
- }
- outBuffer.append(',');
- try
- {
- JsonUtils.writeString(outBuffer, type, false);
- } catch (Exception e)
- {
- outBuffer.append("null");
- }
- outBuffer.append(',');
- try
- {
- JsonUtils.writeString(outBuffer, localeString, false);
- } catch (Exception e)
+ StringBuilder outBuffer = new StringBuilder(250);
+
+ if(this.isIntegerOnly() && pattern == null)
{
- outBuffer.append("null");
+ outBuffer.append("new TrIntegerConverter(");
+ outBuffer.append("null,null,0,");
+ outBuffer.append(IntegerUtils.getString(Integer.MAX_VALUE));
+ outBuffer.append(',');
+ outBuffer.append(IntegerUtils.getString(Integer.MIN_VALUE));
+ outBuffer.append(")");
}
- outBuffer.append(',');
- try
- {
- JsonUtils.writeMap(outBuffer, messages, false);
- } catch (Exception e)
+ else
{
- outBuffer.append("null");
+ outBuffer.append("new TrNumberConverter(");
+
+ String type = this.getType();
+ String localeString = null;
+ Locale locale = this.getLocale();
+ if(locale != null)
+ localeString = locale.toString();
+
+ try
+ {
+ JsonUtils.writeString(outBuffer, pattern, false);
+ } catch (Exception e)
+ {
+ outBuffer.append("null");
+ }
+ outBuffer.append(',');
+ 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");
+ }
+ outBuffer.append(',');
+ try
+ {
+ JsonUtils.writeMap(outBuffer, messages, false);
+ } catch (Exception e)
+ {
+ outBuffer.append("null");
+ }
+ outBuffer.append(')');
}
- outBuffer.append(')');
return outBuffer.toString();
}