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/18 21:03:30 UTC
svn commit: r557363 - in
/cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template:
instruction/Import.java script/event/EndElement.java
script/event/StartElement.java script/event/StartPrefixMapping.java
Author: gkossakowski
Date: Wed Jul 18 12:03:29 2007
New Revision: 557363
URL: http://svn.apache.org/viewvc?view=rev&rev=557363
Log:
COCOON-2086: Removed any usage of ExpressionContext class.
Modified:
cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Import.java
cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/EndElement.java
cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/StartElement.java
cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/StartPrefixMapping.java
Modified: cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Import.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Import.java?view=diff&rev=557363&r1=557362&r2=557363
==============================================================================
--- cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Import.java (original)
+++ cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Import.java Wed Jul 18 12:03:29 2007
@@ -22,6 +22,7 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.expression.ExpressionContext;
import org.apache.cocoon.environment.TemplateObjectModelHelper;
+import org.apache.cocoon.objectmodel.ObjectModel;
import org.apache.cocoon.template.environment.ErrorHolder;
import org.apache.cocoon.template.environment.ExecutionContext;
import org.apache.cocoon.template.environment.ParsingContext;
@@ -120,13 +121,12 @@
} catch (ProcessingException exc) {
throw new SAXParseException(exc.getMessage(), getLocation(), exc);
}
- ExpressionContext selectExpressionContext = expressionContext;
+ expressionContext.getObjectModel().markLocalContext();
if (this.select != null) {
try {
Object obj = this.select.getValue(expressionContext);
- selectExpressionContext = new ExpressionContext(expressionContext);
- selectExpressionContext.setContextBean(obj);
- TemplateObjectModelHelper.fillContext(obj, selectExpressionContext);
+ expressionContext.getObjectModel().put(ObjectModel.CONTEXTBEAN, obj);
+ TemplateObjectModelHelper.fillContext(obj, expressionContext.getObjectModel());
} catch (Exception exc) {
throw new SAXParseException(exc.getMessage(), getLocation(), exc);
} catch (Error err) {
@@ -142,6 +142,9 @@
"Exception occurred in imported template " + uri
+ ": " + exc.getMessage(), getLocation(), exc);
}
+
+ expressionContext.getObjectModel().cleanupLocalContext();
+
return getEndInstruction().getNext();
}
}
Modified: cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/EndElement.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/EndElement.java?view=diff&rev=557363&r1=557362&r2=557363
==============================================================================
--- cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/EndElement.java (original)
+++ cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/EndElement.java Wed Jul 18 12:03:29 2007
@@ -46,7 +46,7 @@
.getLocalName(), startElement.getRaw());
// Send any pending endPrefixMapping events
- expressionContext.getNamespaces().leaveScope(consumer);
+ //FIXME: expressionContext.getNamespaces().leaveScope(consumer);
return getNext();
}
}
Modified: cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/StartElement.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/StartElement.java?view=diff&rev=557363&r1=557362&r2=557363
==============================================================================
--- cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/StartElement.java (original)
+++ cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/StartElement.java Wed Jul 18 12:03:29 2007
@@ -122,7 +122,7 @@
}
// Send any pending startPrefixMapping events
- expressionContext.getNamespaces().enterScope(consumer);
+ //FIXME: expressionContext.getNamespaces().enterScope(consumer);
consumer.startElement(getNamespaceURI(), getLocalName(), getRaw(),
attrs);
return getNext();
Modified: cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/StartPrefixMapping.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/StartPrefixMapping.java?view=diff&rev=557363&r1=557362&r2=557363
==============================================================================
--- cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/StartPrefixMapping.java (original)
+++ cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/StartPrefixMapping.java Wed Jul 18 12:03:29 2007
@@ -49,7 +49,7 @@
ExecutionContext executionContext, MacroContext macroContext,
Event startEvent, Event endEvent) throws SAXException {
- expressionContext.getNamespaces().addDeclaration(getPrefix(), getUri());
+ //FIXME: expressionContext.getNamespaces().addDeclaration(getPrefix(), getUri());
// the startPrefixMapping event will be sent in StartElement
return getNext();
}