Author: apetrelli
Date: Tue Jun 23 15:47:20 2009
New Revision: 787729
URL: http://svn.apache.org/viewvc?rev=787729&view=rev
Log:
TILES-432
Polished tiles-freemarker.
Added:
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/package.html
(with props)
Modified:
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModel.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateFMModel.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.java
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertTemplateFMModelTest.java
Modified:
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java?rev=787729&r1=787728&r2=787729&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
(original)
+++
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
Tue Jun 23 15:47:20 2009
@@ -108,7 +108,9 @@
HttpServletResponse httpResponse =
servletRequest.getResponse();
servlet.setValue((String) value);
try {
- servlet.doGet(httpRequest, new
ExternalWriterHttpServletResponse(httpResponse, request.getPrintWriter()));
+ servlet.doGet(httpRequest,
+ new ExternalWriterHttpServletResponse(httpResponse,
+ request.getPrintWriter()));
} catch (ServletException e) {
throw new FreeMarkerTilesException("Exception when
rendering a FreeMarker attribute", e);
}
Added:
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/package.html
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/package.html?rev=787729&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/package.html
(added)
+++
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/package.html
Tue Jun 23 15:47:20 2009
@@ -0,0 +1,30 @@
+<!--
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+<html>
+<head>
+ <title>Tiles/FreeMarker renderer classes</title>
+</head>
+<body>
+FreeMarker-typed attributes can be rendered by using classes in this package.
+</body>
+</html>
\ No newline at end of file
Propchange:
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/package.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java?rev=787729&r1=787728&r2=787729&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java
(original)
+++
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java
Tue Jun 23 15:47:20 2009
@@ -69,7 +69,6 @@
Map<String, TemplateModel> parms = (Map<String, TemplateModel>) params;
model.end(composeStack, FreeMarkerUtil.getAsObject(parms.get("value")),
FreeMarkerUtil.getAsString(parms.get("expression")),
bodyString,
- FreeMarkerUtil.getAsString(parms.get("role")),
- FreeMarkerUtil.getAsString(parms.get("type")));
+ FreeMarkerUtil.getAsString(parms.get("role")),
FreeMarkerUtil.getAsString(parms.get("type")));
}
}
Modified:
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModel.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModel.java?rev=787729&r1=787728&r2=787729&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModel.java
(original)
+++
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModel.java
Tue Jun 23 15:47:20 2009
@@ -38,7 +38,8 @@
* parameters, see
* {...@link InsertDefinitionModel#start(org.apache.tiles.TilesContainer,
Object...)}
* and
- * {...@link InsertDefinitionModel#end(org.apache.tiles.TilesContainer,
String, String, String, String, String, String, Object...)}
+ * {...@link InsertDefinitionModel#end(org.apache.tiles.TilesContainer,
+ * String, String, String, String, String, String, Object...)}
* .
*
* @version $Rev$ $Date$
Modified:
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateFMModel.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateFMModel.java?rev=787729&r1=787728&r2=787729&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateFMModel.java
(original)
+++
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateFMModel.java
Tue Jun 23 15:47:20 2009
@@ -72,9 +72,9 @@
model.end(FreeMarkerUtil.getCurrentContainer(env), FreeMarkerUtil
.getAsString(parms.get("template")), FreeMarkerUtil
.getAsString(parms.get("templateType")), FreeMarkerUtil
- .getAsString(parms.get("templateExpression")), FreeMarkerUtil
- .getAsString(parms.get("role")), FreeMarkerUtil
- .getAsString(parms.get("preparer")), env);
+ .getAsString(parms.get("templateExpression")),
FreeMarkerUtil.getAsString(parms.get("role")),
+ FreeMarkerUtil
+ .getAsString(parms.get("preparer")), env);
}
}
Modified:
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java?rev=787729&r1=787728&r2=787729&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java
(original)
+++
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java
Tue Jun 23 15:47:20 2009
@@ -75,8 +75,8 @@
FreeMarkerUtil.getAsString(parms.get("name")), FreeMarkerUtil
.getAsObject(parms.get("value")), FreeMarkerUtil
.getAsString(parms.get("expression")), bodyString,
- FreeMarkerUtil.getAsString(parms.get("role")), FreeMarkerUtil
- .getAsString(parms.get("type")), FreeMarkerUtil
+ FreeMarkerUtil.getAsString(parms.get("role")),
FreeMarkerUtil.getAsString(parms.get("type")),
+ FreeMarkerUtil
.getAsBoolean(parms.get("cascade"), false), env);
}
Modified:
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.java?rev=787729&r1=787728&r2=787729&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.java
(original)
+++
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.java
Tue Jun 23 15:47:20 2009
@@ -125,7 +125,8 @@
expect(request.getAttribute(FreeMarkerUtil.COMPOSE_STACK_ATTRIBUTE_NAME)).andReturn(composeStack);
tModel.start(composeStack);
- tModel.end(composeStack, value, "myExpression", "", "myRole",
"myType");
+ tModel.end(composeStack, value, "myExpression", "",
+ "myRole", "myType");
body.render(isA(StringWriter.class));
replay(request, tModel, body);
Modified:
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertTemplateFMModelTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertTemplateFMModelTest.java?rev=787729&r1=787728&r2=787729&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertTemplateFMModelTest.java
(original)
+++
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertTemplateFMModelTest.java
Tue Jun 23 15:47:20 2009
@@ -149,7 +149,8 @@
tModel.start(container, env);
tModel.end(container, "myTemplate", "myTemplateType",
- "myTemplateExpression", "myRole", "myPreparer", env);
+ "myTemplateExpression", "myRole",
+ "myPreparer", env);
body.render(isA(NullWriter.class));
replay(tModel, body, container, attribute);
