tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r832953 [1/2] - in /tomcat/trunk/java/org/apache/jasper: compiler/ el/ runtime/ servlet/ tagplugins/jstl/ xmlparser/
Date Thu, 05 Nov 2009 01:16:55 GMT
Author: markt
Date: Thu Nov  5 01:16:53 2009
New Revision: 832953

URL: http://svn.apache.org/viewvc?rev=832953&view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48132
Patch provided by sebb

Modified:
    tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java
    tomcat/trunk/java/org/apache/jasper/compiler/Collector.java
    tomcat/trunk/java/org/apache/jasper/compiler/Dumper.java
    tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
    tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java
    tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
    tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java
    tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
    tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
    tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
    tomcat/trunk/java/org/apache/jasper/compiler/JasperTagInfo.java
    tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
    tomcat/trunk/java/org/apache/jasper/compiler/Mark.java
    tomcat/trunk/java/org/apache/jasper/compiler/Node.java
    tomcat/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
    tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
    tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
    tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
    tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
    tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
    tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
    tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
    tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java
    tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
    tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java
    tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java
    tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java
    tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
    tomcat/trunk/java/org/apache/jasper/el/ExpressionImpl.java
    tomcat/trunk/java/org/apache/jasper/el/FunctionMapperImpl.java
    tomcat/trunk/java/org/apache/jasper/el/JspMethodExpression.java
    tomcat/trunk/java/org/apache/jasper/el/JspValueExpression.java
    tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
    tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.java
    tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
    tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java
    tomcat/trunk/java/org/apache/jasper/runtime/JspFragmentHelper.java
    tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
    tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
    tomcat/trunk/java/org/apache/jasper/runtime/PerThreadTagHandlerPool.java
    tomcat/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
    tomcat/trunk/java/org/apache/jasper/runtime/ServletResponseWrapperInclude.java
    tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java
    tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
    tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/TreeNode.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/UCSReader.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/XMLString.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java Thu Nov  5 01:16:53 2009
@@ -87,11 +87,13 @@
         
         protected StringBuilder reportBuf = new StringBuilder();
         
+        @Override
         protected void printMessage(final String message,
                 final PrintStream stream,
                 final int priority) {
         }
         
