dion 2004/08/19 11:16:18
Modified: jexl/src/java/org/apache/commons/jexl ExpressionFactory.java
JexlContext.java ExpressionImpl.java
Log:
detab
Revision Changes Path
1.6 +15 -15
jakarta-commons/jexl/src/java/org/apache/commons/jexl/ExpressionFactory.java
Index: ExpressionFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jexl/src/java/org/apache/commons/jexl/ExpressionFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ExpressionFactory.java 13 Jun 2004 01:41:49 -0000 1.5
+++ ExpressionFactory.java 19 Aug 2004 18:16:17 -0000 1.6
@@ -106,13 +106,13 @@
protected Expression createNewExpression(String expression)
throws Exception {
- String expr = cleanExpression(expression);
+ String expr = cleanExpression(expression);
// Parse the Expression
SimpleNode tree;
synchronized(parser)
{
- log.debug( "Parsing expression: " + expr );
+ log.debug( "Parsing expression: " + expr );
tree = parser.parse(new StringReader(expr));
}
@@ -124,28 +124,28 @@
(node instanceof ASTExpressionExpression) )
{
node = (SimpleNode) node.jjtGetChild(0);
- Expression e = new ExpressionImpl(expression, node);
+ Expression e = new ExpressionImpl(expression, node);
- return e;
+ return e;
}
else
{
- log.error( "Invalid Expression, node of type: " +
node.getClass().getName() );
- throw new Exception("Invalid Expression: neither Reference nor
Expression");
+ log.error( "Invalid Expression, node of type: " +
node.getClass().getName() );
+ throw new Exception("Invalid Expression: neither Reference nor
Expression");
}
}
- /**
- * Trims the expression and adds a semi-colon if missing.
- * @param expression to clean
- * @return trimmed expression ending in a semi-colon
- */
- private String cleanExpression(String expression) {
+ /**
+ * Trims the expression and adds a semi-colon if missing.
+ * @param expression to clean
+ * @return trimmed expression ending in a semi-colon
+ */
+ private String cleanExpression(String expression) {
String expr = expression.trim();
if (!expr.endsWith(";"))
{
expr = expr + ";";
}
- return expr;
- }
+ return expr;
+ }
}
1.5 +9 -9
jakarta-commons/jexl/src/java/org/apache/commons/jexl/JexlContext.java
Index: JexlContext.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jexl/src/java/org/apache/commons/jexl/JexlContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JexlContext.java 12 Jun 2004 23:53:17 -0000 1.4
+++ JexlContext.java 19 Aug 2004 18:16:17 -0000 1.5
@@ -25,14 +25,14 @@
*/
public interface JexlContext
{
- /**
- * Replaces variables in a JexlContext with the variables contained
- * in the supplied Map. When setVars() is called on a JexlContext,
- * it clears the current Map and puts each entry of the
- * supplied Map into the current variable Map.
- *
- * @param vars Contents of vars will be replaced with the content of this Map
- */
+ /**
+ * Replaces variables in a JexlContext with the variables contained
+ * in the supplied Map. When setVars() is called on a JexlContext,
+ * it clears the current Map and puts each entry of the
+ * supplied Map into the current variable Map.
+ *
+ * @param vars Contents of vars will be replaced with the content of this Map
+ */
public void setVars(Map vars);
/**
1.9 +2 -2
jakarta-commons/jexl/src/java/org/apache/commons/jexl/ExpressionImpl.java
Index: ExpressionImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jexl/src/java/org/apache/commons/jexl/ExpressionImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ExpressionImpl.java 13 Jun 2004 01:42:21 -0000 1.8
+++ ExpressionImpl.java 19 Aug 2004 18:16:17 -0000 1.9
@@ -31,7 +31,7 @@
class ExpressionImpl implements Expression
{
- List preResolvers;
+ List preResolvers;
List postResolvers;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
