You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2008/08/21 18:14:23 UTC
svn commit: r687794 -
/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractPropertyOutput.java
Author: hlship
Date: Thu Aug 21 09:14:22 2008
New Revision: 687794
URL: http://svn.apache.org/viewvc?rev=687794&view=rev
Log:
TAPESTRY-2578: BeanDisplay formatting is off for fields with empty values
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractPropertyOutput.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractPropertyOutput.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractPropertyOutput.java?rev=687794&r1=687793&r2=687794&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractPropertyOutput.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractPropertyOutput.java Thu Aug 21 09:14:22 2008
@@ -22,6 +22,7 @@
import org.apache.tapestry5.beaneditor.PropertyModel;
import org.apache.tapestry5.ioc.Messages;
import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.services.BeanBlockSource;
import org.apache.tapestry5.services.Environment;
import org.apache.tapestry5.services.PropertyOutputContext;
@@ -116,13 +117,18 @@
Object value = readPropertyForObject();
- if (value == null)
+ // TAPESTRY-2578: Write for null or merely blank.
+
+ String text = value == null ? "" : value.toString();
+
+ if (InternalUtils.isBlank(text))
{
writer.writeRaw(" ");
- return false;
}
-
- writer.write(value.toString());
+ else
+ {
+ writer.write(text);
+ }
// Don't render anything else
@@ -137,7 +143,7 @@
{
return conduit == null ? null : conduit.get(object);
}
- catch (final NullPointerException ex)
+ catch (NullPointerException ex)
{
throw new NullPointerException(BaseMessages.nullValueInPath(model.getPropertyName()));
}