+        @Override
         protected void log(String message) {
             reportBuf.append(message);
             reportBuf.append(System.getProperty("line.separator"));
@@ -110,6 +112,7 @@
     /** 
      * Compile the servlet from .java file to .class file
      */
+    @Override
     protected void generateClass(String[] smap)
         throws FileNotFoundException, JasperException, Exception {
         
@@ -384,107 +387,133 @@
         // ---------------------------------------------------- PrintStream Methods
 
 
+        @Override
         public void flush() {
             findStream().flush();
         }
 
+        @Override
         public void close() {
             findStream().close();
         }
 
+        @Override
         public boolean checkError() {
             return findStream().checkError();
         }
 
+        @Override
         protected void setError() {
             //findStream().setError();
         }
 
+        @Override
         public void write(int b) {
             findStream().write(b);
         }
 
+        @Override
         public void write(byte[] b)
             throws IOException {
             findStream().write(b);
         }
 
+        @Override
         public void write(byte[] buf, int off, int len) {
             findStream().write(buf, off, len);
         }
 
+        @Override
         public void print(boolean b) {
             findStream().print(b);
         }
 
+        @Override
         public void print(char c) {
             findStream().print(c);
         }
 
+        @Override
         public void print(int i) {
             findStream().print(i);
         }
 
+        @Override
         public void print(long l) {
             findStream().print(l);
         }
 
+        @Override
         public void print(float f) {
             findStream().print(f);
         }
 
+        @Override
         public void print(double d) {
             findStream().print(d);
         }
 
+        @Override
         public void print(char[] s) {
             findStream().print(s);
         }
 
+        @Override
         public void print(String s) {
             findStream().print(s);
         }
 
+        @Override
         public void print(Object obj) {
             findStream().print(obj);
         }
 
+        @Override
         public void println() {
             findStream().println();
         }
 
+        @Override
         public void println(boolean x) {
             findStream().println(x);
         }
 
+        @Override
         public void println(char x) {
             findStream().println(x);
         }
 
+        @Override
         public void println(int x) {
             findStream().println(x);
         }
 
+        @Override
         public void println(long x) {
             findStream().println(x);
         }
 
+        @Override
         public void println(float x) {
             findStream().println(x);
         }
 
+        @Override
         public void println(double x) {
             findStream().println(x);
         }
 
+        @Override
         public void println(char[] x) {
             findStream().println(x);
         }
 
+        @Override
         public void println(String x) {
             findStream().println(x);
         }
 
+        @Override
         public void println(Object x) {
             findStream().println(x);
         }

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Collector.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Collector.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Collector.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Collector.java Thu Nov  5 01:16:53 2009
@@ -42,6 +42,7 @@
         private boolean setPropertySeen = false;
         private boolean hasScriptingVars = false;
 
+        @Override
         public void visit(Node.ParamAction n) throws JasperException {
             if (n.getValue().isExpression()) {
                 scriptingElementSeen = true;
@@ -49,6 +50,7 @@
             paramActionSeen = true;
         }
 
+        @Override
         public void visit(Node.IncludeAction n) throws JasperException {
             if (n.getPage().isExpression()) {
                 scriptingElementSeen = true;
@@ -57,6 +59,7 @@
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.ForwardAction n) throws JasperException {
             if (n.getPage().isExpression()) {
                 scriptingElementSeen = true;
@@ -64,6 +67,7 @@
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.SetProperty n) throws JasperException {
             if (n.getValue() != null && n.getValue().isExpression()) {
                 scriptingElementSeen = true;
@@ -71,6 +75,7 @@
             setPropertySeen = true;
         }
 
+        @Override
         public void visit(Node.UseBean n) throws JasperException {
             if (n.getBeanName() != null && n.getBeanName().isExpression()) {
                 scriptingElementSeen = true;
@@ -79,6 +84,7 @@
                 visitBody(n);
         }
 
+        @Override
         public void visit(Node.PlugIn n) throws JasperException {
             if (n.getHeight() != null && n.getHeight().isExpression()) {
                 scriptingElementSeen = true;
@@ -89,6 +95,7 @@
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.CustomTag n) throws JasperException {
             // Check to see what kinds of element we see as child elements
             checkSeen( n.getChildInfo(), n );
@@ -152,6 +159,7 @@
             hasScriptingVars = hasScriptingVars || hasScriptingVarsSave;
         }
 
+        @Override
         public void visit(Node.JspElement n) throws JasperException {
             if (n.getNameAttribute().isExpression())
                 scriptingElementSeen = true;
@@ -166,22 +174,27 @@
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.JspBody n) throws JasperException {
             checkSeen( n.getChildInfo(), n );
         }
 
+        @Override
         public void visit(Node.NamedAttribute n) throws JasperException {
             checkSeen( n.getChildInfo(), n );
         }
 
+        @Override
         public void visit(Node.Declaration n) throws JasperException {
             scriptingElementSeen = true;
         }
 
+        @Override
         public void visit(Node.Expression n) throws JasperException {
             scriptingElementSeen = true;
         }
 
+        @Override
         public void visit(Node.Scriptlet n) throws JasperException {
             scriptingElementSeen = true;
         }

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Dumper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Dumper.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Dumper.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Dumper.java Thu Nov  5 01:16:53 2009
@@ -65,111 +65,132 @@
 	    }
         }
 
+        @Override
         public void visit(Node.PageDirective n) throws JasperException {
 	    printAttributes("<%@ page", n.getAttributes(), "%>");
         }
 
+        @Override
         public void visit(Node.TaglibDirective n) throws JasperException {
 	    printAttributes("<%@ taglib", n.getAttributes(), "%>");
         }
 
+        @Override
         public void visit(Node.IncludeDirective n) throws JasperException {
 	    printAttributes("<%@ include", n.getAttributes(), "%>");
 	    dumpBody(n);
         }
 
+        @Override
         public void visit(Node.Comment n) throws JasperException {
 	    printString("<%--", n.getText(), "--%>");
         }
 
+        @Override
         public void visit(Node.Declaration n) throws JasperException {
 	    printString("<%!", n.getText(), "%>");
         }
 
+        @Override
         public void visit(Node.Expression n) throws JasperException {
 	    printString("<%=", n.getText(), "%>");
         }
 
+        @Override
         public void visit(Node.Scriptlet n) throws JasperException {
 	    printString("<%", n.getText(), "%>");
         }
 
+        @Override
         public void visit(Node.IncludeAction n) throws JasperException {
 	    printAttributes("<jsp:include", n.getAttributes(), ">");
 	    dumpBody(n);
             printString("</jsp:include>");
         }
 
+        @Override
         public void visit(Node.ForwardAction n) throws JasperException {
 	    printAttributes("<jsp:forward", n.getAttributes(), ">");
 	    dumpBody(n);
 	    printString("</jsp:forward>");
         }
 
+        @Override
         public void visit(Node.GetProperty n) throws JasperException {
 	    printAttributes("<jsp:getProperty", n.getAttributes(), "/>");
         }
 
+        @Override
         public void visit(Node.SetProperty n) throws JasperException {
 	    printAttributes("<jsp:setProperty", n.getAttributes(), ">");
             dumpBody(n);
             printString("</jsp:setProperty>");
         }
 
+        @Override
         public void visit(Node.UseBean n) throws JasperException {
 	    printAttributes("<jsp:useBean", n.getAttributes(), ">");
 	    dumpBody(n);
 	    printString("</jsp:useBean>");
         }
 	
+        @Override
         public void visit(Node.PlugIn n) throws JasperException {
 	    printAttributes("<jsp:plugin", n.getAttributes(), ">");
 	    dumpBody(n);
 	    printString("</jsp:plugin>");
 	}
         
+        @Override
         public void visit(Node.ParamsAction n) throws JasperException {
 	    printAttributes("<jsp:params", n.getAttributes(), ">");
 	    dumpBody(n);
 	    printString("</jsp:params>");
         }
         
+        @Override
         public void visit(Node.ParamAction n) throws JasperException {
 	    printAttributes("<jsp:param", n.getAttributes(), ">");
 	    dumpBody(n);
 	    printString("</jsp:param>");
         }
         
+        @Override
         public void visit(Node.NamedAttribute n) throws JasperException {
 	    printAttributes("<jsp:attribute", n.getAttributes(), ">");
 	    dumpBody(n);
 	    printString("</jsp:attribute>");
         }
 
+        @Override
         public void visit(Node.JspBody n) throws JasperException {
 	    printAttributes("<jsp:body", n.getAttributes(), ">");
 	    dumpBody(n);
 	    printString("</jsp:body>");
         }
         
+        @Override
         public void visit(Node.ELExpression n) throws JasperException {
 	    printString( "${" + new String( n.getText() ) + "}" );
         }
 
+        @Override
         public void visit(Node.CustomTag n) throws JasperException {
 	    printAttributes("<" + n.getQName(), n.getAttributes(), ">");
 	    dumpBody(n);
 	    printString("</" + n.getQName() + ">");
         }
 
-	public void visit(Node.UninterpretedTag n) throws JasperException {
+	@Override
+    public void visit(Node.UninterpretedTag n) throws JasperException {
 	    String tag = n.getQName();
 	    printAttributes("<"+tag, n.getAttributes(), ">");
 	    dumpBody(n);
 	    printString("</" + tag + ">");
         }
 
-	public void visit(Node.TemplateText n) throws JasperException {
+	@Override
+    public void visit(Node.TemplateText n) throws JasperException {
 	    printString(new String(n.getText()));
 	}
 

Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java Thu Nov  5 01:16:53 2009
@@ -70,37 +70,44 @@
          */
         private HashMap<String, String> gMap = new HashMap<String, String>();
 
+        @Override
         public void visit(Node.ParamAction n) throws JasperException {
             doMap(n.getValue());
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.IncludeAction n) throws JasperException {
             doMap(n.getPage());
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.ForwardAction n) throws JasperException {
             doMap(n.getPage());
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.SetProperty n) throws JasperException {
             doMap(n.getValue());
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.UseBean n) throws JasperException {
             doMap(n.getBeanName());
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.PlugIn n) throws JasperException {
             doMap(n.getHeight());
             doMap(n.getWidth());
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.JspElement n) throws JasperException {
 
             Node.JspAttribute[] attrs = n.getJspAttributes();
@@ -111,6 +118,7 @@
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.UninterpretedTag n) throws JasperException {
 
             Node.JspAttribute[] attrs = n.getJspAttributes();
@@ -120,6 +128,7 @@
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.CustomTag n) throws JasperException {
             Node.JspAttribute[] attrs = n.getJspAttributes();
             for (int i = 0; attrs != null && i < attrs.length; i++) {
@@ -128,6 +137,7 @@
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.ELExpression n) throws JasperException {
             doMap(n.getEL());
         }
@@ -150,6 +160,7 @@
                 ArrayList<ELNode.Function> funcs =
                     new ArrayList<ELNode.Function>();
                 HashMap<String, String> keyMap = new HashMap<String, String>();
+                @Override
                 public void visit(ELNode.Function n) throws JasperException {
                     String key = n.getPrefix() + ":" + n.getName();
                     if (! keyMap.containsKey(key)) {

Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java Thu Nov  5 01:16:53 2009
@@ -52,6 +52,7 @@
         this.type = type;
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -76,6 +77,7 @@
             this.text = text;
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -97,6 +99,7 @@
             this.text = text;
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -125,6 +128,7 @@
             this.name = name;
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }

Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java Thu Nov  5 01:16:53 2009
@@ -320,6 +320,7 @@
             return 0;
         }
 
+        @Override
         public String toString() {
             return "";
         }
@@ -335,6 +336,7 @@
             this.id = id;
         }
 
+        @Override
         public String toString() {
             return id;
         }
@@ -351,10 +353,12 @@
             this.ch = ch;
         }
 
+        @Override
         char toChar() {
             return ch;
         }
 
+        @Override
         public String toString() {
             return (new Character(ch)).toString();
         }
@@ -371,6 +375,7 @@
             this.value = v;
         }
 
+        @Override
         public String toString() {
             return value;
         }

Modified: tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java Thu Nov  5 01:16:53 2009
@@ -594,7 +594,8 @@
 	    this.lineNum = lineNum;
 	}
 
-	public void doVisit(Node n) throws JasperException {
+	@Override
+    public void doVisit(Node n) throws JasperException {
 	    if ((lineNum >= n.getBeginJavaLine())
 		    && (lineNum < n.getEndJavaLine())) {
 		found = n;

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Thu Nov  5 01:16:53 2009
@@ -195,6 +195,7 @@
              * contains more than one page directive with an 'info' attribute,
              * their values match.
              */
+            @Override
             public void visit(Node.PageDirective n) throws JasperException {
 
                 if (getServletInfoGenerated) {
@@ -216,6 +217,7 @@
                 out.println();
             }
 
+            @Override
             public void visit(Node.Declaration n) throws JasperException {
                 n.setBeginJavaLine(out.getJavaLine());
                 out.printMultiLn(new String(n.getText()));
@@ -224,6 +226,7 @@
             }
 
             // Custom Tags may contain declarations from tag plugins.
+            @Override
             public void visit(Node.CustomTag n) throws JasperException {
                 if (n.useTagPlugin()) {
                     if (n.getAtSTag() != null) {
@@ -267,6 +270,7 @@
              * and adds it to the list of tag handler pool names unless it is
              * already contained in it.
              */
+            @Override
             public void visit(Node.CustomTag n) throws JasperException {
 
                 if (!n.implementsSimpleTag()) {
@@ -332,6 +336,7 @@
                 vars = new Vector<String>();
             }
 
+            @Override
             public void visit(Node.CustomTag n) throws JasperException {
 
                 if (n.getCustomNestingLevel() > 0) {
@@ -905,6 +910,7 @@
                     this.separator = separator;
                 }
 
+                @Override
                 public void visit(Node.ParamAction n) throws JasperException {
 
                     out.print(" + ");
@@ -932,6 +938,7 @@
             }
         }
 
+        @Override
         public void visit(Node.Expression n) throws JasperException {
             n.setBeginJavaLine(out.getJavaLine());
             out.printin("out.print(");
@@ -940,6 +947,7 @@
             n.setEndJavaLine(out.getJavaLine());
         }
 
+        @Override
         public void visit(Node.Scriptlet n) throws JasperException {
             n.setBeginJavaLine(out.getJavaLine());
             out.printMultiLn(n.getText());
@@ -947,6 +955,7 @@
             n.setEndJavaLine(out.getJavaLine());
         }
 
+        @Override
         public void visit(Node.ELExpression n) throws JasperException {
             n.setBeginJavaLine(out.getJavaLine());
             if (!pageInfo.isELIgnored() && (n.getEL() != null)) {
@@ -961,6 +970,7 @@
             n.setEndJavaLine(out.getJavaLine());
         }
 
+        @Override
         public void visit(Node.IncludeAction n) throws JasperException {
 
             String flush = n.getTextAttribute("flush");
@@ -1050,6 +1060,7 @@
             return result;
         }
 
+        @Override
         public void visit(Node.ForwardAction n) throws JasperException {
             Node.JspAttribute page = n.getPage();
 
@@ -1094,6 +1105,7 @@
             // XXX Not sure if we can eliminate dead codes after this.
         }
 
+        @Override
         public void visit(Node.GetProperty n) throws JasperException {
             String name = n.getTextAttribute("name");
             String property = n.getTextAttribute("property");
@@ -1139,6 +1151,7 @@
             n.setEndJavaLine(out.getJavaLine());
         }
 
+        @Override
         public void visit(Node.SetProperty n) throws JasperException {
             String name = n.getTextAttribute("name");
             String property = n.getTextAttribute("property");
@@ -1229,6 +1242,7 @@
             n.setEndJavaLine(out.getJavaLine());
         }
 
+        @Override
         public void visit(Node.UseBean n) throws JasperException {
 
             String name = n.getTextAttribute("id");
@@ -1426,6 +1440,7 @@
             return " " + attr + "=\"" + value + '\"';
         }
 
+        @Override
         public void visit(Node.PlugIn n) throws JasperException {
 
             /**
@@ -1439,6 +1454,7 @@
                     this.ie = ie;
                 }
 
+                @Override
                 public void visit(Node.ParamAction n) throws JasperException {
 
                     String name = n.getTextAttribute("name");
@@ -1654,10 +1670,12 @@
             n.setEndJavaLine(out.getJavaLine());
         }
 
+        @Override
         public void visit(Node.NamedAttribute n) throws JasperException {
             // Don't visit body of this tag - we already did earlier.
         }
 
+        @Override
         public void visit(Node.CustomTag n) throws JasperException {
 
             // Use plugin to generate more efficient code if there is one.
@@ -1813,6 +1831,7 @@
 
         private static final String DOUBLE_QUOTE = "\\\"";
 
+        @Override
         public void visit(Node.UninterpretedTag n) throws JasperException {
 
             n.setBeginJavaLine(out.getJavaLine());
@@ -1871,6 +1890,7 @@
             n.setEndJavaLine(out.getJavaLine());
         }
 
+        @Override
         public void visit(Node.JspElement n) throws JasperException {
 
             n.setBeginJavaLine(out.getJavaLine());
@@ -1938,6 +1958,7 @@
             }
         }
 
+        @Override
         public void visit(Node.TemplateText n) throws JasperException {
 
             String text = n.getText();
@@ -2046,6 +2067,7 @@
             n.setEndJavaLine(out.getJavaLine());
         }
 
+        @Override
         public void visit(Node.JspBody n) throws JasperException {
             if (n.getBody() != null) {
                 if (isSimpleTagHandler) {
@@ -2059,6 +2081,7 @@
             }
         }
 
+        @Override
         public void visit(Node.InvokeAction n) throws JasperException {
 
             n.setBeginJavaLine(out.getJavaLine());
@@ -2108,6 +2131,7 @@
             n.setEndJavaLine(out.getJavaLine());
         }
 
+        @Override
         public void visit(Node.DoBodyAction n) throws JasperException {
 
             n.setBeginJavaLine(out.getJavaLine());
@@ -2154,6 +2178,7 @@
             n.setEndJavaLine(out.getJavaLine());
         }
 
+        @Override
         public void visit(Node.AttributeGenerator n) throws JasperException {
             Node.CustomTag tag = n.getTag();
             Node.JspAttribute[] attrs = tag.getJspAttributes();
@@ -3958,6 +3983,7 @@
             return out;
         }
 
+        @Override
         public String toString() {
             return charWriter.toString();
         }
@@ -3977,10 +4003,12 @@
                 try {
                     body.visit(new Node.Visitor() {
 
+                        @Override
                         public void doVisit(Node n) {
                             adjustJavaLine(n, offset);
                         }
 
+                        @Override
                         public void visit(Node.CustomTag n)
                                 throws JasperException {
                             Node.Nodes b = n.getBody();
@@ -4192,6 +4220,7 @@
             out.popIndent();
         }
 
+        @Override
         public String toString() {
             return classBuffer.toString();
         }

Modified: tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java Thu Nov  5 01:16:53 2009
@@ -180,6 +180,7 @@
      * @return The TagFileInfo corresponding to the given tag name, or null if
      * the given tag name is not implemented as a tag file
      */
+    @Override
     public TagFileInfo getTagFile(String shortName) {
 
         TagFileInfo tagFile = super.getTagFile(shortName);
@@ -210,6 +211,7 @@
         return tagFile;
     }
 
+    @Override
     public TagLibraryInfo[] getTagLibraryInfos() {
         Collection<TagLibraryInfo> coll = pi.getTaglibs();
         return coll.toArray(new TagLibraryInfo[0]);

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Thu Nov  5 01:16:53 2009
@@ -64,6 +64,7 @@
     /** 
      * Compile the servlet from .java file to .class file
      */
+    @Override
     protected void generateClass(String[] smap)
         throws FileNotFoundException, JasperException, Exception {
 

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JasperTagInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JasperTagInfo.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JasperTagInfo.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JasperTagInfo.java Thu Nov  5 01:16:53 2009
@@ -52,6 +52,7 @@
 	return dynamicAttrsMapName;
     }
 
+    @Override
     public boolean hasDynamicAttributes() {
         return dynamicAttrsMapName != null;
     }

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java Thu Nov  5 01:16:53 2009
@@ -257,6 +257,7 @@
      * corresponding TagLibraryInfo object is added to the set of custom
      * tag libraries.
      */
+    @Override
     public void startElement(
         String uri,
         String localName,
@@ -451,6 +452,7 @@
      *
      * @throws SAXException
      */
+    @Override
     public void characters(char[] buf, int offset, int len) {
 
         if (charBuffer == null) {
@@ -607,6 +609,7 @@
     /*
      * Receives notification of the end of an element.
      */
+    @Override
     public void endElement(String uri, String localName, String qName)
         throws SAXException {
 
@@ -671,6 +674,7 @@
      *
      * @param locator the document locator
      */
+    @Override
     public void setDocumentLocator(Locator locator) {
         this.locator = locator;
     }
@@ -747,6 +751,7 @@
     /*
      * Receives notification of a non-recoverable error.
      */
+    @Override
     public void fatalError(SAXParseException e) throws SAXException {
         throw e;
     }
@@ -754,6 +759,7 @@
     /*
      * Receives notification of a recoverable error.
      */
+    @Override
     public void error(SAXParseException e) throws SAXException {
         throw e;
     }
@@ -761,6 +767,7 @@
     /*
      * Receives notification of the start of a Namespace mapping. 
      */
+    @Override
     public void startPrefixMapping(String prefix, String uri)
         throws SAXException {
         TagLibraryInfo taglibInfo;
@@ -791,6 +798,7 @@
     /*
      * Receives notification of the end of a Namespace mapping. 
      */
+    @Override
     public void endPrefixMapping(String prefix) throws SAXException {
 
         if (directivesOnly) {

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Mark.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Mark.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Mark.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Mark.java Thu Nov  5 01:16:53 2009
@@ -200,6 +200,7 @@
         return null;
     }
 
+    @Override
     public String toString() {
 	return getFile()+"("+line+","+col+")";
     }
@@ -219,6 +220,7 @@
         return ctxt.getResource(getFile());
     }
 
+    @Override
     public boolean equals(Object other) {
 	if (other instanceof Mark) {
 	    Mark m = (Mark) other;

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Node.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Node.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Node.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Node.java Thu Nov  5 01:16:53 2009
@@ -470,6 +470,7 @@
             parentRoot = (Node.Root) r;
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -559,6 +560,7 @@
                     start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -583,6 +585,7 @@
             imports = new Vector<String>();
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -631,6 +634,7 @@
                     taglibAttrs, start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -646,6 +650,7 @@
                     start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -669,6 +674,7 @@
             imports = new Vector<String>();
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -718,6 +724,7 @@
                     nonTaglibXmlnsAttrs, taglibAttrs, start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -740,6 +747,7 @@
                     taglibAttrs, start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -761,6 +769,7 @@
                     taglibAttrs, start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -782,6 +791,7 @@
                     taglibAttrs, start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -796,6 +806,7 @@
             super(null, null, text, start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -826,6 +837,7 @@
          * 
          * @return The text string
          */
+        @Override
         public String getText() {
             String ret = text;
             if (ret == null) {
@@ -847,6 +859,7 @@
          * For the same reason as above, the source line information in the
          * contained TemplateText node should be used.
          */
+        @Override
         public Mark getStart() {
             if (text == null && body != null && body.size() > 0) {
                 return body.getNode(0).getStart();
@@ -872,6 +885,7 @@
                     start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -893,6 +907,7 @@
                     start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -913,6 +928,7 @@
                     start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -933,6 +949,7 @@
             this.type = type;
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -968,6 +985,7 @@
                     start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -996,6 +1014,7 @@
                     start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -1016,6 +1035,7 @@
                     taglibAttrs, start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -1039,6 +1059,7 @@
                     taglibAttrs, start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -1070,6 +1091,7 @@
                     taglibAttrs, start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -1099,6 +1121,7 @@
                     taglibAttrs, start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -1122,6 +1145,7 @@
                     taglibAttrs, start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -1153,6 +1177,7 @@
                     taglibAttrs, start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -1186,6 +1211,7 @@
                     taglibAttrs, start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -1221,6 +1247,7 @@
                     start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -1254,6 +1281,7 @@
                     taglibAttrs, start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -1293,6 +1321,7 @@
                     taglibAttrs, start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -1505,6 +1534,7 @@
             this.implementsDynamicAttributes = tagInfo.hasDynamicAttributes();
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -1792,6 +1822,7 @@
             this.tag = tag;
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -1816,6 +1847,7 @@
                     start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -1867,6 +1899,7 @@
             }
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -1875,6 +1908,7 @@
             return this.name;
         }
 
+        @Override
         public String getLocalName() {
             return this.localName;
         }
@@ -1907,11 +1941,13 @@
          * Since this method is only for attributes that are not rtexpr, we can
          * assume the body of the jsp:attribute is a template text.
          */
+        @Override
         public String getText() {
 
             class AttributeVisitor extends Visitor {
                 String attrValue = null;
 
+                @Override
                 public void visit(TemplateText txt) {
                     attrValue = new String(txt.getText());
                 }
@@ -1956,6 +1992,7 @@
             this.childInfo = new ChildInfo();
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }
@@ -1976,6 +2013,7 @@
             super(null, null, text, start, parent);
         }
 
+        @Override
         public void accept(Visitor v) throws JasperException {
             v.visit(this);
         }

Modified: tomcat/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/PageDataImpl.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/PageDataImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/PageDataImpl.java Thu Nov  5 01:16:53 2009
@@ -81,6 +81,7 @@
      *
      * @return the input stream of the XML view
      */
+    @Override
     public InputStream getInputStream() {
 	// Turn StringBuilder into InputStream
         try {
@@ -123,7 +124,8 @@
 	    this.jspIdPrefix = "jsp";
 	}
 
-	public void visit(Node.Root n) throws JasperException {
+	@Override
+    public void visit(Node.Root n) throws JasperException {
 	    visitBody(n);
 	    if (n == root) {
 		/*
@@ -159,7 +161,8 @@
 	    }
 	}
 
-	public void visit(Node.JspRoot n) throws JasperException {
+	@Override
+    public void visit(Node.JspRoot n) throws JasperException {
 	    addAttributes(n.getTaglibAttributes());
             addAttributes(n.getNonTaglibXmlnsAttributes());
 	    addAttributes(n.getAttributes());
@@ -171,7 +174,8 @@
 	 * Converts taglib directive into "xmlns:..." attribute of jsp:root
 	 * element.
 	 */
-	public void visit(Node.TaglibDirective n) throws JasperException {
+	@Override
+    public void visit(Node.TaglibDirective n) throws JasperException {
 	    Attributes attrs = n.getAttributes();
 	    if (attrs != null) {
 		String qName = "xmlns:" + attrs.getValue("prefix");
@@ -256,7 +260,8 @@
 	/*
 	 * Visits root node.
 	 */
-	public void visit(Node.Root n) throws JasperException {
+	@Override
+    public void visit(Node.Root n) throws JasperException {
 	    if (n == this.root) {
 		// top-level page
 		appendXmlProlog();
@@ -277,40 +282,49 @@
 	 * Any nested jsp:root elements (from pages included via an
 	 * include directive) are ignored.
 	 */
-	public void visit(Node.JspRoot n) throws JasperException {
+	@Override
+    public void visit(Node.JspRoot n) throws JasperException {
 	    visitBody(n);
 	}
 
-	public void visit(Node.PageDirective n) throws JasperException {
+	@Override
+    public void visit(Node.PageDirective n) throws JasperException {
 	    appendPageDirective(n);
 	}
 
-	public void visit(Node.IncludeDirective n) throws JasperException {
+	@Override
+    public void visit(Node.IncludeDirective n) throws JasperException {
 	    // expand in place
 	    visitBody(n);
 	}
 
-	public void visit(Node.Comment n) throws JasperException {
+	@Override
+    public void visit(Node.Comment n) throws JasperException {
 	    // Comments are ignored in XML view
 	}
 
-	public void visit(Node.Declaration n) throws JasperException {
+	@Override
+    public void visit(Node.Declaration n) throws JasperException {
 	    appendTag(n);
 	}
 
-	public void visit(Node.Expression n) throws JasperException {
+	@Override
+    public void visit(Node.Expression n) throws JasperException {
 	    appendTag(n);
 	}
 
-	public void visit(Node.Scriptlet n) throws JasperException {
+	@Override
+    public void visit(Node.Scriptlet n) throws JasperException {
 	    appendTag(n);
 	}
 
-	public void visit(Node.JspElement n) throws JasperException {
+	@Override
+    public void visit(Node.JspElement n) throws JasperException {
 	    appendTag(n);
 	}
 
-	public void visit(Node.ELExpression n) throws JasperException {
+	@Override
+    public void visit(Node.ELExpression n) throws JasperException {
 	    if (!n.getRoot().isXmlSyntax()) {
 		buf.append("<").append(JSP_TEXT_ACTION);
 		buf.append(" ");
@@ -327,87 +341,107 @@
 	    buf.append("\n");
 	}
 
-	public void visit(Node.IncludeAction n) throws JasperException {
+	@Override
+    public void visit(Node.IncludeAction n) throws JasperException {
 	    appendTag(n);
 	}
     
-	public void visit(Node.ForwardAction n) throws JasperException {
+	@Override
+    public void visit(Node.ForwardAction n) throws JasperException {
 	    appendTag(n);
 	}
 
-	public void visit(Node.GetProperty n) throws JasperException {
+	@Override
+    public void visit(Node.GetProperty n) throws JasperException {
 	    appendTag(n);
 	}
 
-	public void visit(Node.SetProperty n) throws JasperException {
+	@Override
+    public void visit(Node.SetProperty n) throws JasperException {
 	    appendTag(n);
 	}
 
-	public void visit(Node.ParamAction n) throws JasperException {
+	@Override
+    public void visit(Node.ParamAction n) throws JasperException {
 	    appendTag(n);
 	}
 
-	public void visit(Node.ParamsAction n) throws JasperException {
+	@Override
+    public void visit(Node.ParamsAction n) throws JasperException {
 	    appendTag(n);
 	}
 
-	public void visit(Node.FallBackAction n) throws JasperException {
+	@Override
+    public void visit(Node.FallBackAction n) throws JasperException {
 	    appendTag(n);
 	}
 
-	public void visit(Node.UseBean n) throws JasperException {
+	@Override
+    public void visit(Node.UseBean n) throws JasperException {
 	    appendTag(n);
 	}
 	
-	public void visit(Node.PlugIn n) throws JasperException {
+	@Override
+    public void visit(Node.PlugIn n) throws JasperException {
 	    appendTag(n);
 	}
 
+        @Override
         public void visit(Node.NamedAttribute n) throws JasperException {
             appendTag(n);
         }
         
+        @Override
         public void visit(Node.JspBody n) throws JasperException {
             appendTag(n);
         }
 
-	public void visit(Node.CustomTag n) throws JasperException {
+	@Override
+    public void visit(Node.CustomTag n) throws JasperException {
 	    boolean resetDefaultNSSave = resetDefaultNS;
 	    appendTag(n, resetDefaultNS);
 	    resetDefaultNS = resetDefaultNSSave;
 	}
 
-	public void visit(Node.UninterpretedTag n) throws JasperException {
+	@Override
+    public void visit(Node.UninterpretedTag n) throws JasperException {
 	    boolean resetDefaultNSSave = resetDefaultNS;
 	    appendTag(n, resetDefaultNS);
 	    resetDefaultNS = resetDefaultNSSave;
 	}
 
-	public void visit(Node.JspText n) throws JasperException {
+	@Override
+    public void visit(Node.JspText n) throws JasperException {
 	    appendTag(n);
 	}
 
-	public void visit(Node.DoBodyAction n) throws JasperException {
+	@Override
+    public void visit(Node.DoBodyAction n) throws JasperException {
 	    appendTag(n);
 	}
 
+        @Override
         public void visit(Node.InvokeAction n) throws JasperException {
 	    appendTag(n);
 	}
 
-	public void visit(Node.TagDirective n) throws JasperException {
+	@Override
+    public void visit(Node.TagDirective n) throws JasperException {
 	    appendTagDirective(n);
 	}
 
-	public void visit(Node.AttributeDirective n) throws JasperException {
+	@Override
+    public void visit(Node.AttributeDirective n) throws JasperException {
 	    appendTag(n);
 	}
 
-	public void visit(Node.VariableDirective n) throws JasperException {
+	@Override
+    public void visit(Node.VariableDirective n) throws JasperException {
 	    appendTag(n);
 	}
         
-	public void visit(Node.TemplateText n) throws JasperException {
+	@Override
+    public void visit(Node.TemplateText n) throws JasperException {
 	    /*
 	     * If the template text came from a JSP page written in JSP syntax,
 	     * create a jsp:text element for it (JSP 5.3.2).

Modified: tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java Thu Nov  5 01:16:53 2009
@@ -41,7 +41,8 @@
 	private int count;
 	private Node.CustomTag parent;
 
-	public void visit(Node.CustomTag n) throws JasperException {
+	@Override
+    public void visit(Node.CustomTag n) throws JasperException {
 	    n.setCustomTagParent(parent);
 	    Node.CustomTag tmpParent = parent;
 	    parent = n;
@@ -65,7 +66,8 @@
 	    scriptVars = new Hashtable<String,Integer>();
 	}
 
-	public void visit(Node.CustomTag n) throws JasperException {
+	@Override
+    public void visit(Node.CustomTag n) throws JasperException {
 	    setScriptingVars(n, VariableInfo.AT_BEGIN);
 	    setScriptingVars(n, VariableInfo.NESTED);
 	    new ScriptingVariableVisitor(err).visitBody(n);

Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java Thu Nov  5 01:16:53 2009
@@ -139,6 +139,7 @@
 	return out.toString();
     }
 
+    @Override
     public String toString() { return getString(); }
 
     //*********************************************************************

Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java Thu Nov  5 01:16:53 2009
@@ -106,6 +106,7 @@
             return out.toString();
         }
 
+        @Override
         public String toString() {
             return getString();
         }
@@ -329,6 +330,7 @@
         return out.toString();
     }
 
+    @Override
     public String toString() {
         return getString();
     }

Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java Thu Nov  5 01:16:53 2009
@@ -503,6 +503,7 @@
             this.innerClassMap = map;
         }
 
+        @Override
         public void visitBody(Node n) throws JasperException {
             SmapStratum smapSave = smap;
             String innerClass = n.getInnerClassName();
@@ -513,91 +514,110 @@
             smap = smapSave;
         }
 
+        @Override
         public void visit(Node.Declaration n) throws JasperException {
             doSmapText(n);
         }
 
+        @Override
         public void visit(Node.Expression n) throws JasperException {
             doSmapText(n);
         }
 
+        @Override
         public void visit(Node.Scriptlet n) throws JasperException {
             doSmapText(n);
         }
 
+        @Override
         public void visit(Node.IncludeAction n) throws JasperException {
             doSmap(n);
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.ForwardAction n) throws JasperException {
             doSmap(n);
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.GetProperty n) throws JasperException {
             doSmap(n);
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.SetProperty n) throws JasperException {
             doSmap(n);
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.UseBean n) throws JasperException {
             doSmap(n);
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.PlugIn n) throws JasperException {
             doSmap(n);
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.CustomTag n) throws JasperException {
             doSmap(n);
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.UninterpretedTag n) throws JasperException {
             doSmap(n);
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.JspElement n) throws JasperException {
             doSmap(n);
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.JspText n) throws JasperException {
             doSmap(n);
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.NamedAttribute n) throws JasperException {
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.JspBody n) throws JasperException {
             doSmap(n);
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.InvokeAction n) throws JasperException {
             doSmap(n);
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.DoBodyAction n) throws JasperException {
             doSmap(n);
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.ELExpression n) throws JasperException {
             doSmap(n);
         }
 
+        @Override
         public void visit(Node.TemplateText n) throws JasperException {
             Mark mark = n.getStart();
             if (mark == null) {
@@ -702,6 +722,7 @@
 
         HashMap<String, SmapStratum> map = new HashMap<String, SmapStratum>();
 
+        @Override
         public void doVisit(Node n) {
             String inner = n.getInnerClassName();
             if (inner != null && !map.containsKey(inner)) {

Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java Thu Nov  5 01:16:53 2009
@@ -146,6 +146,7 @@
             variableVector = new Vector<TagVariableInfo>();
         }
 
+        @Override
         public void visit(Node.TagDirective n) throws JasperException {
 
             JspUtil.checkAttributes("Tag directive", n, tagDirectiveAttrs, err);
@@ -188,6 +189,7 @@
             return result;
         }
 
+        @Override
         public void visit(Node.AttributeDirective n) throws JasperException {
 
             JspUtil.checkAttributes("Attribute directive", n,
@@ -287,6 +289,7 @@
             checkUniqueName(attrName, ATTR_NAME, n, tagAttributeInfo);
         }
 
+        @Override
         public void visit(Node.VariableDirective n) throws JasperException {
 
             JspUtil.checkAttributes("Variable directive", n,
@@ -637,6 +640,7 @@
             this.pageInfo = compiler.getPageInfo();
         }
 
+        @Override
         public void visit(Node.CustomTag n) throws JasperException {
             TagFileInfo tagFileInfo = n.getTagFileInfo();
             if (tagFileInfo != null) {

Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Thu Nov  5 01:16:53 2009
@@ -83,6 +83,7 @@
         }
     }
 
+    @Override
     public String toString() {
         StringWriter sw = new StringWriter();
         PrintWriter out = new PrintWriter(sw);
@@ -205,6 +206,7 @@
 
     }
 
+    @Override
     public TagLibraryInfo[] getTagLibraryInfos() {
         Collection<TagLibraryInfo> coll = pi.getTaglibs();
         return coll.toArray(new TagLibraryInfo[0]);

Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java Thu Nov  5 01:16:53 2009
@@ -57,6 +57,7 @@
 	this.pageInfo = pageInfo;
 
         page.visit(new Node.Visitor() {
+            @Override
             public void visit(Node.CustomTag n)
                     throws JasperException {
                 invokePlugin(n);

Modified: tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java Thu Nov  5 01:16:53 2009
@@ -40,6 +40,7 @@
             pageInfo = compiler.getPageInfo();
         }
 
+        @Override
         public void doVisit(Node n) throws JasperException {
             collectText();
         }
@@ -48,29 +49,36 @@
          * The following directis are ignored in text concatenation
          */
 
+        @Override
         public void visit(Node.PageDirective n) throws JasperException {
         }
 
+        @Override
         public void visit(Node.TagDirective n) throws JasperException {
         }
 
+        @Override
         public void visit(Node.TaglibDirective n) throws JasperException {
         }
 
+        @Override
         public void visit(Node.AttributeDirective n) throws JasperException {
         }
 
+        @Override
         public void visit(Node.VariableDirective n) throws JasperException {
         }
 
         /*
          * Don't concatenate text across body boundaries
          */
+        @Override
         public void visitBody(Node n) throws JasperException {
             super.visitBody(n);
             collectText();
         }
 
+        @Override
         public void visit(Node.TemplateText n) throws JasperException {
             if ((options.getTrimSpaces() || pageInfo.isTrimDirectiveWhitespaces()) 
                     && n.isAllSpace()) {

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Thu Nov  5 01:16:53 2009
@@ -90,6 +90,7 @@
             this.err = compiler.getErrorDispatcher();
         }
 
+        @Override
         public void visit(Node.IncludeDirective n) throws JasperException {
             // Since pageDirectiveSeen flag only applies to the Current page
             // save it here and restore it after the file is included.
@@ -99,6 +100,7 @@
             pageEncodingSeen = pageEncodingSeenSave;
         }
 
+        @Override
         public void visit(Node.PageDirective n) throws JasperException {
 
             JspUtil.checkAttributes("Page directive", n, pageDirectiveAttrs,
@@ -233,6 +235,7 @@
             pageInfo.addImports(n.getImports());
         }
 
+        @Override
         public void visit(Node.TagDirective n) throws JasperException {
             // Note: Most of the validation is done in TagFileProcessor
             // when it created a TagInfo object from the
@@ -300,12 +303,14 @@
             pageInfo.addImports(n.getImports());
         }
 
+        @Override
         public void visit(Node.AttributeDirective n) throws JasperException {
             // Do nothing, since this attribute directive has already been
             // validated by TagFileProcessor when it created a TagInfo object
             // from the tag file in which the directive appeared
         }
 
+        @Override
         public void visit(Node.VariableDirective n) throws JasperException {
             // Do nothing, since this variable directive has already been
             // validated by TagFileProcessor when it created a TagInfo object
@@ -506,6 +511,7 @@
             this.loader = compiler.getCompilationContext().getClassLoader();
         }
 
+        @Override
         public void visit(Node.JspRoot n) throws JasperException {
             JspUtil.checkAttributes("Jsp:root", n, jspRootAttrs, err);
             String version = n.getTextAttribute("version");
@@ -515,12 +521,14 @@
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.IncludeDirective n) throws JasperException {
             JspUtil.checkAttributes("Include directive", n,
                     includeDirectiveAttrs, err);
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.TaglibDirective n) throws JasperException {
             JspUtil.checkAttributes("Taglib directive", n,
                     taglibDirectiveAttrs, err);
@@ -537,6 +545,7 @@
             }
         }
 
+        @Override
         public void visit(Node.ParamAction n) throws JasperException {
             JspUtil.checkAttributes("Param action", n, paramActionAttrs, err);
             // make sure the value of the 'name' attribute is not a
@@ -547,6 +556,7 @@
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.ParamsAction n) throws JasperException {
             // Make sure we've got at least one nested jsp:param
             Node.Nodes subElems = n.getBody();
@@ -556,6 +566,7 @@
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.IncludeAction n) throws JasperException {
             JspUtil.checkAttributes("Include action", n, includeActionAttrs,
                     err);
@@ -564,6 +575,7 @@
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.ForwardAction n) throws JasperException {
             JspUtil.checkAttributes("Forward", n, forwardActionAttrs, err);
             n.setPage(getJspAttribute(null, "page", null, null, n
@@ -571,10 +583,12 @@
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.GetProperty n) throws JasperException {
             JspUtil.checkAttributes("GetProperty", n, getPropertyAttrs, err);
         }
 
+        @Override
         public void visit(Node.SetProperty n) throws JasperException {
             JspUtil.checkAttributes("SetProperty", n, setPropertyAttrs, err);
             String property = n.getTextAttribute("property");
@@ -597,6 +611,7 @@
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.UseBean n) throws JasperException {
             JspUtil.checkAttributes("UseBean", n, useBeanAttrs, err);
 
@@ -630,6 +645,7 @@
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.PlugIn n) throws JasperException {
             JspUtil.checkAttributes("Plugin", n, plugInAttrs, err);
 
@@ -664,33 +680,39 @@
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.NamedAttribute n) throws JasperException {
             JspUtil.checkAttributes("Attribute", n, attributeAttrs, err);
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.JspBody n) throws JasperException {
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.Declaration n) throws JasperException {
             if (pageInfo.isScriptingInvalid()) {
                 err.jspError(n.getStart(), "jsp.error.no.scriptlets");
             }
         }
 
+        @Override
         public void visit(Node.Expression n) throws JasperException {
             if (pageInfo.isScriptingInvalid()) {
                 err.jspError(n.getStart(), "jsp.error.no.scriptlets");
             }
         }
 
+        @Override
         public void visit(Node.Scriptlet n) throws JasperException {
             if (pageInfo.isScriptingInvalid()) {
                 err.jspError(n.getStart(), "jsp.error.no.scriptlets");
             }
         }
 
+        @Override
         public void visit(Node.ELExpression n) throws JasperException {
             // exit if we are ignoring EL all together
             if (pageInfo.isELIgnored())
@@ -721,6 +743,7 @@
             n.setEL(el);
         }
 
+        @Override
         public void visit(Node.UninterpretedTag n) throws JasperException {
             if (n.getNamedAttributeNodes().size() != 0) {
                 err.jspError(n, "jsp.error.namedAttribute.invalidUse");
@@ -773,6 +796,7 @@
             return false;
         }
 
+        @Override
         public void visit(Node.CustomTag n) throws JasperException {
 
             TagInfo tagInfo = n.getTagInfo();
@@ -863,6 +887,7 @@
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.JspElement n) throws JasperException {
 
             Attributes attrs = n.getAttributes();
@@ -911,6 +936,7 @@
             visitBody(n);
         }
 
+        @Override
         public void visit(Node.JspOutput n) throws JasperException {
             JspUtil.checkAttributes("jsp:output", n, jspOutputAttrs, err);
 
@@ -975,6 +1001,7 @@
             }
         }
 
+        @Override
         public void visit(Node.InvokeAction n) throws JasperException {
 
             JspUtil.checkAttributes("Invoke", n, invokeAttrs, err);
@@ -992,6 +1019,7 @@
             }
         }
 
+        @Override
         public void visit(Node.DoBodyAction n) throws JasperException {
 
             JspUtil.checkAttributes("DoBody", n, doBodyAttrs, err);
@@ -1418,6 +1446,7 @@
         private static class NamedAttributeVisitor extends Node.Visitor {
             private boolean hasDynamicContent;
 
+            @Override
             public void doVisit(Node n) throws JasperException {
                 if (!(n instanceof Node.JspText)
                         && !(n instanceof Node.TemplateText)) {
@@ -1468,6 +1497,7 @@
                     this.n = n;
                 }
 
+                @Override
                 public void visit(ELNode.Function func) throws JasperException {
                     String prefix = func.getPrefix();
                     String function = func.getName();
@@ -1599,6 +1629,7 @@
                     fnmap.put(fnQName, method);
                 }
 
+                @Override
                 public Method resolveFunction(String prefix, String localName) {
                     return this.fnmap.get(prefix + ":" + localName);
                 }
@@ -1611,6 +1642,7 @@
                     this.fmapper = fmapper;
                 }
 
+                @Override
                 public void visit(ELNode.Function n) throws JasperException {
 
                     Class<?> c = null;
@@ -1666,6 +1698,7 @@
             this.err = compiler.getErrorDispatcher();
         }
 
+        @Override
         public void visit(Node.CustomTag n) throws JasperException {
             TagInfo tagInfo = n.getTagInfo();
             if (tagInfo == null) {

Modified: tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java Thu Nov  5 01:16:53 2009
@@ -36,6 +36,7 @@
 public final class ELContextImpl extends ELContext {
 
     private final static FunctionMapper NullFunctionMapper = new FunctionMapper() {
+        @Override
         public Method resolveFunction(String prefix, String localName) {
             return null;
         }
@@ -45,6 +46,7 @@
 
         private Map<String, ValueExpression> vars;
 
+        @Override
         public ValueExpression resolveVariable(String variable) {
             if (vars == null) {
                 return null;
@@ -52,6 +54,7 @@
             return vars.get(variable);
         }
 
+        @Override
         public ValueExpression setVariable(String variable,
                 ValueExpression expression) {
             if (vars == null)
@@ -71,6 +74,7 @@
         this(ELResolverImpl.getDefaultResolver());
         if (Constants.IS_SECURITY_ENABLED) {
             functionMapper = new FunctionMapper() {
+                @Override
                 public Method resolveFunction(String prefix, String localName) {
                     return null;
                 }
@@ -84,14 +88,17 @@
         this.resolver = resolver;
     }
 
+    @Override
     public ELResolver getELResolver() {
         return this.resolver;
     }
 
+    @Override
     public FunctionMapper getFunctionMapper() {
         return this.functionMapper;
     }
 
+    @Override
     public VariableMapper getVariableMapper() {
         if (this.variableMapper == null) {
             this.variableMapper = new VariableMapperImpl();

Modified: tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java Thu Nov  5 01:16:53 2009
@@ -38,39 +38,48 @@
         this.fnMapper = fnMapper;
     }
 
+    @Override
     public ELResolver getELResolver() {
         return this.target.getELResolver();
     }
 
+    @Override
     public FunctionMapper getFunctionMapper() {
         if (this.fnMapper != null) return this.fnMapper;
         return this.target.getFunctionMapper();
     }
 
+    @Override
     public VariableMapper getVariableMapper() {
         return this.target.getVariableMapper();
     }
 
+    @Override
     public Object getContext(Class key) {
         return this.target.getContext(key);
     }
 
+    @Override
     public Locale getLocale() {
         return this.target.getLocale();
     }
 
+    @Override
     public boolean isPropertyResolved() {
         return this.target.isPropertyResolved();
     }
 
+    @Override
     public void putContext(Class key, Object contextObject) throws NullPointerException {
         this.target.putContext(key, contextObject);
     }
 
+    @Override
     public void setLocale(Locale locale) {
         this.target.setLocale(locale);
     }
 
+    @Override
     public void setPropertyResolved(boolean resolved) {
         this.target.setPropertyResolved(resolved);
     }

Modified: tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java Thu Nov  5 01:16:53 2009
@@ -51,7 +51,8 @@
 		this.variableResolver = variableResolver;
 	}
 
-	public Object getValue(ELContext context, Object base, Object property)
+	@Override
+    public Object getValue(ELContext context, Object base, Object property)
 			throws NullPointerException, PropertyNotFoundException, ELException {
 		if (context == null) {
 			throw new NullPointerException();
@@ -75,7 +76,8 @@
 		return null;
 	}
 
-	public Class<?> getType(ELContext context, Object base, Object property)
+	@Override
+    public Class<?> getType(ELContext context, Object base, Object property)
 			throws NullPointerException, PropertyNotFoundException, ELException {
 		if (context == null) {
 			throw new NullPointerException();
@@ -100,7 +102,8 @@
 		return null;
 	}
 
-	public void setValue(ELContext context, Object base, Object property,
+	@Override
+    public void setValue(ELContext context, Object base, Object property,
 			Object value) throws NullPointerException,
 			PropertyNotFoundException, PropertyNotWritableException,
 			ELException {
@@ -119,7 +122,8 @@
 		}
 	}
 
-	public boolean isReadOnly(ELContext context, Object base, Object property)
+	@Override
+    public boolean isReadOnly(ELContext context, Object base, Object property)
 			throws NullPointerException, PropertyNotFoundException, ELException {
 		if (context == null) {
 			throw new NullPointerException();
@@ -133,11 +137,13 @@
 		return getDefaultResolver().isReadOnly(context, base, property);
 	}
 
-	public Iterator<java.beans.FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
+	@Override
+    public Iterator<java.beans.FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
 		return getDefaultResolver().getFeatureDescriptors(context, base);
 	}
 
-	public Class<?> getCommonPropertyType(ELContext context, Object base) {
+	@Override
+    public Class<?> getCommonPropertyType(ELContext context, Object base) {
 		if (base == null) {
 			return String.class;
 		}

Modified: tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java Thu Nov  5 01:16:53 2009
@@ -34,7 +34,8 @@
 		this.factory = factory;
 	}
 
-	public Expression parseExpression(String expression, Class<?> expectedType,
+	@Override
+    public Expression parseExpression(String expression, Class<?> expectedType,
 			FunctionMapper fMapper) throws ELException {
 		try {
 			ELContextImpl ctx =
@@ -49,7 +50,8 @@
 		}
 	}
 
-	public Object evaluate(String expression, Class<?> expectedType,
+	@Override
+    public Object evaluate(String expression, Class<?> expectedType,
 			VariableResolver vResolver, FunctionMapper fMapper)
 			throws ELException {
 		return this.parseExpression(expression, expectedType, fMapper).evaluate(vResolver);

Modified: tomcat/trunk/java/org/apache/jasper/el/ExpressionImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ExpressionImpl.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ExpressionImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ExpressionImpl.java Thu Nov  5 01:16:53 2009
@@ -30,7 +30,8 @@
 		this.ve = ve;
 	}
 
-	public Object evaluate(VariableResolver vResolver) throws ELException {
+	@Override
+    public Object evaluate(VariableResolver vResolver) throws ELException {
 		ELContext ctx = new ELContextImpl(new ELResolverImpl(vResolver));
 		return ve.getValue(ctx);
 	}

Modified: tomcat/trunk/java/org/apache/jasper/el/FunctionMapperImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/FunctionMapperImpl.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/FunctionMapperImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/FunctionMapperImpl.java Thu Nov  5 01:16:53 2009
@@ -28,7 +28,8 @@
 		this.fnMapper = fnMapper;
 	}
 
-	public Method resolveFunction(String prefix, String localName) {
+	@Override
+    public Method resolveFunction(String prefix, String localName) {
 		return this.fnMapper.resolveFunction(prefix, localName);
 	}
 

Modified: tomcat/trunk/java/org/apache/jasper/el/JspMethodExpression.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/JspMethodExpression.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/JspMethodExpression.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/JspMethodExpression.java Thu Nov  5 01:16:53 2009
@@ -44,6 +44,7 @@
         this.mark = mark;
     }
 
+    @Override
     public MethodInfo getMethodInfo(ELContext context)
             throws NullPointerException, PropertyNotFoundException,
             MethodNotFoundException, ELException {
@@ -61,6 +62,7 @@
         }
     }
 
+    @Override
     public Object invoke(ELContext context, Object[] params)
             throws NullPointerException, PropertyNotFoundException,
             MethodNotFoundException, ELException {
@@ -78,18 +80,22 @@
         }
     }
 
+    @Override
     public boolean equals(Object obj) {
         return this.target.equals(obj);
     }
 
+    @Override
     public int hashCode() {
         return this.target.hashCode();
     }
 
+    @Override
     public String getExpressionString() {
         return this.target.getExpressionString();
     }
 
+    @Override
     public boolean isLiteralText() {
         return this.target.isLiteralText();
     }

Modified: tomcat/trunk/java/org/apache/jasper/el/JspValueExpression.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/JspValueExpression.java?rev=832953&r1=832952&r2=832953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/JspValueExpression.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/JspValueExpression.java Thu Nov  5 01:16:53 2009
@@ -48,10 +48,12 @@
         this.mark = mark;
     }
 
+    @Override
     public Class<?> getExpectedType() {
         return this.target.getExpectedType();
     }
 
+    @Override
     public Class<?> getType(ELContext context) throws NullPointerException,
             PropertyNotFoundException, ELException {
         try {
@@ -65,6 +67,7 @@
         }
     }
 
+    @Override
     public boolean isReadOnly(ELContext context) throws NullPointerException,
             PropertyNotFoundException, ELException {
         try {
@@ -78,6 +81,7 @@
         }
     }
 
+    @Override
     public void setValue(ELContext context, Object value)
             throws NullPointerException, PropertyNotFoundException,
             PropertyNotWritableException, ELException {
@@ -95,6 +99,7 @@
         }
     }
 
+    @Override
     public Object getValue(ELContext context) throws NullPointerException,
             PropertyNotFoundException, ELException {
         try {
@@ -108,18 +113,22 @@
         }
     }
 
+    @Override
     public boolean equals(Object obj) {
         return this.target.equals(obj);
     }
 
+    @Override
     public int hashCode() {
         return this.target.hashCode();
     }
 
+    @Override
     public String getExpressionString() {
         return this.target.getExpressionString();
     }
 
+    @Override
     public boolean isLiteralText() {
         return this.target.isLiteralText();
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message