svn commit: r790234 - in /tiles/framework/branches/TILES_2_1_X/tiles-api/src: main/java/org/apache/tiles/Definition.java test/java/org/apache/tiles/TestDefinition.java

[apetrelli]

Author: apetrelli
Date: Wed Jul  1 15:54:28 2009
New Revision: 790234

URL: http://svn.apache.org/viewvc?rev=790234&view=rev
Log:
TILES-437
Merge from trunk to TILES_2_1_X branch (second part).
Now Definition.toString does not cause a NPE.

Modified:
    
tiles/framework/branches/TILES_2_1_X/tiles-api/src/main/java/org/apache/tiles/Definition.java
    
tiles/framework/branches/TILES_2_1_X/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java

Modified: 
tiles/framework/branches/TILES_2_1_X/tiles-api/src/main/java/org/apache/tiles/Definition.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-api/src/main/java/org/apache/tiles/Definition.java?rev=790234&r1=790233&r2=790234&view=diff
==============================================================================
--- 
tiles/framework/branches/TILES_2_1_X/tiles-api/src/main/java/org/apache/tiles/Definition.java
 (original)
+++ 
tiles/framework/branches/TILES_2_1_X/tiles-api/src/main/java/org/apache/tiles/Definition.java
 Wed Jul  1 15:54:28 2009
@@ -298,13 +298,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/branches/TILES_2_1_X/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java?rev=790234&r1=790233&r2=790234&view=diff
==============================================================================
--- 
tiles/framework/branches/TILES_2_1_X/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java
 (original)
+++ 
tiles/framework/branches/TILES_2_1_X/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java
 Wed Jul  1 15:54:28 2009
@@ -147,4 +147,24 @@
         assertEquals("Template expression inherited", "localExpression",
                 context.getTemplateAttribute().getExpression());
     }
+
+    /**
+     * 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());
+    }
 }