Author: apetrelli
Date: Tue Feb 10 13:19:33 2009
New Revision: 742959
URL: http://svn.apache.org/viewvc?rev=742959&view=rev
Log:
TILESSB-4
Fixed "extends" parameter.
Fixed evaluation of the body, if present, in PutAttributeModel.
Modified:
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/template/DefinitionModel.java
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/template/PutAttributeModel.java
Modified:
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java?rev=742959&r1=742958&r2=742959&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java
(original)
+++
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java
Tue Feb 10 13:19:33 2009
@@ -29,7 +29,7 @@
FreeMarkerUtil.getAsString(parms.get("name")),
FreeMarkerUtil.getAsString(parms.get("template")),
FreeMarkerUtil.getAsString(parms.get("role")),
- FreeMarkerUtil.getAsString(parms.get("extend")),
+ FreeMarkerUtil.getAsString(parms.get("extends")),
FreeMarkerUtil.getAsString(parms.get("preparer")));
FreeMarkerUtil.evaluateBody(body);
model.end((MutableTilesContainer) FreeMarkerUtil
Modified:
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/template/DefinitionModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/template/DefinitionModel.java?rev=742959&r1=742958&r2=742959&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/template/DefinitionModel.java
(original)
+++
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/template/DefinitionModel.java
Tue Feb 10 13:19:33 2009
@@ -9,14 +9,14 @@
public class DefinitionModel {
public void start(Stack<Object> composeStack, String name, String template,
- String role, String extend, String preparer) {
+ String role, String extendsParam, String preparer) {
Definition definition = new Definition();
definition.setName(name);
Attribute templateAttribute = Attribute
.createTemplateAttribute(template);
templateAttribute.setRole(role);
definition.setTemplateAttribute(templateAttribute);
- definition.setExtends(extend);
+ definition.setExtends(extendsParam);
definition.setPreparer(preparer);
composeStack.push(definition);
}
Modified:
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/template/PutAttributeModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/template/PutAttributeModel.java?rev=742959&r1=742958&r2=742959&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/template/PutAttributeModel.java
(original)
+++
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/template/PutAttributeModel.java
Tue Feb 10 13:19:33 2009
@@ -30,7 +30,7 @@
}
if(value != null) {
attribute.setValue(value);
- } else if (body != null) {
+ } else if (attribute.getValue() == null && body != null) {
attribute.setValue(body);
}
if (expression != null) {
