You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2007/03/04 18:32:58 UTC
svn commit: r514444 - in /tapestry/tapestry4/trunk/tapestry-framework/src:
java/org/apache/tapestry/form/translator/NumberTranslator.java
test/org/apache/tapestry/form/translator/TestNumberTranslator.java
Author: jkuhnert
Date: Sun Mar 4 09:32:53 2007
New Revision: 514444
URL: http://svn.apache.org/viewvc?view=rev&rev=514444
Log:
Resolves TAPESTRY-633. Omitzero wasn't correctly being checked when determining default values in NumberTranslator.
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java?view=diff&rev=514444&r1=514443&r2=514444
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java Sun Mar 4 09:32:53 2007
@@ -65,7 +65,7 @@
protected Object getValueForEmptyInput()
{
- return new Double(0);
+ return _omitZero ? null : new Double(0);
}
/**
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java?view=diff&rev=514444&r1=514443&r2=514444
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java Sun Mar 4 09:32:53 2007
@@ -52,6 +52,8 @@
NumberTranslator translator = new NumberTranslator("pattern=0.00,omitZero=true");
testFormat(translator, new Integer(0), "");
+
+ assertEquals(translator.getValueForEmptyInput(), null);
}
public void test_Omit_Zero_Off()
@@ -97,7 +99,7 @@
Number num = (Number)translator.parse(field, messages, "");
- assertEquals(num.doubleValue(), 0.0);
+ assert num == null;
verify();
}