Author: dion
Date: Sun Apr 16 07:55:33 2006
New Revision: 394496
URL: http://svn.apache.org/viewcvs?rev=394496&view=rev
Log:
Checkstyle
Modified:
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ExpressionFactory.java
Modified:
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ExpressionFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ExpressionFactory.java?rev=394496&r1=394495&r2=394496&view=diff
==============================================================================
---
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ExpressionFactory.java
(original)
+++
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ExpressionFactory.java
Sun Apr 16 07:55:33 2006
@@ -56,11 +56,11 @@
LogFactory.getLog("org.apache.commons.jexl.ExpressionFactory");
/**
- * The singleton ExpressionFactory also holds a single instance of
+ * The singleton ExpressionFactory also holds a single instance of
* [EMAIL PROTECTED] Parser}.
* When parsing expressions, ExpressionFactory synchronizes on Parser.
*/
- protected static Parser parser =
+ protected static Parser parser =
new Parser(new StringReader(";")); //$NON-NLS-1$
/**
@@ -90,7 +90,7 @@
* must contain either a reference or an expression.
* @param expression A String containing valid JEXL syntax
* @return An Expression object which can be evaluated with a JexlContext
- * @throws Exception An exception can be thrown if there is a problem
+ * @throws Exception An exception can be thrown if there is a problem
* parsing this expression, or if the expression is neither an
* expression or a reference.
*/
@@ -131,18 +131,18 @@
SimpleNode node = (SimpleNode) tree.jjtGetChild(0);
// TODO: Can we get rid of these checks?
- if( node instanceof ASTReferenceExpression
+ if (node instanceof ASTReferenceExpression
|| node instanceof ASTExpressionExpression
|| node instanceof ASTStatementExpression
- || node instanceof ASTIfStatement
+ || node instanceof ASTIfStatement
|| node instanceof ASTWhileStatement
|| node instanceof ASTForeachStatement
- )
- {
+ ) {
return new ExpressionImpl(expression, node);
}
log.error( "Invalid Expression, node of type: " +
node.getClass().getName() );
- throw new Exception("Invalid Expression: not a Reference, Expression,
Statement or If");
+ throw new Exception("Invalid Expression: not a Reference, Expression, "
+ + "Statement or If");
}
/**
@@ -152,8 +152,7 @@
*/
private String cleanExpression(String expression) {
String expr = expression.trim();
- if (!expr.endsWith(";"))
- {
+ if (!expr.endsWith(";")) {
expr += ";";
}
return expr;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
