You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gk...@apache.org on 2007/07/31 21:21:36 UTC
svn commit: r561450 -
/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java
Author: gkossakowski
Date: Tue Jul 31 12:21:33 2007
New Revision: 561450
URL: http://svn.apache.org/viewvc?view=rev&rev=561450
Log:
Cleanup of imports and old code.
Modified:
cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java
Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java?view=diff&rev=561450&r1=561449&r2=561450
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java (original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java Tue Jul 31 12:21:33 2007
@@ -21,13 +21,10 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.components.flow.FlowHelper;
-import org.apache.cocoon.components.flow.javascript.fom.FOM_JavaScriptFlowHelper;
import org.apache.cocoon.environment.TemplateObjectModelHelper;
import org.apache.cocoon.objectmodel.ObjectModel;
import org.mozilla.javascript.Context;
-import org.mozilla.javascript.NativeJavaPackage;
import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.ScriptableObject;
/**
@@ -62,7 +59,6 @@
public static void fillNewObjectModelWithFOM(ObjectModel newObjectModel,
final Map objectModel, final Parameters parameters) {
Map expressionContext = TemplateObjectModelHelper.getTemplateObjectModel(objectModel, parameters);
- //FlowObjectModelHelper.addJavaPackages(expressionContext);
//FIXME: It's a temporary code!
((Map)newObjectModel.get("cocoon")).putAll((Map)expressionContext.get("cocoon"));