Author: hlship
Date: Sun Oct 30 12:18:50 2005
New Revision: 329626
URL: http://svn.apache.org/viewcvs?rev=329626&view=rev
Log:
TAPESTRY-723: The "empty" property of StringTranslator is broken
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/translator/AbstractTranslator.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/translator/StringTranslator.java
jakarta/tapestry/trunk/status.xml
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/translator/AbstractTranslator.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/translator/AbstractTranslator.java?rev=329626&r1=329625&r2=329626&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/translator/AbstractTranslator.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/translator/AbstractTranslator.java
Sun Oct 30 12:18:50 2005
@@ -68,9 +68,10 @@
public Object parse(IFormComponent field, ValidationMessages messages,
String text)
throws ValidatorException
{
- String value = _trim ? text.trim() : text;
+ String value = text == null ? null : (_trim ? text.trim() : text);
- return HiveMind.isBlank(value) ? getEmpty() : parseText(field,
messages, value);
+ return HiveMind.isBlank(value) ? getValueForEmptyInput()
+ : parseText(field, messages, value);
}
protected abstract String formatObject(IFormComponent field, Locale
locale, Object object);
@@ -78,7 +79,14 @@
protected abstract Object parseText(IFormComponent field,
ValidationMessages messages,
String text) throws ValidatorException;
- protected Object getEmpty()
+ /**
+ * The value to be used when the value supplied in the request is blank
(null or empty). The
+ * default value is null, but some subclasses may override.
+ *
+ * @see #parse(IFormComponent, ValidationMessages, String)
+ * @return null, subclasses may override
+ */
+ protected Object getValueForEmptyInput()
{
return null;
}
@@ -108,7 +116,8 @@
super.renderContribution(writer, cycle, context, field);
if (_trim)
- context.addSubmitHandler("function (event) {
Tapestry.trim_field_value('" + field.getClientId() + "'); }");
+ context.addSubmitHandler("function (event) {
Tapestry.trim_field_value('"
+ + field.getClientId() + "'); }");
}
public boolean isTrim()
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/translator/StringTranslator.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/translator/StringTranslator.java?rev=329626&r1=329625&r2=329626&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/translator/StringTranslator.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/translator/StringTranslator.java
Sun Oct 30 12:18:50 2005
@@ -49,8 +49,6 @@
*/
protected Object parseText(IFormComponent field, ValidationMessages
messages, String text)
{
- // TODO: Do something with _empty here?
-
return text;
}
@@ -63,7 +61,7 @@
return object.toString();
}
- public Object getEmpty()
+ public Object getValueForEmptyInput()
{
return _empty;
}
Modified: jakarta/tapestry/trunk/status.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/status.xml?rev=329626&r1=329625&r2=329626&view=diff
==============================================================================
--- jakarta/tapestry/trunk/status.xml (original)
+++ jakarta/tapestry/trunk/status.xml Sun Oct 30 12:18:50 2005
@@ -60,6 +60,7 @@
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-711">Do not give focus
to disabled fields</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-715">LinkSubmit
component should render its body, even when disabled</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-602">Add annotation to
define default value of property</action>
+ <action type="fix" dev="HLS" fixes-bug="TAPESTRY-723">The "empty"
property of StringTranslator is broken</action>
</release>
<release version="4.0-beta-11" date="Oct 16 2005">
<action type="fix" dev="HLS"
fixes-bug="TAPESTRY-650">ClassNotFoundException thrown when deserializing an
object from a client persistent property</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
