Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org Received: (qmail 83953 invoked from network); 16 Apr 2006 14:56:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 16 Apr 2006 14:56:00 -0000 Received: (qmail 68377 invoked by uid 500); 16 Apr 2006 14:55:57 -0000 Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org Received: (qmail 68288 invoked by uid 500); 16 Apr 2006 14:55:56 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 68276 invoked by uid 500); 16 Apr 2006 14:55:56 -0000 Received: (qmail 68273 invoked by uid 99); 16 Apr 2006 14:55:56 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Apr 2006 07:55:56 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 16 Apr 2006 07:55:55 -0700 Received: (qmail 83864 invoked by uid 65534); 16 Apr 2006 14:55:35 -0000 Message-ID: <20060416145535.83863.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r394496 - /jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ExpressionFactory.java Date: Sun, 16 Apr 2006 14:55:35 -0000 To: commons-cvs@jakarta.apache.org From: dion@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 * {@link 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: commons-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: commons-dev-help@jakarta.apache.org