You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/06/22 16:39:32 UTC
svn commit: r416383 -
/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
Author: cziegeler
Date: Thu Jun 22 07:39:32 2006
New Revision: 416383
URL: http://svn.apache.org/viewvc?rev=416383&view=rev
Log:
Use plain parameters object for templates
Modified:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java?rev=416383&r1=416382&r2=416383&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java Thu Jun 22 07:39:32 2006
@@ -17,9 +17,13 @@
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
+import java.util.Collection;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
+import java.util.Set;
+import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.components.flow.FlowHelper;
import org.apache.cocoon.components.flow.javascript.fom.FOM_JavaScriptFlowHelper;
@@ -50,9 +54,9 @@
Context ctx = Context.enter();
try {
// Create it if never used up to now
- if (rootScope == null)
+ if (rootScope == null) {
rootScope = ctx.initStandardObjects(null);
-
+ }
Scriptable scope = ctx.newObject(rootScope);
scope.setPrototype(rootScope);
scope.setParentScope(null);
@@ -146,7 +150,7 @@
// cocoon.parameters
if ( parameters != null ) {
- cocoon.put("parameters", Parameters.toProperties(parameters));
+ cocoon.put("parameters", parameters);
}
final Map map = new HashMap();