Author: apetrelli
Date: Wed Mar 4 12:59:06 2009
New Revision: 749994
URL: http://svn.apache.org/viewvc?rev=749994&view=rev
Log:
TILESSB-7
Fixed bugs.
Modified:
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java
Modified:
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java?rev=749994&r1=749993&r2=749994&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java
(original)
+++
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java
Wed Mar 4 12:59:06 2009
@@ -109,11 +109,18 @@
public Object[] getRequestObjects() {
if (requestObjects == null) {
Object[] parentRequestObjects = super.getRequestObjects();
- requestObjects = new Object[parentRequestObjects.length + 1];
+ if (writer == null) {
+ requestObjects = new Object[parentRequestObjects.length + 1];
+ } else {
+ requestObjects = new Object[parentRequestObjects.length + 2];
+ }
requestObjects[0] = ctx;
for (int i = 0; i < parentRequestObjects.length; i++) {
requestObjects[i+1] = parentRequestObjects[i];
}
+ if (writer != null) {
+ requestObjects[parentRequestObjects.length + 1] = writer;
+ }
}
return requestObjects;
}
Modified:
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java?rev=749994&r1=749993&r2=749994&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java
(original)
+++
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java
Wed Mar 4 12:59:06 2009
@@ -43,7 +43,7 @@
ParseErrorException, ResourceNotFoundException {
TilesContainer container = ServletUtil.getCurrentContainer(
request, servletContext);
- model.execute(container, response.getWriter(),
+ model.execute(container, writer,
VelocityUtil.toSimpleBoolean((Boolean) params
.get("ignore"), false), (String) params
.get("preparer"), (String) params.get("role"),
Modified:
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java?rev=749994&r1=749993&r2=749994&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java
(original)
+++
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java
Wed Mar 4 12:59:06 2009
@@ -56,7 +56,7 @@
public boolean render(InternalContextAdapter context, Writer
writer)
throws IOException, MethodInvocationException,
ParseErrorException, ResourceNotFoundException {
- model.execute(ServletUtil.getCurrentContainer(request,
+ model.end(ServletUtil.getCurrentContainer(request,
servletContext), (String) params.get("name"),
(String) params.get("template"), (String) params
.get("role"), (String) params.get("preparer"),
@@ -68,8 +68,8 @@
public void start(HttpServletRequest request, HttpServletResponse response,
Context velocityContext, Map<String, Object> params) {
- // TODO Auto-generated method stub
-
+ VelocityUtil.getParameterStack(velocityContext).push(params);
+ model.start(ServletUtil.getCurrentContainer(request,
+ servletContext), velocityContext, request, response);
}
-
}
Modified:
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java?rev=749994&r1=749993&r2=749994&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java
(original)
+++
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java
Wed Mar 4 12:59:06 2009
@@ -33,7 +33,7 @@
(String) params.get("expression"), null,
(String) params.get("role"), (String) params
.get("type"), VelocityUtil.toSimpleBoolean(
- (Boolean) params.get("value"), false),
+ (Boolean) params.get("cascade"), false),
velocityContext, request, response);
return VelocityUtil.EMPTY_RENDERABLE;
