Author: markt
Date: Thu Dec 9 23:29:15 2010
New Revision: 1044162
URL: http://svn.apache.org/viewvc?rev=1044162&view=rev
Log:
Fix missing @Override markers in Jasper and remove an unnecessary null check
Modified:
tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java
tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
tomcat/trunk/java/org/apache/jasper/compiler/JarURLResource.java
tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.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/el/VariableResolverImpl.java
tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.java
tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.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/JspRuntimeLibrary.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/ProtectedFunctionMapper.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Catch.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Choose.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/ForEach.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/ForTokens.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/If.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Import.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Otherwise.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Out.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Param.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Redirect.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Remove.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Url.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/When.java
tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original)
+++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Thu Dec 9
23:29:15 2010
@@ -213,6 +213,7 @@ public final class EmbeddedServletOption
/**
* Are we keeping generated code around?
*/
+ @Override
public boolean getKeepGenerated() {
return keepGenerated;
}
@@ -220,10 +221,12 @@ public final class EmbeddedServletOption
/**
* Should white spaces between directives or actions be trimmed?
*/
+ @Override
public boolean getTrimSpaces() {
return trimSpaces;
}
+ @Override
public boolean isPoolingEnabled() {
return isPoolingEnabled;
}
@@ -231,6 +234,7 @@ public final class EmbeddedServletOption
/**
* Are we supporting HTML mapped servlets?
*/
+ @Override
public boolean getMappedFile() {
return mappedFile;
}
@@ -238,6 +242,7 @@ public final class EmbeddedServletOption
/**
* Should class files be compiled with debug information?
*/
+ @Override
public boolean getClassDebugInfo() {
return classDebugInfo;
}
@@ -245,6 +250,7 @@ public final class EmbeddedServletOption
/**
* Background JSP compile thread check interval
*/
+ @Override
public int getCheckInterval() {
return checkInterval;
}
@@ -252,6 +258,7 @@ public final class EmbeddedServletOption
/**
* Modification test interval.
*/
+ @Override
public int getModificationTestInterval() {
return modificationTestInterval;
}
@@ -259,6 +266,7 @@ public final class EmbeddedServletOption
/**
* Re-compile on failure.
*/
+ @Override
public boolean getRecompileOnFail() {
return recompileOnFail;
}
@@ -266,6 +274,7 @@ public final class EmbeddedServletOption
/**
* Is Jasper being used in development mode?
*/
+ @Override
public boolean getDevelopment() {
return development;
}
@@ -273,6 +282,7 @@ public final class EmbeddedServletOption
/**
* Is the generation of SMAP info for JSR45 debugging suppressed?
*/
+ @Override
public boolean isSmapSuppressed() {
return isSmapSuppressed;
}
@@ -280,6 +290,7 @@ public final class EmbeddedServletOption
/**
* Should SMAP info for JSR45 debugging be dumped to a file?
*/
+ @Override
public boolean isSmapDumped() {
return isSmapDumped;
}
@@ -287,6 +298,7 @@ public final class EmbeddedServletOption
/**
* Are Text strings to be generated as char arrays?
*/
+ @Override
public boolean genStringAsCharArray() {
return this.genStringAsCharArray;
}
@@ -294,6 +306,7 @@ public final class EmbeddedServletOption
/**
* Class ID for use in the plugin tag when the browser is IE.
*/
+ @Override
public String getIeClassId() {
return ieClassId;
}
@@ -301,6 +314,7 @@ public final class EmbeddedServletOption
/**
* What is my scratch dir?
*/
+ @Override
public File getScratchDir() {
return scratchDir;
}
@@ -309,6 +323,7 @@ public final class EmbeddedServletOption
* What classpath should I use while compiling the servlets
* generated from JSP files?
*/
+ @Override
public String getClassPath() {
return classpath;
}
@@ -316,6 +331,7 @@ public final class EmbeddedServletOption
/**
* Is generation of X-Powered-By response header enabled/disabled?
*/
+ @Override
public boolean isXpoweredBy() {
return xpoweredBy;
}
@@ -323,6 +339,7 @@ public final class EmbeddedServletOption
/**
* Compiler to use.
*/
+ @Override
public String getCompiler() {
return compiler;
}
@@ -330,6 +347,7 @@ public final class EmbeddedServletOption
/**
* @see Options#getCompilerTargetVM
*/
+ @Override
public String getCompilerTargetVM() {
return compilerTargetVM;
}
@@ -337,6 +355,7 @@ public final class EmbeddedServletOption
/**
* @see Options#getCompilerSourceVM
*/
+ @Override
public String getCompilerSourceVM() {
return compilerSourceVM;
}
@@ -344,10 +363,12 @@ public final class EmbeddedServletOption
/**
* Java compiler class to use.
*/
+ @Override
public String getCompilerClassName() {
return compilerClassName;
}
+ @Override
public boolean getErrorOnUseBeanInvalidClassAttribute() {
return errorOnUseBeanInvalidClassAttribute;
}
@@ -356,6 +377,7 @@ public final class EmbeddedServletOption
errorOnUseBeanInvalidClassAttribute = b;
}
+ @Override
public TldLocationsCache getTldLocationsCache() {
return tldLocationsCache;
}
@@ -364,26 +386,32 @@ public final class EmbeddedServletOption
tldLocationsCache = tldC;
}
+ @Override
public String getJavaEncoding() {
return javaEncoding;
}
+ @Override
public boolean getFork() {
return fork;
}
+ @Override
public JspConfig getJspConfig() {
return jspConfig;
}
+ @Override
public TagPluginManager getTagPluginManager() {
return tagPluginManager;
}
+ @Override
public boolean isCaching() {
return false;
}
+ @Override
public Map<String, TagLibraryInfo> getCache() {
return null;
}
@@ -392,6 +420,7 @@ public final class EmbeddedServletOption
* Should we include a source fragment in exception messages, which could
be displayed
* to the developer ?
*/
+ @Override
public boolean getDisplaySourceFragment() {
return displaySourceFragment;
}
@@ -400,6 +429,7 @@ public final class EmbeddedServletOption
* Should jsps be unloaded if to many are loaded?
* If set to a value greater than 0 eviction of jsps is started. Default:
-1
*/
+ @Override
public int getMaxLoadedJsps() {
return maxLoadedJsps;
}
@@ -408,6 +438,7 @@ public final class EmbeddedServletOption
* Should any jsps be unloaded when being idle for this time in seconds?
* If set to a value greater than 0 eviction of jsps is started. Default:
-1
*/
+ @Override
public int getJspIdleTimeout() {
return jspIdleTimeout;
}
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Dec 9 23:29:15 2010
@@ -388,6 +388,7 @@ public class JspC implements Options {
* In JspC this always returns <code>true</code>.
* {...@inheritdoc}
*/
+ @Override
public boolean getKeepGenerated() {
// isn't this why we are running jspc?
return true;
@@ -396,6 +397,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public boolean getTrimSpaces() {
return trimSpaces;
}
@@ -410,6 +412,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public boolean isPoolingEnabled() {
return poolingEnabled;
}
@@ -424,6 +427,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public boolean isXpoweredBy() {
return xpoweredBy;
}
@@ -439,14 +443,17 @@ public class JspC implements Options {
* In JspC this always returns <code>true</code>.
* {...@inheritdoc}
*/
+ @Override
public boolean getDisplaySourceFragment() {
return true;
}
+ @Override
public int getMaxLoadedJsps() {
return -1;
}
+ @Override
public int getJspIdleTimeout() {
return -1;
}
@@ -454,6 +461,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public boolean getErrorOnUseBeanInvalidClassAttribute() {
return errorOnUseBeanInvalidClassAttribute;
}
@@ -469,6 +477,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public boolean getMappedFile() {
return mappedFile;
}
@@ -483,6 +492,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public boolean getClassDebugInfo() {
// compile with debug info
return classDebugInfo;
@@ -491,6 +501,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public boolean isCaching() {
return caching;
}
@@ -507,6 +518,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public Map<String, TagLibraryInfo> getCache() {
return cache;
}
@@ -515,6 +527,7 @@ public class JspC implements Options {
* In JspC this always returns <code>0</code>.
* {...@inheritdoc}
*/
+ @Override
public int getCheckInterval() {
return 0;
}
@@ -523,6 +536,7 @@ public class JspC implements Options {
* In JspC this always returns <code>0</code>.
* {...@inheritdoc}
*/
+ @Override
public int getModificationTestInterval() {
return 0;
}
@@ -532,6 +546,7 @@ public class JspC implements Options {
* In JspC this always returns <code>false</code>.
* {...@inheritdoc}
*/
+ @Override
public boolean getRecompileOnFail() {
return false;
}
@@ -541,6 +556,7 @@ public class JspC implements Options {
* In JspC this always returns <code>false</code>.
* {...@inheritdoc}
*/
+ @Override
public boolean getDevelopment() {
return false;
}
@@ -548,6 +564,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public boolean isSmapSuppressed() {
return smapSuppressed;
}
@@ -562,6 +579,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public boolean isSmapDumped() {
return smapDumped;
}
@@ -590,6 +608,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public boolean genStringAsCharArray() {
return genStringAsCharArray;
}
@@ -608,6 +627,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public String getIeClassId() {
return ieClassId;
}
@@ -615,6 +635,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public File getScratchDir() {
return scratchDir;
}
@@ -622,6 +643,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public String getCompiler() {
return compiler;
}
@@ -638,6 +660,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public String getCompilerClassName() {
return null;
}
@@ -645,6 +668,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public String getCompilerTargetVM() {
return compilerTargetVM;
}
@@ -661,7 +685,8 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
- public String getCompilerSourceVM() {
+ @Override
+ public String getCompilerSourceVM() {
return compilerSourceVM;
}
@@ -677,6 +702,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public TldLocationsCache getTldLocationsCache() {
return tldLocationsCache;
}
@@ -687,6 +713,7 @@ public class JspC implements Options {
*
* @return String The encoding
*/
+ @Override
public String getJavaEncoding() {
return javaEncoding;
}
@@ -704,6 +731,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public boolean getFork() {
return false;
}
@@ -711,6 +739,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public String getClassPath() {
if( classPath != null )
return classPath;
@@ -924,6 +953,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public JspConfig getJspConfig() {
return jspConfig;
}
@@ -931,6 +961,7 @@ public class JspC implements Options {
/**
* {...@inheritdoc}
*/
+ @Override
public TagPluginManager getTagPluginManager() {
return tagPluginManager;
}
@@ -1513,7 +1544,7 @@ public class JspC implements Options {
try {
if (f.exists()) {
f = new File(f.getAbsolutePath());
- while (f != null) {
+ while (true) {
File g = new File(f, "WEB-INF");
if (g.exists() && g.isDirectory()) {
uriRoot = f.getCanonicalPath();
Modified: tomcat/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java Thu
Dec 9 23:29:15 2010
@@ -35,6 +35,7 @@ class DefaultErrorHandler implements Err
* @param errMsg Parse error message
* @param exception Parse exception
*/
+ @Override
public void jspError(String fname, int line, int column, String errMsg,
Exception ex) throws JasperException {
throw new JasperException(fname + "(" + line + "," + column + ")"
@@ -47,6 +48,7 @@ class DefaultErrorHandler implements Err
* @param errMsg Parse error message
* @param exception Parse exception
*/
+ @Override
public void jspError(String errMsg, Exception ex) throws JasperException {
throw new JasperException(errMsg, ex);
}
@@ -57,6 +59,7 @@ class DefaultErrorHandler implements Err
* @param details Array of JavacErrorDetail instances corresponding to the
* compilation errors
*/
+ @Override
public void javacError(JavacErrorDetail[] details) throws JasperException {
if (details == null) {
@@ -99,6 +102,7 @@ class DefaultErrorHandler implements Err
* @param errorReport Compilation error report
* @param exception Compilation exception
*/
+ @Override
public void javacError(String errorReport, Exception exception)
throws JasperException {
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=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java Thu Dec
9 23:29:15 2010
@@ -323,6 +323,7 @@ public class ELFunctionMapper {
private static class PrivilegedGetTccl
implements PrivilegedAction<ClassLoader> {
+ @Override
public ClassLoader run() {
return Thread.currentThread().getContextClassLoader();
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JarURLResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JarURLResource.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JarURLResource.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JarURLResource.java Thu Dec 9
23:29:15 2010
@@ -35,6 +35,7 @@ public class JarURLResource implements J
this.jarUrl = jarUrl;
}
+ @Override
public JarFile getJarFile() throws IOException {
URL jarFileUrl = new URL("jar:" + jarUrl + "!/");
JarURLConnection conn = (JarURLConnection) jarFileUrl.openConnection();
@@ -43,10 +44,12 @@ public class JarURLResource implements J
return conn.getJarFile();
}
+ @Override
public String getUrl() {
return jarUrl;
}
+ @Override
public URL getEntry(String name) {
try {
return new URL("jar:" + jarUrl + "!/" + name);
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=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java Thu Dec
9 23:29:15 2010
@@ -698,6 +698,7 @@ class JspDocumentParser
/*
* See org.xml.sax.ext.LexicalHandler.
*/
+ @Override
public void comment(char[] buf, int offset, int len) throws SAXException {
processChars(); // Flush char buffer and remove white spaces
@@ -717,6 +718,7 @@ class JspDocumentParser
/*
* See org.xml.sax.ext.LexicalHandler.
*/
+ @Override
public void startCDATA() throws SAXException {
processChars(); // Flush char buffer and remove white spaces
@@ -727,6 +729,7 @@ class JspDocumentParser
/*
* See org.xml.sax.ext.LexicalHandler.
*/
+ @Override
public void endCDATA() throws SAXException {
processChars(); // Flush char buffer and remove white spaces
}
@@ -734,6 +737,7 @@ class JspDocumentParser
/*
* See org.xml.sax.ext.LexicalHandler.
*/
+ @Override
public void startEntity(String name) throws SAXException {
// do nothing
}
@@ -741,6 +745,7 @@ class JspDocumentParser
/*
* See org.xml.sax.ext.LexicalHandler.
*/
+ @Override
public void endEntity(String name) throws SAXException {
// do nothing
}
@@ -748,6 +753,7 @@ class JspDocumentParser
/*
* See org.xml.sax.ext.LexicalHandler.
*/
+ @Override
public void startDTD(String name, String publicId, String systemId)
throws SAXException {
if (!isValidating) {
@@ -760,6 +766,7 @@ class JspDocumentParser
/*
* See org.xml.sax.ext.LexicalHandler.
*/
+ @Override
public void endDTD() throws SAXException {
inDTD = false;
}
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=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java Thu Dec
9 23:29:15 2010
@@ -154,6 +154,7 @@ public class TagPluginManager {
pluginAttributes = new HashMap<String, Object>();
}
+ @Override
public TagPluginContext getParentContext() {
Node parent = node.getParent();
if (! (parent instanceof Node.CustomTag)) {
@@ -162,18 +163,22 @@ public class TagPluginManager {
return ((Node.CustomTag) parent).getTagPluginContext();
}
+ @Override
public void setPluginAttribute(String key, Object value) {
pluginAttributes.put(key, value);
}
+ @Override
public Object getPluginAttribute(String key) {
return pluginAttributes.get(key);
}
+ @Override
public boolean isScriptless() {
return node.getChildInfo().isScriptless();
}
+ @Override
public boolean isConstantAttribute(String attribute) {
Node.JspAttribute attr = getNodeAttribute(attribute);
if (attr == null)
@@ -181,6 +186,7 @@ public class TagPluginManager {
return attr.isLiteral();
}
+ @Override
public String getConstantAttribute(String attribute) {
Node.JspAttribute attr = getNodeAttribute(attribute);
if (attr == null)
@@ -188,18 +194,22 @@ public class TagPluginManager {
return attr.getValue();
}
+ @Override
public boolean isAttributeSpecified(String attribute) {
return getNodeAttribute(attribute) != null;
}
+ @Override
public String getTemporaryVariableName() {
return node.getRoot().nextTemporaryVariableName();
}
+ @Override
public void generateImport(String imp) {
pageInfo.addImport(imp);
}
+ @Override
public void generateDeclaration(String id, String text) {
if (pageInfo.isPluginDeclared(id)) {
return;
@@ -207,21 +217,25 @@ public class TagPluginManager {
curNodes.add(new Node.Declaration(text, node.getStart(), null));
}
+ @Override
public void generateJavaSource(String sourceCode) {
curNodes.add(new Node.Scriptlet(sourceCode, node.getStart(),
null));
}
+ @Override
public void generateAttribute(String attributeName) {
curNodes.add(new Node.AttributeGenerator(node.getStart(),
attributeName,
node));
}
+ @Override
public void dontUseTagPlugin() {
node.setUseTagPlugin(false);
}
+ @Override
public void generateBody() {
// Since we'll generate the body anyway, this is really a nop,
// except for the fact that it lets us put the Java sources the
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=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/JspMethodExpression.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/JspMethodExpression.java Thu Dec 9
23:29:15 2010
@@ -100,11 +100,13 @@ public final class JspMethodExpression e
return this.target.isLiteralText();
}
+ @Override
public void writeExternal(ObjectOutput out) throws IOException {
out.writeUTF(this.mark);
out.writeObject(this.target);
}
+ @Override
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
this.mark = in.readUTF();
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=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/JspValueExpression.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/JspValueExpression.java Thu Dec 9
23:29:15 2010
@@ -133,11 +133,13 @@ public final class JspValueExpression ex
return this.target.isLiteralText();
}
+ @Override
public void writeExternal(ObjectOutput out) throws IOException {
out.writeUTF(this.mark);
out.writeObject(this.target);
}
+ @Override
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
this.mark = in.readUTF();
Modified: tomcat/trunk/java/org/apache/jasper/el/VariableResolverImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/VariableResolverImpl.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/VariableResolverImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/VariableResolverImpl.java Thu Dec 9
23:29:15 2010
@@ -29,6 +29,7 @@ public final class VariableResolverImpl
this.ctx = ctx;
}
+ @Override
public Object resolveVariable(String pName) throws ELException {
return this.ctx.getELResolver().getValue(this.ctx, null, pName);
}
Modified: tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.java Thu Dec 9
23:29:15 2010
@@ -70,18 +70,21 @@ public abstract class HttpJspBase extend
_jspService(request, response);
}
+ @Override
public void jspInit() {
}
public void _jspInit() {
}
+ @Override
public void jspDestroy() {
}
protected void _jspDestroy() {
}
+ @Override
public abstract void _jspService(HttpServletRequest request,
HttpServletResponse response)
throws ServletException, IOException;
Modified:
tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
Thu Dec 9 23:29:15 2010
@@ -65,6 +65,7 @@ public class JspApplicationContextImpl i
}
+ @Override
public void addELContextListener(ELContextListener listener) {
if (listener == null) {
throw new IllegalArgumentException("ELConextListener was null");
@@ -96,6 +97,7 @@ public class JspApplicationContextImpl i
if (Constants.IS_SECURITY_ENABLED) {
ctx = AccessController.doPrivileged(
new PrivilegedAction<ELContextImpl>() {
+ @Override
public ELContextImpl run() {
return new ELContextImpl(r);
}
@@ -134,6 +136,7 @@ public class JspApplicationContextImpl i
return this.resolver;
}
+ @Override
public void addELResolver(ELResolver resolver) throws
IllegalStateException {
if (resolver == null) {
throw new IllegalArgumentException("ELResolver was null");
@@ -145,6 +148,7 @@ public class JspApplicationContextImpl i
this.resolvers.add(resolver);
}
+ @Override
public ExpressionFactory getExpressionFactory() {
return expressionFactory;
}
Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java Thu Dec
9 23:29:15 2010
@@ -346,6 +346,7 @@ public class JspContextWrapper extends P
/**
* VariableResolver interface
*/
+ @Override
@Deprecated
public Object resolveVariable(String pName) throws ELException {
ELContext ctx = this.getELContext();
Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java Thu Dec 9
23:29:15 2010
@@ -151,6 +151,7 @@ public class JspFactoryImpl extends JspF
this.autoflush = autoflush;
}
+ @Override
public PageContext run() {
return factory.internalGetPageContext(servlet, request, response,
errorPageURL, needsSession, bufferSize, autoflush);
@@ -169,6 +170,7 @@ public class JspFactoryImpl extends JspF
this.pageContext = pageContext;
}
+ @Override
public Void run() {
factory.internalReleasePageContext(pageContext);
return null;
@@ -209,6 +211,7 @@ public class JspFactoryImpl extends JspF
if (Constants.IS_SECURITY_ENABLED) {
return AccessController.doPrivileged(
new PrivilegedAction<JspApplicationContext>() {
+ @Override
public JspApplicationContext run() {
return JspApplicationContextImpl.getInstance(context);
}
Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java Thu Dec
9 23:29:15 2010
@@ -82,6 +82,7 @@ public class JspRuntimeLibrary {
this.ignoreMethodNF = ignoreMethodNF;
}
+ @Override
public Void run() throws JasperException {
internalIntrospecthelper(
bean,prop,value,request,param,ignoreMethodNF);
Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java Thu Dec 9
23:29:15 2010
@@ -129,6 +129,7 @@ public class JspWriterImpl extends JspWr
private String getLocalizeMessage(final String message){
if (SecurityUtil.isPackageProtectionEnabled()){
return AccessController.doPrivileged(new
PrivilegedAction<String>(){
+ @Override
public String run(){
return Localizer.getMessage(message);
}
Modified: tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java Thu Dec 9
23:29:15 2010
@@ -221,6 +221,7 @@ public class PageContextImpl extends Pag
if (SecurityUtil.isPackageProtectionEnabled()) {
return AccessController.doPrivileged(
new PrivilegedAction<Object>() {
+ @Override
public Object run() {
return doGetAttribute(name);
}
@@ -246,6 +247,7 @@ public class PageContextImpl extends Pag
if (SecurityUtil.isPackageProtectionEnabled()) {
return AccessController.doPrivileged(
new PrivilegedAction<Object>() {
+ @Override
public Object run() {
return doGetAttribute(name, scope);
}
@@ -289,6 +291,7 @@ public class PageContextImpl extends Pag
if (SecurityUtil.isPackageProtectionEnabled()) {
AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ @Override
public Void run() {
doSetAttribute(name, attribute);
return null;
@@ -317,6 +320,7 @@ public class PageContextImpl extends Pag
if (SecurityUtil.isPackageProtectionEnabled()) {
AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ @Override
public Void run() {
doSetAttribute(name, o, scope);
return null;
@@ -368,6 +372,7 @@ public class PageContextImpl extends Pag
}
if (SecurityUtil.isPackageProtectionEnabled()) {
AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ @Override
public Void run() {
doRemoveAttribute(name, scope);
return null;
@@ -416,6 +421,7 @@ public class PageContextImpl extends Pag
if (SecurityUtil.isPackageProtectionEnabled()) {
return (AccessController
.doPrivileged(new PrivilegedAction<Integer>() {
+ @Override
public Integer run() {
return new Integer(doGetAttributeScope(name));
}
@@ -453,6 +459,7 @@ public class PageContextImpl extends Pag
if (SecurityUtil.isPackageProtectionEnabled()) {
return AccessController.doPrivileged(
new PrivilegedAction<Object>() {
+ @Override
public Object run() {
if (name == null) {
throw new NullPointerException(Localizer
@@ -501,6 +508,7 @@ public class PageContextImpl extends Pag
if (SecurityUtil.isPackageProtectionEnabled()) {
return AccessController.doPrivileged(
new PrivilegedAction<Enumeration<String>>() {
+ @Override
public Enumeration<String> run() {
return doGetAttributeNamesInScope(scope);
}
@@ -543,6 +551,7 @@ public class PageContextImpl extends Pag
if (SecurityUtil.isPackageProtectionEnabled()) {
AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ @Override
public Void run() {
doRemoveAttribute(name);
return null;
@@ -654,6 +663,7 @@ public class PageContextImpl extends Pag
try {
AccessController.doPrivileged(
new PrivilegedExceptionAction<Void>() {
+ @Override
public Void run() throws Exception {
doInclude(relativeUrlPath, flush);
return null;
@@ -691,6 +701,7 @@ public class PageContextImpl extends Pag
try {
AccessController.doPrivileged(
new PrivilegedExceptionAction<Void>() {
+ @Override
public Void run() throws Exception {
doForward(relativeUrlPath);
return null;
@@ -813,6 +824,7 @@ public class PageContextImpl extends Pag
try {
AccessController.doPrivileged(
new PrivilegedExceptionAction<Void>() {
+ @Override
public Void run() throws Exception {
doHandlePageException(t);
return null;
@@ -952,6 +964,7 @@ public class PageContextImpl extends Pag
retValue = AccessController
.doPrivileged(new PrivilegedExceptionAction<Object>() {
+ @Override
public Object run() throws Exception {
ELContextImpl ctx = (ELContextImpl)
pageContext.getELContext();
ctx.setFunctionMapper(new
FunctionMapperImpl(functionMap));
Modified:
tomcat/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
Thu Dec 9 23:29:15 2010
@@ -67,6 +67,7 @@ public final class ProtectedFunctionMapp
if (SecurityUtil.isPackageProtectionEnabled()) {
funcMapper = AccessController.doPrivileged(
new PrivilegedAction<ProtectedFunctionMapper>() {
+ @Override
public ProtectedFunctionMapper run() {
return new ProtectedFunctionMapper();
}
@@ -100,6 +101,7 @@ public final class ProtectedFunctionMapp
try {
method = AccessController.doPrivileged(
new PrivilegedExceptionAction<Method>() {
+ @Override
public Method run() throws Exception {
return c.getDeclaredMethod(methodName, args);
}
@@ -145,6 +147,7 @@ public final class ProtectedFunctionMapp
if (SecurityUtil.isPackageProtectionEnabled()) {
funcMapper = AccessController.doPrivileged(
new PrivilegedAction<ProtectedFunctionMapper>() {
+ @Override
public ProtectedFunctionMapper run() {
return new ProtectedFunctionMapper();
}
@@ -153,6 +156,7 @@ public final class ProtectedFunctionMapp
try {
method = AccessController.doPrivileged(
new PrivilegedExceptionAction<Method>() {
+ @Override
public Method run() throws Exception {
return c.getDeclaredMethod(methodName, args);
}
Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Catch.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Catch.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Catch.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Catch.java Thu Dec
9 23:29:15 2010
@@ -23,6 +23,7 @@ import org.apache.jasper.compiler.tagplu
public class Catch implements TagPlugin {
+ @Override
public void doTag(TagPluginContext ctxt) {
//flag for the existence of the var attribute
Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Choose.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Choose.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Choose.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Choose.java Thu
Dec 9 23:29:15 2010
@@ -23,6 +23,7 @@ import org.apache.jasper.compiler.tagplu
public final class Choose implements TagPlugin {
+ @Override
public void doTag(TagPluginContext ctxt) {
// Not much to do here, much of the work will be done in the
Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/ForEach.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/ForEach.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/ForEach.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/ForEach.java Thu
Dec 9 23:29:15 2010
@@ -25,6 +25,7 @@ public final class ForEach implements Ta
private boolean hasVar, hasBegin, hasEnd, hasStep;
+ @Override
public void doTag(TagPluginContext ctxt) {
String index = null;
Modified:
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/ForTokens.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/ForTokens.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/ForTokens.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/ForTokens.java Thu
Dec 9 23:29:15 2010
@@ -23,6 +23,7 @@ import org.apache.jasper.compiler.tagplu
public class ForTokens implements TagPlugin {
+ @Override
public void doTag(TagPluginContext ctxt) {
boolean hasVar, hasVarStatus, hasBegin, hasEnd, hasStep;
Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/If.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/If.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/If.java (original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/If.java Thu Dec 9
23:29:15 2010
@@ -23,6 +23,7 @@ import org.apache.jasper.compiler.tagplu
public final class If implements TagPlugin {
+ @Override
public void doTag(TagPluginContext ctxt) {
String condV = ctxt.getTemporaryVariableName();
ctxt.generateJavaSource("boolean " + condV + "=");
Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Import.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Import.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Import.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Import.java Thu
Dec 9 23:29:15 2010
@@ -24,6 +24,7 @@ import org.apache.jasper.tagplugins.jstl
public class Import implements TagPlugin {
+ @Override
public void doTag(TagPluginContext ctxt) {
boolean hasContext, hasVar, hasScope, hasVarReader, hasCharEncoding;
Modified:
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Otherwise.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Otherwise.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Otherwise.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Otherwise.java Thu
Dec 9 23:29:15 2010
@@ -23,6 +23,7 @@ import org.apache.jasper.compiler.tagplu
public final class Otherwise implements TagPlugin {
+ @Override
public void doTag(TagPluginContext ctxt) {
// See When.java for the reason whey "}" is need at the beginng and
Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Out.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Out.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Out.java (original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Out.java Thu Dec
9 23:29:15 2010
@@ -24,6 +24,7 @@ import org.apache.jasper.compiler.tagplu
public final class Out implements TagPlugin {
+ @Override
public void doTag(TagPluginContext ctxt) {
//these two data member are to indicate
Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Param.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Param.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Param.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Param.java Thu Dec
9 23:29:15 2010
@@ -23,6 +23,7 @@ import org.apache.jasper.compiler.tagplu
public class Param implements TagPlugin {
+ @Override
public void doTag(TagPluginContext ctxt) {
//don't support the body content
Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Redirect.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Redirect.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Redirect.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Redirect.java Thu
Dec 9 23:29:15 2010
@@ -23,6 +23,7 @@ import org.apache.jasper.compiler.tagplu
public class Redirect implements TagPlugin {
+ @Override
public void doTag(TagPluginContext ctxt) {
//flag for the existence of the "context"
Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Remove.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Remove.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Remove.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Remove.java Thu
Dec 9 23:29:15 2010
@@ -24,6 +24,7 @@ import org.apache.jasper.tagplugins.jstl
public class Remove implements TagPlugin {
+ @Override
public void doTag(TagPluginContext ctxt) {
//scope flag
Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java (original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java Thu Dec
9 23:29:15 2010
@@ -24,6 +24,7 @@ import org.apache.jasper.tagplugins.jstl
public class Set implements TagPlugin {
+ @Override
public void doTag(TagPluginContext ctxt) {
//the flags to indicate whether the attributes have been specified
Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Url.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Url.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Url.java (original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Url.java Thu Dec
9 23:29:15 2010
@@ -24,6 +24,7 @@ import org.apache.jasper.tagplugins.jstl
public class Url implements TagPlugin {
+ @Override
public void doTag(TagPluginContext ctxt) {
//flags
Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/When.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/When.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/When.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/When.java Thu Dec
9 23:29:15 2010
@@ -23,6 +23,7 @@ import org.apache.jasper.compiler.tagplu
public final class When implements TagPlugin {
+ @Override
public void doTag(TagPluginContext ctxt) {
// Get the parent context to determine if this is the first <c:when>
TagPluginContext parentContext = ctxt.getParentContext();
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java?rev=1044162&r1=1044161&r2=1044162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java (original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java Thu Dec 9
23:29:15 2010
@@ -191,6 +191,7 @@ public class ParserUtils {
class MyEntityResolver implements EntityResolver {
+ @Override
public InputSource resolveEntity(String publicId, String systemId)
throws SAXException {
for (int i = 0; i < Constants.CACHED_DTD_PUBLIC_IDS.size(); i++) {
@@ -219,6 +220,7 @@ class MyEntityResolver implements Entity
class MyErrorHandler implements ErrorHandler {
+ @Override
public void warning(SAXParseException ex) throws SAXException {
Log log = LogFactory.getLog(MyErrorHandler.class);
if (log.isDebugEnabled())
@@ -226,10 +228,12 @@ class MyErrorHandler implements ErrorHan
// We ignore warnings
}
+ @Override
public void error(SAXParseException ex) throws SAXException {
throw ex;
}
+ @Override
public void fatalError(SAXParseException ex) throws SAXException {
throw ex;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
