svn commit: r1225464 - in /tomcat/trunk/java/org/apache/el: lang/ExpressionBuilder.java lang/FunctionMapperFactory.java parser/AstMethodParameters.java parser/SimpleNode.java

[markt]

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<Class<?>> paramTypes = new ArrayList<Class<?>>();
-        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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org