Author: apetrelli
Date: Tue Feb 3 12:32:01 2009
New Revision: 740288
URL: http://svn.apache.org/viewvc?rev=740288&view=rev
Log:
TILESSB-4
Finished creating models.
Added:
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionModel.java
(with props)
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateModel.java
(with props)
Modified:
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AbstractRenderModel.java
Modified:
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AbstractRenderModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AbstractRenderModel.java?rev=740288&r1=740287&r2=740288&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AbstractRenderModel.java
(original)
+++
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AbstractRenderModel.java
Tue Feb 3 12:32:01 2009
@@ -62,7 +62,7 @@
protected TilesContainer container;
- private AttributeContext attributeContext;
+ protected AttributeContext attributeContext;
/** {...@inheritdoc} */
public void doStart(Environment env,
Added:
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionModel.java?rev=740288&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionModel.java
(added)
+++
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionModel.java
Tue Feb 3 12:32:01 2009
@@ -0,0 +1,20 @@
+package org.apache.tiles.freemarker.template;
+
+import java.util.Map;
+
+import org.apache.tiles.freemarker.context.FreeMarkerUtil;
+
+import freemarker.core.Environment;
+import freemarker.template.TemplateDirectiveBody;
+import freemarker.template.TemplateModel;
+
+public class InsertDefinitionModel extends InsertTemplateModel {
+
+ @Override
+ protected void renderContext(Environment env,
+ Map<String, TemplateModel> params, TemplateModel[] loopVars,
+ TemplateDirectiveBody body) {
+ String name = FreeMarkerUtil.getAsString(params.get("name"));
+ container.render(name, env);
+ }
+}
Propchange:
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionModel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionModel.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added:
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateModel.java?rev=740288&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateModel.java
(added)
+++
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateModel.java
Tue Feb 3 12:32:01 2009
@@ -0,0 +1,67 @@
+/*
+ * $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.
+ */
+
+package org.apache.tiles.freemarker.template;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.apache.tiles.Attribute;
+import org.apache.tiles.freemarker.context.FreeMarkerUtil;
+
+import freemarker.core.Environment;
+import freemarker.template.TemplateDirectiveBody;
+import freemarker.template.TemplateModel;
+
+/**
+ * This is the tag handler for <tiles:insertTemplate>, which includes a
+ * template ready to be filled.
+ *
+ * @version $Rev$ $Date$
+ */
+public class InsertTemplateModel extends AbstractRenderModel {
+
+ /** {...@inheritdoc} */
+ @Override
+ protected void render(Environment env, Map<String, TemplateModel> params,
+ TemplateModel[] loopVars, TemplateDirectiveBody body) {
+ String template = FreeMarkerUtil.getAsString(params.get("template"));
+ String role = FreeMarkerUtil.getAsString(params.get("role"));
+ String preparer = FreeMarkerUtil.getAsString(params.get("preparer"));
+ Attribute templateAttribute = Attribute
+ .createTemplateAttribute(template);
+ templateAttribute.setRole(role);
+ attributeContext.setPreparer(preparer);
+ attributeContext.setTemplateAttribute(templateAttribute);
+ renderContext(env, params, loopVars, body);
+ }
+
+ /**
+ * Renders the current context.
+ *
+ * @throws IOException if an io exception occurs.
+ */
+ protected void renderContext(Environment env, Map<String, TemplateModel>
params,
+ TemplateModel[] loopVars, TemplateDirectiveBody body) {
+ FreeMarkerUtil.setForceInclude(env, true);
+ container.renderContext(env);
+ }
+}
Propchange:
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateModel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateModel.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL