cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gkossakow...@apache.org
Subject svn commit: r557239 - /cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/expression/JXTExpression.java
Date Wed, 18 Jul 2007 12:26:36 GMT
Author: gkossakowski
Date: Wed Jul 18 05:26:29 2007
New Revision: 557239

URL: http://svn.apache.org/viewvc?view=rev&rev=557239
Log:
COCOON-2092: Pass ObjectModel to Expression instead of ExpressionContext

Modified:
    cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/expression/JXTExpression.java

Modified: cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/expression/JXTExpression.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/expression/JXTExpression.java?view=diff&rev=557239&r1=557238&r2=557239
==============================================================================
--- cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/expression/JXTExpression.java
(original)
+++ cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/expression/JXTExpression.java
Wed Jul 18 05:26:29 2007
@@ -54,7 +54,7 @@
         throws Exception {
         Object compiled = this.getCompiledExpression();
         if (compiled instanceof Expression)
-            return ((Expression)compiled).getNode(expressionContext);
+            return ((Expression)compiled).getNode(expressionContext.getObjectModel());
         return this.getRaw();
     }
 
@@ -64,7 +64,7 @@
         if (this.getCompiledExpression() != null || this.getRaw() != null) {
             if (this.getCompiledExpression() instanceof Expression) {
                 iter =
-                    ((Expression)this.getCompiledExpression()).iterate(expressionContext);
+                    ((Expression)this.getCompiledExpression()).iterate(expressionContext.getObjectModel());
             } else {
                 // literal value
                 iter = new Iterator() {
@@ -132,7 +132,7 @@
         if (this.getCompiledExpression() != null) {
             Object compiled = this.getCompiledExpression();
             if (compiled instanceof Expression)
-                return ((Expression)compiled).evaluate(expressionContext);
+                return ((Expression)compiled).evaluate(expressionContext.getObjectModel());
             else
                 return compiled;
         } else



Mime
View raw message