Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F1EA6723F for ; Thu, 29 Dec 2011 08:08:20 +0000 (UTC) Received: (qmail 5642 invoked by uid 500); 29 Dec 2011 08:07:34 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 4935 invoked by uid 500); 29 Dec 2011 08:06:56 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 4908 invoked by uid 99); 29 Dec 2011 08:06:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Dec 2011 08:06:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Dec 2011 08:06:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0667E2388A40 for ; Thu, 29 Dec 2011 08:06:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1225464 - in /tomcat/trunk/java/org/apache/el: lang/ExpressionBuilder.java lang/FunctionMapperFactory.java parser/AstMethodParameters.java parser/SimpleNode.java Date: Thu, 29 Dec 2011 08:06:24 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111229080625.0667E2388A40@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Thu Dec 29 08:06:24 2011 New Revision: 1225464 URL: http://svn.apache.org/viewvc?rev=1225464&view=rev Log: Code clean-up. Run UCDetector over o.a.el Modified: tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java tomcat/trunk/java/org/apache/el/parser/SimpleNode.java Modified: tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java?rev=1225464&r1=1225463&r2=1225464&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java (original) +++ tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java Thu Dec 29 08:06:24 2011 @@ -78,7 +78,7 @@ public final class ExpressionBuilder imp private VariableMapper varMapper; - private String expression; + private final String expression; /** * Modified: tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java?rev=1225464&r1=1225463&r2=1225464&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java (original) +++ tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java Thu Dec 29 08:06:24 2011 @@ -28,7 +28,7 @@ import javax.el.FunctionMapper; public class FunctionMapperFactory extends FunctionMapper { protected FunctionMapperImpl memento = null; - protected FunctionMapper target; + protected final FunctionMapper target; public FunctionMapperFactory(FunctionMapper mapper) { if (mapper == null) { Modified: tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java?rev=1225464&r1=1225463&r2=1225464&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java (original) +++ tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java Thu Dec 29 08:06:24 2011 @@ -37,12 +37,4 @@ public final class AstMethodParameters e } return params.toArray(new Object[params.size()]); } - - public Class[] getParameterTypes(EvaluationContext ctx) { - ArrayList> paramTypes = new ArrayList>(); - for (int i = 0; i < this.jjtGetNumChildren(); i++) { - paramTypes.add(this.jjtGetChild(i).getType(ctx)); - } - return paramTypes.toArray(new Class[paramTypes.size()]); - } } Modified: tomcat/trunk/java/org/apache/el/parser/SimpleNode.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/SimpleNode.java?rev=1225464&r1=1225463&r2=1225464&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/el/parser/SimpleNode.java (original) +++ tomcat/trunk/java/org/apache/el/parser/SimpleNode.java Thu Dec 29 08:06:24 2011 @@ -39,7 +39,7 @@ public abstract class SimpleNode extends protected Node[] children; - protected int id; + protected final int id; protected String image; @@ -105,10 +105,6 @@ public abstract class SimpleNode extends return ELParserTreeConstants.jjtNodeName[id]; } - public String toString(String prefix) { - return prefix + toString(); - } - @Override public String getImage() { return image; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org