Author: apetrelli
Date: Mon Nov 16 20:19:58 2009
New Revision: 880942
URL: http://svn.apache.org/viewvc?rev=880942&view=rev
Log:
TILES-486
Merge from trunk to sandbox tiles3.
Added factory method in Attribute and used into InsertDefinitionModel and
InsertTemplateModel.
Modified:
tiles/sandbox/trunk/tiles3/ (props changed)
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Attribute.java
tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/AttributeTest.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertTemplateModel.java
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/ (props changed)
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml
(props changed)
Propchange: tiles/sandbox/trunk/tiles3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 16 20:19:58 2009
@@ -1 +1 @@
-/tiles/framework/trunk:829356,836356
+/tiles/framework/trunk:829356,836356,880940
Modified:
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Attribute.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Attribute.java?rev=880942&r1=880941&r2=880942&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Attribute.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Attribute.java
Mon Nov 16 20:19:58 2009
@@ -331,4 +331,17 @@
public Attribute clone() {
return new Attribute(this);
}
+
+ public static Attribute createTemplateAttribute(String template,
+ String templateExpression, String templateType, String role) {
+ Attribute templateAttribute = createTemplateAttribute(template);
+ templateAttribute.setRole(role);
+ if (templateType != null) {
+ templateAttribute.setRenderer(templateType);
+ }
+ templateAttribute
+ .setExpressionObject(Expression
+
.createExpressionFromDescribedExpression(templateExpression));
+ return templateAttribute;
+ }
}
Modified:
tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/AttributeTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/AttributeTest.java?rev=880942&r1=880941&r2=880942&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/AttributeTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/AttributeTest.java
Mon Nov 16 20:19:58 2009
@@ -245,4 +245,20 @@
assertEquals("my.expression",
attribute.getExpressionObject().getExpression());
assertEquals("MYLANG", attribute.getExpressionObject().getLanguage());
}
+
+ /**
+ * Tests {...@link Attribute#createTemplateAttribute(String, String,
String, String)}.
+ */
+ @Test
+ public void testCreateTemplateAttribute() {
+ Attribute attribute = Attribute.createTemplateAttribute("myTemplate",
+ "MYLANG:myExpression", "myType", "myRole");
+ assertEquals("myTemplate", attribute.getValue());
+ assertEquals("MYLANG", attribute.getExpressionObject().getLanguage());
+ assertEquals("myExpression",
attribute.getExpressionObject().getExpression());
+ assertEquals("myType", attribute.getRenderer());
+ Set<String> roles = attribute.getRoles();
+ assertEquals(1, roles.size());
+ assertTrue(roles.contains("myRole"));
+ }
}
Modified:
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java?rev=880942&r1=880941&r2=880942&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java
Mon Nov 16 20:19:58 2009
@@ -98,9 +98,8 @@
try {
AttributeContext attributeContext = container
.getAttributeContext(request);
- Attribute templateAttribute = Attribute
- .createTemplateAttribute(template);
- templateAttribute.setRole(role);
+ Attribute templateAttribute =
Attribute.createTemplateAttribute(template,
+ templateExpression, templateType, role);
attributeContext.setPreparer(preparer);
attributeContext.setTemplateAttribute(templateAttribute);
container.render(definitionName, request);
Modified:
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertTemplateModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertTemplateModel.java?rev=880942&r1=880941&r2=880942&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertTemplateModel.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertTemplateModel.java
Mon Nov 16 20:19:58 2009
@@ -23,7 +23,6 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
-import org.apache.tiles.Expression;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.request.Request;
@@ -96,15 +95,8 @@
try {
AttributeContext attributeContext = container
.getAttributeContext(request);
- Attribute templateAttribute = Attribute
- .createTemplateAttribute(template);
- templateAttribute.setRole(role);
- if (templateType != null) {
- templateAttribute.setRenderer(templateType);
- }
- templateAttribute
- .setExpressionObject(Expression
-
.createExpressionFromDescribedExpression(templateExpression));
+ Attribute templateAttribute =
Attribute.createTemplateAttribute(template,
+ templateExpression, templateType, role);
attributeContext.setPreparer(preparer);
attributeContext.setTemplateAttribute(templateAttribute);
container.renderContext(request);
Propchange: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 16 20:19:58 2009
@@ -1,3 +1,3 @@
-/tiles/framework/trunk/tiles-test-pom/tiles-test:829356,836356
+/tiles/framework/trunk/tiles-test-pom/tiles-test:829356,836356,880940
/tiles/sandbox/trunk/tiles-test:740289
/tiles/sandbox/trunk/tiles-test-sandbox:740290-745038,747727-751891
Propchange:
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 16 20:19:58 2009
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml:829356,836356
+/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml:829356,836356,880940
