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/20 17:47:16 UTC
svn commit: r558024 -
/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java
Author: gkossakowski
Date: Fri Jul 20 08:47:09 2007
New Revision: 558024
URL: http://svn.apache.org/viewvc?view=rev&rev=558024
Log:
COCOON-2086: Adapted JXPathExpression to new ObjectModel API.
Modified:
cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java
Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java?view=diff&rev=558024&r1=558023&r2=558024
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java (original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java Fri Jul 20 08:47:09 2007
@@ -26,7 +26,6 @@
import org.apache.cocoon.objectmodel.ObjectModel;
import org.apache.cocoon.util.jxpath.NamespacesTablePointer;
import org.apache.cocoon.xml.NamespacesTable;
-import org.apache.commons.collections.ArrayStack;
import org.apache.commons.jxpath.CompiledExpression;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Pointer;
@@ -135,16 +134,10 @@
// This could be made more efficient by caching the
// JXPathContext within the Context object.
- Object contextBean = objectModel.get(ObjectModel.CONTEXTBEAN);
- if (contextBean instanceof ArrayStack)
- contextBean = ((ArrayStack) contextBean).peek();
- JXPathContext jxobjectModel = JXPathContext.newContext(contextBean);
+ JXPathContext jxobjectModel = JXPathContext.newContext(objectModel.get(ObjectModel.CONTEXTBEAN));
jxobjectModel.setVariables(new VariableAdapter(objectModel));
jxobjectModel.setLenient(this.lenient);
- Object namespaces = objectModel.get(ObjectModel.NAMESPACE);
- if (namespaces instanceof ArrayStack)
- namespaces = ((ArrayStack)namespaces).peek();
- jxobjectModel.setNamespaceContextPointer(new NamespacesTablePointer((NamespacesTable)namespaces));
+ jxobjectModel.setNamespaceContextPointer(new NamespacesTablePointer((NamespacesTable)objectModel.get(ObjectModel.NAMESPACE)));
return jxobjectModel;
}