Author: dion Date: Sun Jun 17 23:11:32 2007 New Revision: 548229 URL: http://svn.apache.org/viewvc?view=rev&rev=548229 Log: checkstyle issues
Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ExpressionFactory.java jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ScriptFactory.java jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTArrayAccess.java jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTIdentifier.java jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTIntegerLiteral.java jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTMapEntry.java jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTMapLiteral.java jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTSizeFunction.java jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTSizeMethod.java jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParseException.java jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Parser.java jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserTokenManager.java jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/SimpleNode.java jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/util/introspection/VelPropertyGet.java jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/JexlTest.java jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/ParseFailuresTest.java Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ExpressionFactory.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ExpressionFactory.java?view=diff&rev=548229&r1=548228&r2=548229 ============================================================================== --- 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 Jun 17 23:11:32 2007 @@ -66,7 +66,7 @@ * When parsing expressions, ExpressionFactory synchronizes on Parser. */ protected final Parser parser = - new Parser(new StringReader(";") ); //$NON-NLS-1$ + new Parser(new StringReader(";")); //$NON-NLS-1$ /** * ExpressionFactory is a singleton and this is the private @@ -82,8 +82,12 @@ this(Introspector.getUberspect()); } - public ExpressionFactory( Uberspect uberspect ) { - parser.setUberspect( uberspect ); + /** + * Creates an expression factory using the provided [EMAIL PROTECTED] Uberspect}. + * @param uberspect to allow different introspection behaviour + */ + public ExpressionFactory(Uberspect uberspect) { + parser.setUberspect(uberspect); } /** Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ScriptFactory.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ScriptFactory.java?view=diff&rev=548229&r1=548228&r2=548229 ============================================================================== --- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ScriptFactory.java (original) +++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ScriptFactory.java Sun Jun 17 23:11:32 2007 @@ -77,11 +77,11 @@ * with a call to getInstance(). */ private ScriptFactory() { - this( Introspector.getUberspect()); + this(Introspector.getUberspect()); } - public ScriptFactory( Uberspect uberspect ) { - parser.setUberspect( uberspect ); + public ScriptFactory(Uberspect uberspect) { + parser.setUberspect(uberspect); } /** Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTArrayAccess.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTArrayAccess.java?view=diff&rev=548229&r1=548228&r2=548229 ============================================================================== --- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTArrayAccess.java (original) +++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTArrayAccess.java Sun Jun 17 23:11:32 2007 @@ -89,7 +89,7 @@ return null; } - result = evaluateExpr(result, loc, getUberspect() ); + result = evaluateExpr(result, loc, getUberspect()); } return result; @@ -115,7 +115,7 @@ return null; } - o = evaluateExpr(o, loc, getUberspect() ); + o = evaluateExpr(o, loc, getUberspect()); } return o; @@ -137,7 +137,7 @@ * @return the resulting value. * @throws Exception on any error. */ - public static Object evaluateExpr( Object o, Object loc, Uberspect uberspect ) throws Exception { + public static Object evaluateExpr(Object o, Object loc, Uberspect uberspect) throws Exception { /* * following the JSTL EL rules */ Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTIdentifier.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTIdentifier.java?view=diff&rev=548229&r1=548228&r2=548229 ============================================================================== --- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTIdentifier.java (original) +++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTIdentifier.java Sun Jun 17 23:11:32 2007 @@ -18,7 +18,6 @@ package org.apache.commons.jexl.parser; import org.apache.commons.jexl.JexlContext; -import org.apache.commons.jexl.util.introspection.Uberspect; /** * Simple identifier - $foo or $foo.bar (both parts are identifiers). @@ -72,7 +71,7 @@ * @see ASTArrayAccess#evaluateExpr(Object, Object, Uberspect) */ public Object execute(Object obj, JexlContext jc) throws Exception { - return ASTArrayAccess.evaluateExpr(obj, val, getUberspect() ); + return ASTArrayAccess.evaluateExpr(obj, val, getUberspect()); } /** Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTIntegerLiteral.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTIntegerLiteral.java?view=diff&rev=548229&r1=548228&r2=548229 ============================================================================== --- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTIntegerLiteral.java (original) +++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTIntegerLiteral.java Sun Jun 17 23:11:32 2007 @@ -17,7 +17,6 @@ package org.apache.commons.jexl.parser; import org.apache.commons.jexl.JexlContext; -import org.apache.commons.jexl.util.introspection.Uberspect; /** * represents an integer. @@ -64,7 +63,7 @@ * @see ASTArrayAccess#evaluateExpr(Object, Object, Uberspect) */ public Object execute(Object obj, JexlContext ctx) throws Exception { - return ASTArrayAccess.evaluateExpr(obj, val, getUberspect() ); + return ASTArrayAccess.evaluateExpr(obj, val, getUberspect()); } /** [EMAIL PROTECTED] */ Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTMapEntry.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTMapEntry.java?view=diff&rev=548229&r1=548228&r2=548229 ============================================================================== --- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTMapEntry.java (original) +++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTMapEntry.java Sun Jun 17 23:11:32 2007 @@ -21,21 +21,23 @@ import org.apache.commons.jexl.JexlContext; public class ASTMapEntry extends SimpleNode { - public ASTMapEntry( int id ) { - super( id ); + public ASTMapEntry(int id) { + super(id); } - public ASTMapEntry( Parser p, int id ) { - super( p, id ); + public ASTMapEntry(Parser p, int id) { + super(p, id); } /** Accept the visitor. * */ - public Object jjtAccept( ParserVisitor visitor, Object data ) { - return visitor.visit( this, data ); + public Object jjtAccept(ParserVisitor visitor, Object data) { + return visitor.visit(this, data); } - public Object value( JexlContext context ) throws Exception { - return new Object[]{ ( (SimpleNode) jjtGetChild( 0 ) ).value( context ), - ( (SimpleNode) jjtGetChild( 1 ) ).value( context ) }; + public Object value(JexlContext context) throws Exception { + return new Object[]{ + ((SimpleNode) jjtGetChild(0)).value(context), + ((SimpleNode) jjtGetChild(1)).value(context) + }; } } Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTMapLiteral.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTMapLiteral.java?view=diff&rev=548229&r1=548228&r2=548229 ============================================================================== --- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTMapLiteral.java (original) +++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTMapLiteral.java Sun Jun 17 23:11:32 2007 @@ -24,26 +24,26 @@ import org.apache.commons.jexl.JexlContext; public class ASTMapLiteral extends SimpleNode { - public ASTMapLiteral( int id ) { - super( id ); + public ASTMapLiteral(int id) { + super(id); } - public ASTMapLiteral( Parser p, int id ) { - super( p, id ); + public ASTMapLiteral(Parser p, int id) { + super(p, id); } /** Accept the visitor. * */ - public Object jjtAccept( ParserVisitor visitor, Object data ) { - return visitor.visit( this, data ); + public Object jjtAccept(ParserVisitor visitor, Object data) { + return visitor.visit(this, data); } - public Object value( JexlContext context ) throws Exception { + public Object value(JexlContext context) throws Exception { int childCount = jjtGetNumChildren(); Map map = new HashMap(); - for ( int i = 0; i < childCount; i++ ) { - Object[] entry = (Object[]) ( (SimpleNode) jjtGetChild( i ) ).value( context ); - map.put( entry[0], entry[1] ); + for (int i = 0; i < childCount; i++) { + Object[] entry = (Object[]) ((SimpleNode) jjtGetChild(i)).value(context); + map.put(entry[0], entry[1]); } return map; Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTSizeFunction.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTSizeFunction.java?view=diff&rev=548229&r1=548228&r2=548229 ============================================================================== --- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTSizeFunction.java (original) +++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTSizeFunction.java Sun Jun 17 23:11:32 2007 @@ -67,7 +67,7 @@ throw new Exception("size() : null arg"); } - return new Integer(ASTSizeFunction.sizeOf(val, getUberspect() )); + return new Integer(ASTSizeFunction.sizeOf(val, getUberspect())); } /** @@ -79,7 +79,7 @@ * @return the size of val * @throws Exception if the size cannot be determined. */ - public static int sizeOf( Object val, Uberspect uberspect ) throws Exception { + public static int sizeOf(Object val, Uberspect uberspect) throws Exception { if (val instanceof Collection) { return ((Collection) val).size(); } else if (val.getClass().isArray()) { Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTSizeMethod.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTSizeMethod.java?view=diff&rev=548229&r1=548228&r2=548229 ============================================================================== --- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTSizeMethod.java (original) +++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTSizeMethod.java Sun Jun 17 23:11:32 2007 @@ -60,10 +60,10 @@ * @throws Exception on any error */ public Object execute(Object obj, JexlContext jc) throws Exception { - if( null == obj ) { + if (null == obj) { return null; } - return new Integer(ASTSizeFunction.sizeOf(obj, getUberspect() )); + return new Integer(ASTSizeFunction.sizeOf(obj, getUberspect())); } } Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParseException.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParseException.java?view=diff&rev=548229&r1=548228&r2=548229 ============================================================================== --- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParseException.java (original) +++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParseException.java Sun Jun 17 23:11:32 2007 @@ -43,8 +43,7 @@ public ParseException(Token currentTokenVal, int[][] expectedTokenSequencesVal, String[] tokenImageVal - ) - { + ) { super(""); specialConstructor = true; currentToken = currentTokenVal; Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Parser.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Parser.java?view=diff&rev=548229&r1=548228&r2=548229 ============================================================================== --- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Parser.java (original) +++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Parser.java Sun Jun 17 23:11:32 2007 @@ -18,7 +18,6 @@ package org.apache.commons.jexl.parser; import java.io.Reader; -import java.io.ByteArrayInputStream; import org.apache.commons.jexl.util.introspection.Uberspect; @@ -57,7 +56,7 @@ /[EMAIL PROTECTED](jjtree) JexlScript */ ASTJexlScript jjtn000 = new ASTJexlScript(this, JJTJEXLSCRIPT); boolean jjtc000 = true; - jjtree.openNodeScope(jjtn000);String name; + jjtree.openNodeScope(jjtn000); try { label_1: while (true) { @@ -1408,7 +1407,6 @@ } final public void Literal() throws ParseException { - Token t; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case INTEGER_LITERAL: IntegerLiteral(); @@ -3177,7 +3175,6 @@ private Token jj_scanpos, jj_lastpos; private int jj_la; public boolean lookingAhead = false; - private boolean jj_semLA; private int jj_gen; final private int[] jj_la1 = new int[36]; static private int[] jj_la1_0; Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserTokenManager.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserTokenManager.java?view=diff&rev=548229&r1=548228&r2=548229 ============================================================================== --- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserTokenManager.java (original) +++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserTokenManager.java Sun Jun 17 23:11:32 2007 @@ -16,9 +16,6 @@ */ /* Generated By:JJTree&JavaCC: Do not edit this line. ParserTokenManager.java */ package org.apache.commons.jexl.parser; -import java.io.Reader; -import java.io.ByteArrayInputStream; -import org.apache.commons.jexl.util.introspection.Uberspect; public class ParserTokenManager implements ParserConstants { Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/SimpleNode.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/SimpleNode.java?view=diff&rev=548229&r1=548228&r2=548229 ============================================================================== --- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/SimpleNode.java (original) +++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/SimpleNode.java Sun Jun 17 23:11:32 2007 @@ -19,7 +19,6 @@ import org.apache.commons.jexl.JexlContext; import org.apache.commons.jexl.util.introspection.Uberspect; -import org.apache.commons.jexl.util.Introspector; /** * A Useful implementation of [EMAIL PROTECTED] Node}. Mostly autogenerated by javacc Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/util/introspection/VelPropertyGet.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/util/introspection/VelPropertyGet.java?view=diff&rev=548229&r1=548228&r2=548229 ============================================================================== --- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/util/introspection/VelPropertyGet.java (original) +++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/util/introspection/VelPropertyGet.java Sun Jun 17 23:11:32 2007 @@ -53,7 +53,7 @@ /** * Tell whether the method underlying this 'property' is alive by - * checking to see if represents a successful name resolution + * checking to see if represents a successful name resolution. * * @return boolean Whether 'property' is alive. */ Modified: jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/JexlTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/JexlTest.java?view=diff&rev=548229&r1=548228&r2=548229 ============================================================================== --- jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/JexlTest.java (original) +++ jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/JexlTest.java Sun Jun 17 23:11:32 2007 @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.BitSet; import java.util.Calendar; -import java.util.Collections; import java.util.GregorianCalendar; import java.util.HashMap; import java.util.HashSet; Modified: jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/ParseFailuresTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/ParseFailuresTest.java?view=diff&rev=548229&r1=548228&r2=548229 ============================================================================== --- jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/ParseFailuresTest.java (original) +++ jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/ParseFailuresTest.java Sun Jun 17 23:11:32 2007 @@ -42,7 +42,7 @@ // this will throw a ParseException String badExpression = "eq"; try { - Expression e = ExpressionFactory.createExpression(badExpression); + ExpressionFactory.createExpression(badExpression); fail("Parsing \"" + badExpression + "\" should result in a ParseException"); } catch (ParseException pe) { @@ -54,7 +54,7 @@ // this will throw a TokenMgrErr, which we rethrow as a ParseException String badExpression = "?"; try { - Expression e = ExpressionFactory.createExpression(badExpression); + ExpressionFactory.createExpression(badExpression); fail("Parsing \"" + badExpression + "\" should result in a ParseException"); } catch (ParseException pe) { @@ -66,7 +66,7 @@ // this will throw a TokenMgrErr, which we rethrow as a ParseException String badScript = "eq"; try { - Script s = ScriptFactory.createScript(badScript); + ScriptFactory.createScript(badScript); fail("Parsing \"" + badScript + "\" should result in a ParseException"); } catch (ParseException pe) { @@ -79,7 +79,7 @@ // this will throw a TokenMgrErr, which we rethrow as a ParseException String badScript = "?"; try { - Script s = ScriptFactory.createScript(badScript); + ScriptFactory.createScript(badScript); fail("Parsing \"" + badScript + "\" should result in a ParseException"); } catch (ParseException pe) { @@ -91,7 +91,7 @@ // this will throw a TokenMgrErr, which we rethrow as a ParseException String badScript = "foo=1;bar=2;a?b:c;"; try { - Script s = ScriptFactory.createScript(badScript); + ScriptFactory.createScript(badScript); fail("Parsing \"" + badScript + "\" should result in a ParseException"); } catch (ParseException pe) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]