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/15 16:55:33 UTC
svn commit: r566208 - in /cocoon/trunk:
blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/
blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/
blocks/cocoon-template/cocoo...
Author: gkossakowski
Date: Wed Aug 15 07:55:31 2007
New Revision: 566208
URL: http://svn.apache.org/viewvc?view=rev&rev=566208
Log:
COCOON-2112: Pulling up methods from JXExpression to Subst interface and replacing use of JXExpression class by Subst interface where possible.
Modified:
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Attribute.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Call.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Eval.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/ForEach.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/FormatDate.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/FormatNumber.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/If.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Import.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/LocaleAwareInstruction.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Out.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/ParameterInstance.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Set.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/When.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/Characters.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/TextEvent.java
cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/AbstractStringTemplateParser.java
cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/JXTExpression.java
cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/Literal.java
cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/StringTemplateParser.java
cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/Subst.java
cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/Substitutions.java
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java Wed Aug 15 07:55:31 2007
@@ -33,7 +33,7 @@
import org.apache.cocoon.template.environment.ExecutionContext;
import org.apache.cocoon.template.environment.JXCacheKey;
import org.apache.cocoon.template.environment.JXSourceValidity;
-import org.apache.cocoon.template.expression.JXTExpression;
+import org.apache.cocoon.template.expression.Subst;
import org.apache.cocoon.template.script.Invoker;
import org.apache.cocoon.template.script.ScriptManager;
import org.apache.cocoon.template.script.event.Event;
@@ -159,7 +159,7 @@
* @see org.apache.cocoon.caching.CacheableProcessingComponent#getKey()
*/
public Serializable getKey() {
- JXTExpression cacheKeyExpr = (JXTExpression) this.startDocument
+ Subst cacheKeyExpr = (Subst) this.startDocument
.getTemplateProperty(JXTemplateGenerator.CACHE_KEY);
if (cacheKeyExpr == null) {
return null;
@@ -179,7 +179,7 @@
* @see org.apache.cocoon.caching.CacheableProcessingComponent#getValidity()
*/
public SourceValidity getValidity() {
- JXTExpression validityExpr = (JXTExpression) this.startDocument
+ Subst validityExpr = (Subst) this.startDocument
.getTemplateProperty(JXTemplateGenerator.VALIDITY);
if (validityExpr == null) {
return null;
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Attribute.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Attribute.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Attribute.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Attribute.java Wed Aug 15 07:55:31 2007
@@ -23,7 +23,7 @@
import org.apache.cocoon.template.JXTemplateGenerator;
import org.apache.cocoon.template.environment.ExecutionContext;
import org.apache.cocoon.template.environment.ParsingContext;
-import org.apache.cocoon.template.expression.JXTExpression;
+import org.apache.cocoon.template.expression.Subst;
import org.apache.cocoon.template.script.Invoker;
import org.apache.cocoon.template.script.event.Event;
import org.apache.cocoon.template.script.event.StartElement;
@@ -43,8 +43,8 @@
*/
public class Attribute extends Instruction {
- private JXTExpression name;
- private JXTExpression value;
+ private Subst name;
+ private Subst value;
public Attribute(ParsingContext parsingContext, StartElement raw, Attributes attrs, Stack stack)
throws SAXException {
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Call.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Call.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Call.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Call.java Wed Aug 15 07:55:31 2007
@@ -25,7 +25,7 @@
import org.apache.cocoon.template.environment.ErrorHolder;
import org.apache.cocoon.template.environment.ExecutionContext;
import org.apache.cocoon.template.environment.ParsingContext;
-import org.apache.cocoon.template.expression.JXTExpression;
+import org.apache.cocoon.template.expression.Subst;
import org.apache.cocoon.template.script.Invoker;
import org.apache.cocoon.template.script.event.AttributeEvent;
import org.apache.cocoon.template.script.event.Characters;
@@ -47,7 +47,7 @@
public class Call extends Instruction {
private Object macro;
- private JXTExpression targetNamespace;
+ private Subst targetNamespace;
private Map parameters;
private Event body;
@@ -168,7 +168,7 @@
Object macroName;
Object namespace;
- JXTExpression macroNameExpression = (JXTExpression) macro;
+ Subst macroNameExpression = (Subst) macro;
try {
macroName = macroNameExpression.getValue(objectModel);
namespace = targetNamespace.getValue(objectModel);
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Eval.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Eval.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Eval.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Eval.java Wed Aug 15 07:55:31 2007
@@ -22,7 +22,7 @@
import org.apache.cocoon.template.environment.ErrorHolder;
import org.apache.cocoon.template.environment.ExecutionContext;
import org.apache.cocoon.template.environment.ParsingContext;
-import org.apache.cocoon.template.expression.JXTExpression;
+import org.apache.cocoon.template.expression.Subst;
import org.apache.cocoon.template.script.Invoker;
import org.apache.cocoon.template.script.event.Event;
import org.apache.cocoon.template.script.event.StartElement;
@@ -36,7 +36,7 @@
* @version SVN $Id$
*/
public class Eval extends Instruction {
- private final JXTExpression value;
+ private final Subst value;
public Eval(ParsingContext parsingContext, StartElement raw, Attributes attrs, Stack stack)
throws SAXException {
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/ForEach.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/ForEach.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/ForEach.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/ForEach.java Wed Aug 15 07:55:31 2007
@@ -23,8 +23,8 @@
import org.apache.cocoon.template.environment.ErrorHolder;
import org.apache.cocoon.template.environment.ExecutionContext;
import org.apache.cocoon.template.environment.ParsingContext;
-import org.apache.cocoon.template.expression.JXTExpression;
import org.apache.cocoon.template.expression.StringTemplateParser;
+import org.apache.cocoon.template.expression.Subst;
import org.apache.cocoon.template.script.Invoker;
import org.apache.cocoon.template.script.event.Event;
import org.apache.cocoon.template.script.event.StartElement;
@@ -40,12 +40,12 @@
*/
public class ForEach extends Instruction {
- private final JXTExpression items;
- private final JXTExpression var;
- private final JXTExpression varStatus;
- private final JXTExpression begin;
- private final JXTExpression end;
- private final JXTExpression step;
+ private final Subst items;
+ private final Subst var;
+ private final Subst varStatus;
+ private final Subst begin;
+ private final Subst end;
+ private final Subst step;
public ForEach(ParsingContext parsingContext, StartElement raw, Attributes attrs, Stack stack)
throws SAXException {
@@ -88,7 +88,7 @@
try {
iter = (this.items != null )
? this.items.getIterator(objectModel)
- : JXTExpression.NULL_ITER;
+ : Subst.NULL_ITER;
begin = this.begin == null
? 0
: this.begin.getIntValue(objectModel);
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/FormatDate.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/FormatDate.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/FormatDate.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/FormatDate.java Wed Aug 15 07:55:31 2007
@@ -26,8 +26,8 @@
import org.apache.cocoon.template.environment.ErrorHolder;
import org.apache.cocoon.template.environment.ExecutionContext;
import org.apache.cocoon.template.environment.ParsingContext;
-import org.apache.cocoon.template.expression.JXTExpression;
import org.apache.cocoon.template.expression.StringTemplateParser;
+import org.apache.cocoon.template.expression.Subst;
import org.apache.cocoon.template.script.event.Event;
import org.apache.cocoon.template.script.event.StartElement;
import org.apache.cocoon.xml.NamespacesTable;
@@ -45,13 +45,13 @@
private static final String TIME = "time";
private static final String DATETIME = "both";
- private JXTExpression var;
- private JXTExpression value;
- private JXTExpression type;
- private JXTExpression pattern;
- private JXTExpression timeZone;
- private JXTExpression dateStyle;
- private JXTExpression timeStyle;
+ private Subst var;
+ private Subst value;
+ private Subst type;
+ private Subst pattern;
+ private Subst timeZone;
+ private Subst dateStyle;
+ private Subst timeStyle;
public FormatDate(ParsingContext parsingContext, StartElement raw, Attributes attrs, Stack stack)
throws SAXException{
super(parsingContext, raw, attrs, stack);
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/FormatNumber.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/FormatNumber.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/FormatNumber.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/FormatNumber.java Wed Aug 15 07:55:31 2007
@@ -27,8 +27,8 @@
import org.apache.cocoon.template.environment.ErrorHolder;
import org.apache.cocoon.template.environment.ExecutionContext;
import org.apache.cocoon.template.environment.ParsingContext;
-import org.apache.cocoon.template.expression.JXTExpression;
import org.apache.cocoon.template.expression.StringTemplateParser;
+import org.apache.cocoon.template.expression.Subst;
import org.apache.cocoon.template.script.event.Event;
import org.apache.cocoon.template.script.event.StartElement;
import org.apache.cocoon.xml.NamespacesTable;
@@ -43,18 +43,18 @@
* @version SVN $Id$
*/
public class FormatNumber extends LocaleAwareInstruction {
- private JXTExpression value;
- private JXTExpression type;
- private JXTExpression pattern;
- private JXTExpression currencyCode;
- private JXTExpression currencySymbol;
- private JXTExpression isGroupingUsed;
- private JXTExpression maxIntegerDigits;
- private JXTExpression minIntegerDigits;
- private JXTExpression maxFractionDigits;
- private JXTExpression minFractionDigits;
+ private Subst value;
+ private Subst type;
+ private Subst pattern;
+ private Subst currencyCode;
+ private Subst currencySymbol;
+ private Subst isGroupingUsed;
+ private Subst maxIntegerDigits;
+ private Subst minIntegerDigits;
+ private Subst maxFractionDigits;
+ private Subst minFractionDigits;
- private JXTExpression var;
+ private Subst var;
private static Class currencyClass;
private static final String NUMBER = "number";
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/If.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/If.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/If.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/If.java Wed Aug 15 07:55:31 2007
@@ -22,7 +22,7 @@
import org.apache.cocoon.template.environment.ErrorHolder;
import org.apache.cocoon.template.environment.ExecutionContext;
import org.apache.cocoon.template.environment.ParsingContext;
-import org.apache.cocoon.template.expression.JXTExpression;
+import org.apache.cocoon.template.expression.Subst;
import org.apache.cocoon.template.script.event.Event;
import org.apache.cocoon.template.script.event.StartElement;
import org.apache.cocoon.xml.NamespacesTable;
@@ -36,7 +36,7 @@
* @version SVN $Id$
*/
public class If extends Instruction {
- private final JXTExpression test;
+ private final Subst test;
public If(ParsingContext parsingContext, StartElement raw, Attributes attrs, Stack stack)
throws SAXException {
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=566208&r1=566207&r2=566208
==============================================================================
--- 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 Wed Aug 15 07:55:31 2007
@@ -47,7 +47,7 @@
public class Import extends Instruction {
private final AttributeEvent uri;
- private final JXTExpression select;
+ private final Subst select;
public Import(ParsingContext parsingContext, StartElement raw, Attributes attrs, Stack stack)
throws SAXException {
@@ -58,7 +58,7 @@
Locator locator = getLocation();
Iterator iter = raw.getAttributeEvents().iterator();
AttributeEvent uri = null;
- JXTExpression select = null;
+ Subst select = null;
while (iter.hasNext()) {
AttributeEvent e = (AttributeEvent) iter.next();
if (e.getLocalName().equals("uri")) {
@@ -99,7 +99,7 @@
Literal lit = (Literal) subst;
buf.append(lit.getValue());
} else if (subst instanceof JXTExpression) {
- JXTExpression expr = (JXTExpression) subst;
+ Subst expr = (Subst) subst;
Object val;
try {
val = expr.getValue(objectModel);
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/LocaleAwareInstruction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/LocaleAwareInstruction.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/LocaleAwareInstruction.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/LocaleAwareInstruction.java Wed Aug 15 07:55:31 2007
@@ -22,7 +22,7 @@
import org.apache.cocoon.objectmodel.ObjectModel;
import org.apache.cocoon.template.environment.ParsingContext;
import org.apache.cocoon.template.environment.ValueHelper;
-import org.apache.cocoon.template.expression.JXTExpression;
+import org.apache.cocoon.template.expression.Subst;
import org.apache.cocoon.template.script.event.StartElement;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -31,7 +31,7 @@
* @version SVN $Id$
*/
public class LocaleAwareInstruction extends Instruction {
- private JXTExpression locale;
+ private Subst locale;
public LocaleAwareInstruction(ParsingContext parsingContext, StartElement raw, Attributes attrs, Stack stack) throws SAXException {
super(raw);
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Out.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Out.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Out.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Out.java Wed Aug 15 07:55:31 2007
@@ -23,7 +23,7 @@
import org.apache.cocoon.objectmodel.ObjectModel;
import org.apache.cocoon.template.environment.ExecutionContext;
import org.apache.cocoon.template.environment.ParsingContext;
-import org.apache.cocoon.template.expression.JXTExpression;
+import org.apache.cocoon.template.expression.Subst;
import org.apache.cocoon.template.script.Invoker;
import org.apache.cocoon.template.script.event.Event;
import org.apache.cocoon.template.script.event.StartElement;
@@ -44,7 +44,7 @@
* @version SVN $Id$
*/
public class Out extends Instruction {
- private final JXTExpression compiledExpression;
+ private final Subst compiledExpression;
private Boolean xmlize;
private Boolean stripRoot;
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/ParameterInstance.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/ParameterInstance.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/ParameterInstance.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/ParameterInstance.java Wed Aug 15 07:55:31 2007
@@ -22,6 +22,7 @@
import org.apache.cocoon.template.environment.ErrorHolder;
import org.apache.cocoon.template.environment.ParsingContext;
import org.apache.cocoon.template.expression.JXTExpression;
+import org.apache.cocoon.template.expression.Subst;
import org.apache.cocoon.template.script.event.AttributeEvent;
import org.apache.cocoon.template.script.event.CopyAttribute;
import org.apache.cocoon.template.script.event.StartElement;
@@ -70,7 +71,7 @@
public Object getValue(ObjectModel objectModel) throws SAXException {
if (this.value instanceof JXTExpression)
- return getExpressionValue((JXTExpression) this.value, objectModel);
+ return getExpressionValue((Subst) this.value, objectModel);
else if (this.value instanceof CopyAttribute) {
CopyAttribute copy = (CopyAttribute) this.value;
return copy.getValue();
@@ -78,7 +79,7 @@
SubstituteAttribute substEvent = (SubstituteAttribute) this.value;
if (substEvent.getSubstitutions().size() == 1
&& substEvent.getSubstitutions().get(0) instanceof JXTExpression)
- return getExpressionValue((JXTExpression) substEvent.getSubstitutions().get(0), objectModel);
+ return getExpressionValue((Subst) substEvent.getSubstitutions().get(0), objectModel);
else
return substEvent.getSubstitutions().toString(getLocation(), objectModel);
@@ -87,7 +88,7 @@
}
}
- private Object getExpressionValue(JXTExpression expr, ObjectModel objectModel) throws SAXException {
+ private Object getExpressionValue(Subst expr, ObjectModel objectModel) throws SAXException {
Object val;
try {
val = expr.getNode(objectModel);
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Set.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Set.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Set.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Set.java Wed Aug 15 07:55:31 2007
@@ -21,7 +21,7 @@
import org.apache.cocoon.objectmodel.ObjectModel;
import org.apache.cocoon.template.environment.ExecutionContext;
import org.apache.cocoon.template.environment.ParsingContext;
-import org.apache.cocoon.template.expression.JXTExpression;
+import org.apache.cocoon.template.expression.Subst;
import org.apache.cocoon.template.script.Invoker;
import org.apache.cocoon.template.script.event.Event;
import org.apache.cocoon.template.script.event.StartElement;
@@ -39,8 +39,8 @@
*/
public class Set extends Instruction {
- private final JXTExpression var;
- private final JXTExpression value;
+ private final Subst var;
+ private final Subst value;
public Set(ParsingContext parsingContext, StartElement raw, Attributes attrs, Stack stack)
throws SAXException {
@@ -50,8 +50,8 @@
Locator locator = getLocation();
String var = attrs.getValue("var");
String value = attrs.getValue("value");
- JXTExpression varExpr = null;
- JXTExpression valueExpr = null;
+ Subst varExpr = null;
+ Subst valueExpr = null;
if (var != null) {
varExpr = parsingContext.getStringTemplateParser().compileExpr(var, "set: \"var\":", locator);
}
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/When.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/When.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/When.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/When.java Wed Aug 15 07:55:31 2007
@@ -19,7 +19,7 @@
import java.util.Stack;
import org.apache.cocoon.template.environment.ParsingContext;
-import org.apache.cocoon.template.expression.JXTExpression;
+import org.apache.cocoon.template.expression.Subst;
import org.apache.cocoon.template.script.event.StartElement;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
@@ -30,7 +30,7 @@
* @version SVN $Id$
*/
public class When extends Instruction {
- private final JXTExpression test;
+ private final Subst test;
private When nextChoice;
public When(ParsingContext parsingContext, StartElement raw, Attributes attrs, Stack stack)
@@ -64,7 +64,7 @@
}
}
- public JXTExpression getTest() {
+ public Subst getTest() {
return test;
}
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/Characters.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/Characters.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/Characters.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/Characters.java Wed Aug 15 07:55:31 2007
@@ -22,7 +22,6 @@
import org.apache.cocoon.template.environment.ErrorHolder;
import org.apache.cocoon.template.environment.ExecutionContext;
import org.apache.cocoon.template.environment.ParsingContext;
-import org.apache.cocoon.template.expression.JXTExpression;
import org.apache.cocoon.template.expression.Literal;
import org.apache.cocoon.template.expression.Subst;
import org.apache.cocoon.template.instruction.MacroContext;
@@ -54,7 +53,7 @@
chars = ((Literal) subst).getCharArray();
consumer.characters(chars, 0, chars.length);
} else {
- JXTExpression expr = (JXTExpression) subst;
+ Subst expr = (Subst) subst;
try {
Object val = expr.getNode(objectModel);
Invoker.executeNode(consumer, val);
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/TextEvent.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/TextEvent.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/TextEvent.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/TextEvent.java Wed Aug 15 07:55:31 2007
@@ -22,8 +22,8 @@
import org.apache.cocoon.template.environment.ErrorHolder;
import org.apache.cocoon.template.environment.ExecutionContext;
import org.apache.cocoon.template.environment.ParsingContext;
-import org.apache.cocoon.template.expression.JXTExpression;
import org.apache.cocoon.template.expression.Literal;
+import org.apache.cocoon.template.expression.Subst;
import org.apache.cocoon.template.expression.Substitutions;
import org.apache.commons.lang.ArrayUtils;
import org.xml.sax.Locator;
@@ -68,7 +68,7 @@
if (subst instanceof Literal) {
chars = ((Literal) subst).getCharArray();
} else {
- JXTExpression expr = (JXTExpression) subst;
+ Subst expr = (Subst) subst;
try {
Object val = expr.getValue(objectModel);
chars = val != null ? val.toString().toCharArray()
Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/AbstractStringTemplateParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/AbstractStringTemplateParser.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/AbstractStringTemplateParser.java (original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/AbstractStringTemplateParser.java Wed Aug 15 07:55:31 2007
@@ -57,18 +57,18 @@
}
}
- protected JXTExpression compile(final String expression) throws Exception {
+ protected Subst compile(final String expression) throws Exception {
return new JXTExpression(expression, this.expressionFactory.getExpression(expression));
}
- protected JXTExpression compile(final String expression, String language) throws Exception {
+ protected Subst compile(final String expression, String language) throws Exception {
return new JXTExpression(expression, this.expressionFactory.getExpression(language, expression));
}
/**
* @see org.apache.cocoon.template.expression.StringTemplateParser#compileBoolean(java.lang.String, java.lang.String, org.xml.sax.Locator)
*/
- public JXTExpression compileBoolean(String val, String msg, Locator location) throws SAXException {
+ public Subst compileBoolean(String val, String msg, Locator location) throws SAXException {
JXTExpression res = compileExpr(val, msg, location);
if (res != null && res.getCompiledExpression() == null && res.getRaw() != null) {
res.setCompiledExpression(Boolean.valueOf(res.getRaw()));
@@ -79,7 +79,7 @@
/**
* @see org.apache.cocoon.template.expression.StringTemplateParser#compileInt(java.lang.String, java.lang.String, org.xml.sax.Locator)
*/
- public JXTExpression compileInt(String val, String msg, Locator location) throws SAXException {
+ public Subst compileInt(String val, String msg, Locator location) throws SAXException {
JXTExpression res = compileExpr(val, msg, location);
if (res != null && res.getCompiledExpression() == null && res.getRaw() != null) {
res.setCompiledExpression(Integer.valueOf(res.getRaw()));
Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/JXTExpression.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/JXTExpression.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/JXTExpression.java (original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/JXTExpression.java Wed Aug 15 07:55:31 2007
@@ -25,10 +25,10 @@
/**
* @version $Id$
*/
-public class JXTExpression extends Subst {
+public class JXTExpression implements Subst {
private String raw;
- private Object compiledExpression;
+ Object compiledExpression;
public JXTExpression(String raw, Object expr) {
this.raw = raw;
@@ -144,32 +144,4 @@
//TODO: hack! bases on particular expression implementation.
((Expression)this.compiledExpression).setProperty(JXPathExpression.LENIENT, lenient);
}
-
- public static final Iterator EMPTY_ITER = new Iterator() {
- public boolean hasNext() {
- return false;
- }
-
- public Object next() {
- return null;
- }
-
- public void remove() {
- // EMPTY
- }
- };
-
- static public final Iterator NULL_ITER = new Iterator() {
- public boolean hasNext() {
- return true;
- }
-
- public Object next() {
- return null;
- }
-
- public void remove() {
- // EMPTY
- }
- };
}
Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/Literal.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/Literal.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/Literal.java (original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/Literal.java Wed Aug 15 07:55:31 2007
@@ -16,6 +16,10 @@
*/
package org.apache.cocoon.template.expression;
+import java.util.Iterator;
+
+import org.apache.cocoon.objectmodel.ObjectModel;
+
/*
From efficiency reasons it might be better to split this class in
two, one that represent attribute content that are strings and one
@@ -27,7 +31,7 @@
/**
* @version $Id$
*/
-public class Literal extends Subst {
+public class Literal implements Subst {
public Literal(String val) {
this.value = val.toCharArray();
}
@@ -38,6 +42,41 @@
public char[] getCharArray() {
return value;
+ }
+
+ public void setLenient(Boolean lenient) {
+ }
+
+ public Object getValue(ObjectModel objectModel) throws Exception {
+ return null;
+ }
+
+ public int getIntValue(ObjectModel objectModel) throws Exception {
+ return 0;
+ }
+
+ public Number getNumberValue(ObjectModel objectModel) throws Exception {
+ return null;
+ }
+
+ public String getStringValue(ObjectModel objectModel) throws Exception {
+ return null;
+ }
+
+ public Boolean getBooleanValue(ObjectModel objectModel) throws Exception {
+ return null;
+ }
+
+ public Iterator getIterator(ObjectModel objectModel) throws Exception {
+ return null;
+ }
+
+ public Object getNode(ObjectModel objectModel) throws Exception {
+ return null;
+ }
+
+ public Object getCompiledExpression() {
+ return null;
}
private final char[] value;
Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/StringTemplateParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/StringTemplateParser.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/StringTemplateParser.java (original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/StringTemplateParser.java Wed Aug 15 07:55:31 2007
@@ -34,13 +34,13 @@
* Compile a boolean expression (returns either a Compiled Expression or a
* Boolean literal)
*/
- JXTExpression compileBoolean(String val, String msg, Locator location) throws SAXException;
+ Subst compileBoolean(String val, String msg, Locator location) throws SAXException;
/**
* Compile an integer expression (returns either a Compiled Expression or an
* Integer literal)
*/
- JXTExpression compileInt(String val, String msg, Locator location) throws SAXException;
+ Subst compileInt(String val, String msg, Locator location) throws SAXException;
JXTExpression compileExpr(String inStr, String errorPrefix, Locator location) throws SAXParseException;
Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/Subst.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/Subst.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/Subst.java (original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/Subst.java Wed Aug 15 07:55:31 2007
@@ -16,9 +16,58 @@
*/
package org.apache.cocoon.template.expression;
+import java.util.Iterator;
+
+import org.apache.cocoon.objectmodel.ObjectModel;
+
/**
* @version $Id$
*/
-public class Subst {
+public interface Subst {
+
+ public Object getCompiledExpression();
+
+ public Object getNode(ObjectModel objectModel) throws Exception;
+
+ public Iterator getIterator(ObjectModel objectModel) throws Exception;
+
+ public Boolean getBooleanValue(ObjectModel objectModel) throws Exception;
+
+ public String getStringValue(ObjectModel objectModel) throws Exception;
+
+ public Number getNumberValue(ObjectModel objectModel) throws Exception;
+
+ public int getIntValue(ObjectModel objectModel) throws Exception;
+
+ public Object getValue(ObjectModel objectModel) throws Exception;
+
+ public void setLenient(Boolean lenient);
+
+ public static final Iterator EMPTY_ITER = new Iterator() {
+ public boolean hasNext() {
+ return false;
+ }
+
+ public Object next() {
+ return null;
+ }
+
+ public void remove() {
+ // EMPTY
+ }
+ };
+ public static final Iterator NULL_ITER = new Iterator() {
+ public boolean hasNext() {
+ return true;
+ }
+
+ public Object next() {
+ return null;
+ }
+
+ public void remove() {
+ // EMPTY
+ }
+ };
// VOID
}
Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/Substitutions.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/Substitutions.java?view=diff&rev=566208&r1=566207&r2=566208
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/Substitutions.java (original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/Substitutions.java Wed Aug 15 07:55:31 2007
@@ -74,7 +74,7 @@
Literal lit = (Literal) subst;
buf.append(lit.getValue());
} else if (subst instanceof JXTExpression) {
- JXTExpression expr = (JXTExpression) subst;
+ Subst expr = (Subst) subst;
Object val;
try {
val = expr.getValue(objectModel);