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/08/05 14:31:54 UTC
svn commit: r562858 - in
/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon:
components/accessor/FlowAttributeAccessor.java
template/instruction/Import.java
Author: gkossakowski
Date: Sun Aug 5 05:31:54 2007
New Revision: 562858
URL: http://svn.apache.org/viewvc?view=rev&rev=562858
Log:
COCOON-2103:
* Moved fillContext method from TemplateObjectModelHelper to the FlowObjectModelHelper class.
* Removed TemplateObjectModelHelper class because it's not necessary anymore.
Modified:
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/accessor/FlowAttributeAccessor.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Import.java
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/accessor/FlowAttributeAccessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/accessor/FlowAttributeAccessor.java?view=diff&rev=562858&r1=562857&r2=562858
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/accessor/FlowAttributeAccessor.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/accessor/FlowAttributeAccessor.java Sun Aug 5 05:31:54 2007
@@ -20,7 +20,7 @@
import java.util.Map;
import org.apache.cocoon.components.flow.FlowHelper;
-import org.apache.cocoon.objectmodel.helper.TemplateObjectModelHelper;
+import org.apache.cocoon.template.environment.FlowObjectModelHelper;
/**
* @version $Id$
@@ -37,7 +37,7 @@
if (contextObject instanceof Map) {
map.putAll((Map)contextObject);
} else if (contextObject != null) {
- TemplateObjectModelHelper.fillContext(contextObject, map);
+ FlowObjectModelHelper.fillContext(contextObject, map);
}
return map;
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Import.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Import.java?view=diff&rev=562858&r1=562857&r2=562858
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Import.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Import.java Sun Aug 5 05:31:54 2007
@@ -21,9 +21,9 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.objectmodel.ObjectModel;
-import org.apache.cocoon.objectmodel.helper.TemplateObjectModelHelper;
import org.apache.cocoon.template.environment.ErrorHolder;
import org.apache.cocoon.template.environment.ExecutionContext;
+import org.apache.cocoon.template.environment.FlowObjectModelHelper;
import org.apache.cocoon.template.environment.ParsingContext;
import org.apache.cocoon.template.expression.JXTExpression;
import org.apache.cocoon.template.expression.Literal;
@@ -126,7 +126,7 @@
try {
Object obj = this.select.getValue(objectModel);
objectModel.put(ObjectModel.CONTEXTBEAN, obj);
- TemplateObjectModelHelper.fillContext(obj, objectModel);
+ FlowObjectModelHelper.fillContext(obj, objectModel);
} catch (Exception exc) {
throw new SAXParseException(exc.getMessage(), getLocation(), exc);
} catch (Error err) {