You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/07/01 17:50:01 UTC
svn commit: r790231 - in /tiles/framework/trunk/tiles-api/src:
main/java/org/apache/tiles/Definition.java
test/java/org/apache/tiles/TestDefinition.java
Author: apetrelli
Date: Wed Jul 1 15:50:01 2009
New Revision: 790231
URL: http://svn.apache.org/viewvc?rev=790231&view=rev
Log:
TILES-437
Now Definition.toString does not cause a NPE.
Modified:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java
tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java?rev=790231&r1=790230&r2=790231&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java Wed Jul 1 15:50:01 2009
@@ -299,13 +299,13 @@
return "{name="
+ name
+ ", template="
- + templateAttribute.getValue()
+ + (templateAttribute != null ? templateAttribute.getValue() : "<null>")
+ ", role="
- + templateAttribute.getRoles()
+ + (templateAttribute != null ? templateAttribute.getRoles() : "<null>")
+ ", preparerInstance="
+ preparer
+ ", attributes="
+ attributes
- + "}\n";
+ + "}";
}
}
Modified: tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java?rev=790231&r1=790230&r2=790231&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java (original)
+++ tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java Wed Jul 1 15:50:01 2009
@@ -157,4 +157,24 @@
"localLanguage", context.getTemplateAttribute()
.getExpressionObject().getLanguage());
}
+
+ /**
+ * Tests {@link Definition#toString()}.
+ */
+ public void testToString() {
+ Definition definition = new Definition();
+ definition.setName("myDefinitionName");
+ assertEquals(
+ "{name=myDefinitionName, template=<null>, role=<null>, preparerInstance=null, attributes=null}",
+ definition.toString());
+ definition.setTemplateAttribute(Attribute.createTemplateAttribute("myTemplate"));
+ assertEquals(
+ "{name=myDefinitionName, template=myTemplate, role=null, preparerInstance=null, attributes=null}",
+ definition.toString());
+ definition.putAttribute("myAttributeName", new Attribute("myAttributeValue"));
+ assertEquals(
+ "{name=myDefinitionName, template=myTemplate, role=null, preparerInstance=null, "
+ + "attributes={myAttributeName=myAttributeValue}}",
+ definition.toString());
+ }
}