Modified: tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java?rev=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java (original) +++ tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java Thu Nov 5 01:16:53 2009 @@ -65,6 +65,7 @@ /** * Write a single character. */ + @Override public void write(int c) throws IOException { if (writer != null) { writer.write(c); @@ -92,6 +93,7 @@ * @param off Offset from which to start reading characters * @param len Number of characters to write */ + @Override public void write(char[] cbuf, int off, int len) throws IOException { if (writer != null) { writer.write(cbuf, off, len); @@ -117,6 +119,7 @@ * Write an array of characters. This method cannot be inherited from the * Writer class because it must suppress I/O exceptions. */ + @Override public void write(char[] buf) throws IOException { if (writer != null) { writer.write(buf); @@ -132,6 +135,7 @@ * @param off Offset from which to start reading characters * @param len Number of characters to be written */ + @Override public void write(String s, int off, int len) throws IOException { if (writer != null) { writer.write(s, off, len); @@ -149,6 +153,7 @@ * Write a string. This method cannot be inherited from the Writer class * because it must suppress I/O exceptions. */ + @Override public void write(String s) throws IOException { if (writer != null) { writer.write(s); @@ -164,6 +169,7 @@ * * @throws IOException If an I/O error occurs */ + @Override public void newLine() throws IOException { if (writer != null) { writer.write(LINE_SEPARATOR); @@ -182,6 +188,7 @@ * @param b The <code>boolean</code> to be printed * @throws IOException */ + @Override public void print(boolean b) throws IOException { if (writer != null) { writer.write(b ? "true" : "false"); @@ -199,6 +206,7 @@ * @param c The <code>char</code> to be printed * @throws IOException */ + @Override public void print(char c) throws IOException { if (writer != null) { writer.write(String.valueOf(c)); @@ -217,6 +225,7 @@ * @param i The <code>int</code> to be printed * @throws IOException */ + @Override public void print(int i) throws IOException { if (writer != null) { writer.write(String.valueOf(i)); @@ -235,6 +244,7 @@ * @param l The <code>long</code> to be printed * @throws IOException */ + @Override public void print(long l) throws IOException { if (writer != null) { writer.write(String.valueOf(l)); @@ -253,6 +263,7 @@ * @param f The <code>float</code> to be printed * @throws IOException */ + @Override public void print(float f) throws IOException { if (writer != null) { writer.write(String.valueOf(f)); @@ -271,6 +282,7 @@ * @param d The <code>double</code> to be printed * @throws IOException */ + @Override public void print(double d) throws IOException { if (writer != null) { writer.write(String.valueOf(d)); @@ -290,6 +302,7 @@ * @throws NullPointerException If <code>s</code> is <code>null</code> * @throws IOException */ + @Override public void print(char[] s) throws IOException { if (writer != null) { writer.write(s); @@ -308,6 +321,7 @@ * @param s The <code>String</code> to be printed * @throws IOException */ + @Override public void print(String s) throws IOException { if (s == null) s = "null"; if (writer != null) { @@ -327,6 +341,7 @@ * @param obj The <code>Object</code> to be printed * @throws IOException */ + @Override public void print(Object obj) throws IOException { if (writer != null) { writer.write(String.valueOf(obj)); @@ -343,6 +358,7 @@ * * @throws IOException */ + @Override public void println() throws IOException { newLine(); } @@ -354,6 +370,7 @@ * * @throws IOException */ + @Override public void println(boolean x) throws IOException { print(x); println(); @@ -366,6 +383,7 @@ * * @throws IOException */ + @Override public void println(char x) throws IOException { print(x); println(); @@ -378,6 +396,7 @@ * * @throws IOException */ + @Override public void println(int x) throws IOException { print(x); println(); @@ -390,6 +409,7 @@ * * @throws IOException */ + @Override public void println(long x) throws IOException { print(x); println(); @@ -402,6 +422,7 @@ * * @throws IOException */ + @Override public void println(float x) throws IOException { print(x); println(); @@ -414,6 +435,7 @@ * * @throws IOException */ + @Override public void println(double x) throws IOException{ print(x); println(); @@ -426,6 +448,7 @@ * * @throws IOException */ + @Override public void println(char x[]) throws IOException { print(x); println(); @@ -438,6 +461,7 @@ * * @throws IOException */ + @Override public void println(String x) throws IOException { print(x); println(); @@ -450,6 +474,7 @@ * * @throws IOException */ + @Override public void println(Object x) throws IOException { print(x); println(); @@ -463,6 +488,7 @@ * * @throws IOException If an I/O error occurs */ + @Override public void clear() throws IOException { if (writer != null) { throw new IOException(); @@ -483,6 +509,7 @@ * * @throws IOException If an I/O error occurs */ + @Override public void clearBuffer() throws IOException { if (writer == null) { this.clear(); @@ -496,6 +523,7 @@ * * @throws IOException If an I/O error occurs */ + @Override public void close() throws IOException { if (writer != null) { writer.close(); @@ -509,6 +537,7 @@ * * @return the size of the buffer in bytes, or 0 is unbuffered. */ + @Override public int getBufferSize() { // According to the spec, the JspWriter returned by // JspContext.pushBody(java.io.Writer writer) must behave as @@ -520,6 +549,7 @@ /** * @return the number of bytes unused in the buffer */ + @Override public int getRemaining() { return (writer == null) ? bufferSize-nextChar : 0; } @@ -531,6 +561,7 @@ * * @return the value of this BodyJspWriter as a Reader */ + @Override public Reader getReader() { return (writer == null) ? new CharArrayReader (cb, 0, nextChar) : null; } @@ -542,6 +573,7 @@ * * @return the value of the BodyJspWriter as a String */ + @Override public String getString() { return (writer == null) ? new String(cb, 0, nextChar) : null; } @@ -554,6 +586,7 @@ * @param out The writer into which to place the contents of this body * evaluation */ + @Override public void writeOut(Writer out) throws IOException { if (writer == null) { out.write(cb, 0, nextChar);
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=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.java (original) +++ tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.java Thu Nov 5 01:16:53 2009 @@ -43,6 +43,7 @@ protected HttpJspBase() { } + @Override public final void init(ServletConfig config) throws ServletException { @@ -51,10 +52,12 @@ _jspInit(); } + @Override public String getServletInfo() { return Localizer.getMessage("jsp.engine.info"); } + @Override public final void destroy() { jspDestroy(); _jspDestroy(); @@ -63,6 +66,7 @@ /** * Entry point into service. */ + @Override public final void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { 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=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java (original) +++ tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java Thu Nov 5 01:16:53 2009 @@ -93,13 +93,15 @@ syncBeginTagFile(); } - public void initialize(Servlet servlet, ServletRequest request, + @Override + public void initialize(Servlet servlet, ServletRequest request, ServletResponse response, String errorPageURL, boolean needsSession, int bufferSize, boolean autoFlush) throws IOException, IllegalStateException, IllegalArgumentException { } - public Object getAttribute(String name) { + @Override + public Object getAttribute(String name) { if (name == null) { throw new NullPointerException(Localizer @@ -109,7 +111,8 @@ return pageAttributes.get(name); } - public Object getAttribute(String name, int scope) { + @Override + public Object getAttribute(String name, int scope) { if (name == null) { throw new NullPointerException(Localizer @@ -123,7 +126,8 @@ return invokingJspCtxt.getAttribute(name, scope); } - public void setAttribute(String name, Object value) { + @Override + public void setAttribute(String name, Object value) { if (name == null) { throw new NullPointerException(Localizer @@ -137,7 +141,8 @@ } } - public void setAttribute(String name, Object value, int scope) { + @Override + public void setAttribute(String name, Object value, int scope) { if (name == null) { throw new NullPointerException(Localizer @@ -155,7 +160,8 @@ } } - public Object findAttribute(String name) { + @Override + public Object findAttribute(String name) { if (name == null) { throw new NullPointerException(Localizer @@ -178,7 +184,8 @@ return o; } - public void removeAttribute(String name) { + @Override + public void removeAttribute(String name) { if (name == null) { throw new NullPointerException(Localizer @@ -193,7 +200,8 @@ invokingJspCtxt.removeAttribute(name, APPLICATION_SCOPE); } - public void removeAttribute(String name, int scope) { + @Override + public void removeAttribute(String name, int scope) { if (name == null) { throw new NullPointerException(Localizer @@ -207,7 +215,8 @@ } } - public int getAttributesScope(String name) { + @Override + public int getAttributesScope(String name) { if (name == null) { throw new NullPointerException(Localizer @@ -221,7 +230,8 @@ } } - public Enumeration<String> getAttributeNamesInScope(int scope) { + @Override + public Enumeration<String> getAttributeNamesInScope(int scope) { if (scope == PAGE_SCOPE) { return new Enumerator<String>(pageAttributes.keySet().iterator()); } @@ -229,85 +239,104 @@ return invokingJspCtxt.getAttributeNamesInScope(scope); } - public void release() { + @Override + public void release() { invokingJspCtxt.release(); } - public JspWriter getOut() { + @Override + public JspWriter getOut() { return invokingJspCtxt.getOut(); } - public HttpSession getSession() { + @Override + public HttpSession getSession() { return invokingJspCtxt.getSession(); } - public Object getPage() { + @Override + public Object getPage() { return invokingJspCtxt.getPage(); } - public ServletRequest getRequest() { + @Override + public ServletRequest getRequest() { return invokingJspCtxt.getRequest(); } - public ServletResponse getResponse() { + @Override + public ServletResponse getResponse() { return invokingJspCtxt.getResponse(); } - public Exception getException() { + @Override + public Exception getException() { return invokingJspCtxt.getException(); } - public ServletConfig getServletConfig() { + @Override + public ServletConfig getServletConfig() { return invokingJspCtxt.getServletConfig(); } - public ServletContext getServletContext() { + @Override + public ServletContext getServletContext() { return invokingJspCtxt.getServletContext(); } - public void forward(String relativeUrlPath) throws ServletException, + @Override + public void forward(String relativeUrlPath) throws ServletException, IOException { invokingJspCtxt.forward(relativeUrlPath); } - public void include(String relativeUrlPath) throws ServletException, + @Override + public void include(String relativeUrlPath) throws ServletException, IOException { invokingJspCtxt.include(relativeUrlPath); } - public void include(String relativeUrlPath, boolean flush) + @Override + public void include(String relativeUrlPath, boolean flush) throws ServletException, IOException { invokingJspCtxt.include(relativeUrlPath, false); } - public VariableResolver getVariableResolver() { + @Override + public VariableResolver getVariableResolver() { return this; } - public BodyContent pushBody() { + @Override + public BodyContent pushBody() { return invokingJspCtxt.pushBody(); } - public JspWriter pushBody(Writer writer) { + @Override + public JspWriter pushBody(Writer writer) { return invokingJspCtxt.pushBody(writer); } - public JspWriter popBody() { + @Override + public JspWriter popBody() { return invokingJspCtxt.popBody(); } - public ExpressionEvaluator getExpressionEvaluator() { + @Override + public ExpressionEvaluator getExpressionEvaluator() { return invokingJspCtxt.getExpressionEvaluator(); } - public void handlePageException(Exception ex) throws IOException, + @Override + public void handlePageException(Exception ex) throws IOException, ServletException { // Should never be called since handleException() called with a // Throwable in the generated servlet. handlePageException((Throwable) ex); } - public void handlePageException(Throwable t) throws IOException, + @Override + public void handlePageException(Throwable t) throws IOException, ServletException { invokingJspCtxt.handlePageException(t); } @@ -444,7 +473,8 @@ //private ELContextImpl elContext; - public ELContext getELContext() { + @Override + public ELContext getELContext() { // instead decorate!!! return this.invokingJspCtxt.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=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java (original) +++ tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java Thu Nov 5 01:16:53 2009 @@ -50,6 +50,7 @@ private ThreadLocal<PageContextPool> localPool = new ThreadLocal<PageContextPool>(); + @Override public PageContext getPageContext(Servlet servlet, ServletRequest request, ServletResponse response, String errorPageURL, boolean needsSession, int bufferSize, boolean autoflush) { @@ -66,6 +67,7 @@ } } + @Override public void releasePageContext(PageContext pc) { if( pc == null ) return; @@ -78,8 +80,10 @@ } } + @Override public JspEngineInfo getEngineInfo() { return new JspEngineInfo() { + @Override public String getSpecificationVersion() { return SPEC_VERSION; } @@ -198,6 +202,7 @@ } + @Override public JspApplicationContext getJspApplicationContext( final ServletContext context) { if (Constants.IS_SECURITY_ENABLED) { Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspFragmentHelper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspFragmentHelper.java?rev=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/runtime/JspFragmentHelper.java (original) +++ tomcat/trunk/java/org/apache/jasper/runtime/JspFragmentHelper.java Thu Nov 5 01:16:53 2009 @@ -54,6 +54,7 @@ this.parentTag = parentTag; } + @Override public JspContext getJspContext() { return this.jspContext; } 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=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java (original) +++ tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java Thu Nov 5 01:16:53 2009 @@ -141,6 +141,7 @@ /** * Discard the output buffer. */ + @Override public final void clear() throws IOException { if ((bufferSize == 0) && (out != null)) // clear() is illegal after any unbuffered output (JSP.5.5) @@ -153,6 +154,7 @@ nextChar = 0; } + @Override public void clearBuffer() throws IOException { if (bufferSize == 0) throw new IllegalStateException( @@ -169,6 +171,7 @@ * Flush the stream. * */ + @Override public void flush() throws IOException { flushBuffer(); if (out != null) { @@ -180,6 +183,7 @@ * Close the stream. * */ + @Override public void close() throws IOException { if (response == null || closed) // multiple calls to close is OK @@ -194,6 +198,7 @@ /** * @return the number of bytes unused in the buffer */ + @Override public int getRemaining() { return bufferSize - nextChar; } @@ -208,6 +213,7 @@ /** * Write a single character. */ + @Override public void write(int c) throws IOException { ensureOpen(); if (bufferSize == 0) { @@ -247,6 +253,7 @@ * @param off Offset from which to start reading characters * @param len Number of characters to write */ + @Override public void write(char cbuf[], int off, int len) throws IOException { @@ -297,6 +304,7 @@ * Write an array of characters. This method cannot be inherited from the * Writer class because it must suppress I/O exceptions. */ + @Override public void write(char buf[]) throws IOException { write(buf, 0, buf.length); } @@ -308,6 +316,7 @@ * @param off Offset from which to start reading characters * @param len Number of characters to be written */ + @Override public void write(String s, int off, int len) throws IOException { ensureOpen(); if (bufferSize == 0) { @@ -333,6 +342,7 @@ * Write a string. This method cannot be inherited from the Writer class * because it must suppress I/O exceptions. */ + @Override public void write(String s) throws IOException { // Simple fix for Bugzilla 35410 // Calling the other write function so as to init the buffer anyways @@ -354,6 +364,7 @@ * @exception IOException If an I/O error occurs */ + @Override public void newLine() throws IOException { write(lineSeparator); } @@ -370,6 +381,7 @@ * * @param b The <code>boolean</code> to be printed */ + @Override public void print(boolean b) throws IOException { write(b ? "true" : "false"); } @@ -382,6 +394,7 @@ * * @param c The <code>char</code> to be printed */ + @Override public void print(char c) throws IOException { write(String.valueOf(c)); } @@ -395,6 +408,7 @@ * * @param i The <code>int</code> to be printed */ + @Override public void print(int i) throws IOException { write(String.valueOf(i)); } @@ -408,6 +422,7 @@ * * @param l The <code>long</code> to be printed */ + @Override public void print(long l) throws IOException { write(String.valueOf(l)); } @@ -421,6 +436,7 @@ * * @param f The <code>float</code> to be printed */ + @Override public void print(float f) throws IOException { write(String.valueOf(f)); } @@ -434,6 +450,7 @@ * * @param d The <code>double</code> to be printed */ + @Override public void print(double d) throws IOException { write(String.valueOf(d)); } @@ -448,6 +465,7 @@ * * @throws NullPointerException If <code>s</code> is <code>null</code> */ + @Override public void print(char s[]) throws IOException { write(s); } @@ -461,6 +479,7 @@ * * @param s The <code>String</code> to be printed */ + @Override public void print(String s) throws IOException { if (s == null) { s = "null"; @@ -477,6 +496,7 @@ * * @param obj The <code>Object</code> to be printed */ + @Override public void print(Object obj) throws IOException { write(String.valueOf(obj)); } @@ -493,6 +513,7 @@ * println() writes to the sink directly instead of through the * write method... */ + @Override public void println() throws IOException { newLine(); } @@ -502,6 +523,7 @@ * as though it invokes <code>{...@link #print(boolean)}</code> and then * <code>{...@link #println()}</code>. */ + @Override public void println(boolean x) throws IOException { print(x); println(); @@ -512,6 +534,7 @@ * though it invokes <code>{...@link #print(char)}</code> and then <code>{...@link * #println()}</code>. */ + @Override public void println(char x) throws IOException { print(x); println(); @@ -522,6 +545,7 @@ * though it invokes <code>{...@link #print(int)}</code> and then <code>{...@link * #println()}</code>. */ + @Override public void println(int x) throws IOException { print(x); println(); @@ -532,6 +556,7 @@ * as though it invokes <code>{...@link #print(long)}</code> and then * <code>{...@link #println()}</code>. */ + @Override public void println(long x) throws IOException { print(x); println(); @@ -542,6 +567,7 @@ * behaves as though it invokes <code>{...@link #print(float)}</code> and then * <code>{...@link #println()}</code>. */ + @Override public void println(float x) throws IOException { print(x); println(); @@ -552,6 +578,7 @@ * line. This method behaves as though it invokes <code>{...@link * #print(double)}</code> and then <code>{...@link #println()}</code>. */ + @Override public void println(double x) throws IOException { print(x); println(); @@ -562,6 +589,7 @@ * behaves as though it invokes <code>{...@link #print(char[])}</code> and then * <code>{...@link #println()}</code>. */ + @Override public void println(char x[]) throws IOException { print(x); println(); @@ -572,6 +600,7 @@ * though it invokes <code>{...@link #print(String)}</code> and then * <code>{...@link #println()}</code>. */ + @Override public void println(String x) throws IOException { print(x); println(); @@ -582,6 +611,7 @@ * though it invokes <code>{...@link #print(Object)}</code> and then * <code>{...@link #println()}</code>. */ + @Override public void println(Object x) throws IOException { print(x); println(); 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=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java (original) +++ tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java Thu Nov 5 01:16:53 2009 @@ -116,7 +116,8 @@ this.depth = -1; } - public void initialize(Servlet servlet, ServletRequest request, + @Override + public void initialize(Servlet servlet, ServletRequest request, ServletResponse response, String errorPageURL, boolean needsSession, int bufferSize, boolean autoFlush) throws IOException { @@ -173,7 +174,8 @@ isIncluded = request.getAttribute("javax.servlet.include.servlet_path") != null; } - public void release() { + @Override + public void release() { out = baseOut; try { if (isIncluded) { @@ -206,7 +208,8 @@ } } - public Object getAttribute(final String name) { + @Override + public Object getAttribute(final String name) { if (name == null) { throw new NullPointerException(Localizer @@ -230,7 +233,8 @@ return attributes.get(name); } - public Object getAttribute(final String name, final int scope) { + @Override + public Object getAttribute(final String name, final int scope) { if (name == null) { throw new NullPointerException(Localizer @@ -273,7 +277,8 @@ } } - public void setAttribute(final String name, final Object attribute) { + @Override + public void setAttribute(final String name, final Object attribute) { if (name == null) { throw new NullPointerException(Localizer @@ -300,7 +305,8 @@ } } - public void setAttribute(final String name, final Object o, final int scope) { + @Override + public void setAttribute(final String name, final Object o, final int scope) { if (name == null) { throw new NullPointerException(Localizer @@ -351,7 +357,8 @@ } } - public void removeAttribute(final String name, final int scope) { + @Override + public void removeAttribute(final String name, final int scope) { if (name == null) { throw new NullPointerException(Localizer @@ -396,7 +403,8 @@ } } - public int getAttributesScope(final String name) { + @Override + public int getAttributesScope(final String name) { if (name == null) { throw new NullPointerException(Localizer @@ -438,7 +446,8 @@ return 0; } - public Object findAttribute(final String name) { + @Override + public Object findAttribute(final String name) { if (SecurityUtil.isPackageProtectionEnabled()) { return AccessController.doPrivileged( new PrivilegedAction<Object>() { @@ -485,7 +494,8 @@ return context.getAttribute(name); } - public Enumeration<String> getAttributeNamesInScope(final int scope) { + @Override + public Enumeration<String> getAttributeNamesInScope(final int scope) { if (SecurityUtil.isPackageProtectionEnabled()) { return AccessController.doPrivileged( new PrivilegedAction<Enumeration<String>>() { @@ -521,7 +531,8 @@ } } - public void removeAttribute(final String name) { + @Override + public void removeAttribute(final String name) { if (name == null) { throw new NullPointerException(Localizer @@ -554,11 +565,13 @@ removeAttribute(name, APPLICATION_SCOPE); } - public JspWriter getOut() { + @Override + public JspWriter getOut() { return out; } - public HttpSession getSession() { + @Override + public HttpSession getSession() { return session; } @@ -566,19 +579,23 @@ return servlet; } - public ServletConfig getServletConfig() { + @Override + public ServletConfig getServletConfig() { return config; } - public ServletContext getServletContext() { + @Override + public ServletContext getServletContext() { return config.getServletContext(); } - public ServletRequest getRequest() { + @Override + public ServletRequest getRequest() { return request; } - public ServletResponse getResponse() { + @Override + public ServletResponse getResponse() { return response; } @@ -589,7 +606,8 @@ * * @return The Exception associated with this page context, if any. */ - public Exception getException() { + @Override + public Exception getException() { Throwable t = JspRuntimeLibrary.getThrowable(request); // Only wrap if needed @@ -600,7 +618,8 @@ return (Exception) t; } - public Object getPage() { + @Override + public Object getPage() { return servlet; } @@ -619,13 +638,15 @@ return path; } - public void include(String relativeUrlPath) throws ServletException, + @Override + public void include(String relativeUrlPath) throws ServletException, IOException { JspRuntimeLibrary .include(request, response, relativeUrlPath, out, true); } - public void include(final String relativeUrlPath, final boolean flush) + @Override + public void include(final String relativeUrlPath, final boolean flush) throws ServletException, IOException { if (SecurityUtil.isPackageProtectionEnabled()) { try { @@ -655,11 +676,13 @@ flush); } - public VariableResolver getVariableResolver() { + @Override + public VariableResolver getVariableResolver() { return new VariableResolverImpl(this.getELContext()); } - public void forward(final String relativeUrlPath) throws ServletException, + @Override + public void forward(final String relativeUrlPath) throws ServletException, IOException { if (SecurityUtil.isPackageProtectionEnabled()) { try { @@ -715,11 +738,13 @@ } } - public BodyContent pushBody() { + @Override + public BodyContent pushBody() { return (BodyContent) pushBody(null); } - public JspWriter pushBody(Writer writer) { + @Override + public JspWriter pushBody(Writer writer) { depth++; if (depth >= outs.length) { BodyContentImpl[] newOuts = new BodyContentImpl[depth + 1]; @@ -740,7 +765,8 @@ return outs[depth]; } - public JspWriter popBody() { + @Override + public JspWriter popBody() { depth--; if (depth >= 0) { out = outs[depth]; @@ -760,18 +786,21 @@ * Container must return a valid instance of an ExpressionEvaluator that can * parse EL expressions. */ - public ExpressionEvaluator getExpressionEvaluator() { + @Override + public ExpressionEvaluator getExpressionEvaluator() { return new ExpressionEvaluatorImpl(this.applicationContext.getExpressionFactory()); } - public void handlePageException(Exception ex) throws IOException, + @Override + public void handlePageException(Exception ex) throws IOException, ServletException { // Should never be called since handleException() called with a // Throwable in the generated servlet. handlePageException((Throwable) ex); } - public void handlePageException(final Throwable t) throws IOException, + @Override + public void handlePageException(final Throwable t) throws IOException, ServletException { if (t == null) throw new NullPointerException("null Throwable"); @@ -947,7 +976,8 @@ return retValue; } - public ELContext getELContext() { + @Override + public ELContext getELContext() { if (this.elContext == null) { this.elContext = this.applicationContext.createELContext(this); } Modified: tomcat/trunk/java/org/apache/jasper/runtime/PerThreadTagHandlerPool.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/PerThreadTagHandlerPool.java?rev=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/runtime/PerThreadTagHandlerPool.java (original) +++ tomcat/trunk/java/org/apache/jasper/runtime/PerThreadTagHandlerPool.java Thu Nov 5 01:16:53 2009 @@ -54,6 +54,7 @@ perThreadDataVector = new Vector<PerThreadData>(); } + @Override protected void init(ServletConfig config) { maxSize = Constants.MAX_POOL_SIZE; String maxSizeS = getOption(config, OPTION_MAXSIZE, null); @@ -65,6 +66,7 @@ } perThread = new ThreadLocal<PerThreadData>() { + @Override protected PerThreadData initialValue() { PerThreadData ptd = new PerThreadData(); ptd.handlers = new Tag[maxSize]; @@ -85,6 +87,7 @@ * * @throws JspException if a tag handler cannot be instantiated */ + @Override public Tag get(Class<? extends Tag> handlerClass) throws JspException { PerThreadData ptd = perThread.get(); if(ptd.current >=0 ) { @@ -105,6 +108,7 @@ * * @param handler Tag handler to add to this tag handler pool */ + @Override public void reuse(Tag handler) { PerThreadData ptd = perThread.get(); if (ptd.current < (ptd.handlers.length - 1)) { @@ -117,6 +121,7 @@ /** * Calls the release() method of all tag handlers in this tag handler pool. */ + @Override public void release() { Enumeration<PerThreadData> enumeration = perThreadDataVector.elements(); while (enumeration.hasMoreElements()) { 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=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java (original) +++ tomcat/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java Thu Nov 5 01:16:53 2009 @@ -185,6 +185,7 @@ * the short name of the function * @return the result of the method mapping. Null means no entry found. */ + @Override public Method resolveFunction(String prefix, String localName) { if (this.fnmap != null) { return this.fnmap.get(prefix + ":" + localName); Modified: tomcat/trunk/java/org/apache/jasper/runtime/ServletResponseWrapperInclude.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/ServletResponseWrapperInclude.java?rev=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/runtime/ServletResponseWrapperInclude.java (original) +++ tomcat/trunk/java/org/apache/jasper/runtime/ServletResponseWrapperInclude.java Thu Nov 5 01:16:53 2009 @@ -55,10 +55,12 @@ /** * Returns a wrapper around the JspWriter of the including page. */ + @Override public PrintWriter getWriter() throws IOException { return printWriter; } + @Override public ServletOutputStream getOutputStream() throws IOException { throw new IllegalStateException(); } @@ -67,6 +69,7 @@ * Clears the output buffer of the JspWriter associated with the including * page. */ + @Override public void resetBuffer() { try { jspWriter.clearBuffer(); Modified: tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java?rev=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java (original) +++ tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java Thu Nov 5 01:16:53 2009 @@ -57,6 +57,7 @@ * * @exception ClassNotFoundException if the class was not found */ + @Override public Class<?> loadClass(String name) throws ClassNotFoundException { return (loadClass(name, false)); @@ -87,6 +88,7 @@ * * @exception ClassNotFoundException if the class was not found */ + @Override public Class<?> loadClass(final String name, boolean resolve) throws ClassNotFoundException { @@ -136,6 +138,7 @@ * * @see java.lang.ClassLoader#getResourceAsStream(java.lang.String) */ + @Override public InputStream getResourceAsStream(String name) { InputStream is = parent.getResourceAsStream(name); if (is == null) { @@ -162,6 +165,7 @@ * @param codeSource Code source where the code was loaded from * @return PermissionCollection for CodeSource */ + @Override public final PermissionCollection getPermissions(CodeSource codeSource) { return permissionCollection; } Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java (original) +++ tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java Thu Nov 5 01:16:53 2009 @@ -69,6 +69,7 @@ /* * Initializes this JspServlet. */ + @Override public void init(ServletConfig config) throws ServletException { super.init(config); @@ -208,6 +209,7 @@ } + @Override public void service (HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { @@ -273,6 +275,7 @@ } + @Override public void destroy() { if (log.isDebugEnabled()) { log.debug("JspServlet.destroy()"); Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java?rev=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java (original) +++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java Thu Nov 5 01:16:53 2009 @@ -256,6 +256,7 @@ private StringWriter sw = new StringWriter(); private ByteArrayOutputStream bos = new ByteArrayOutputStream(); private ServletOutputStream sos = new ServletOutputStream() { + @Override public void write(int b) throws IOException { bos.write(b); } @@ -270,6 +271,7 @@ // TODO Auto-generated constructor stub } + @Override public PrintWriter getWriter() { if (isStreamUsed) throw new IllegalStateException("Unexpected internal error during <import>: " + @@ -278,6 +280,7 @@ return new PrintWriter(sw); } + @Override public ServletOutputStream getOutputStream() { if (isWriterUsed) throw new IllegalStateException("Unexpected internal error during <import>: " + @@ -287,19 +290,23 @@ } /** Has no effect. */ + @Override public void setContentType(String x) { // ignore } /** Has no effect. */ + @Override public void setLocale(Locale x) { // ignore } + @Override public void setStatus(int status) { this.status = status; } + @Override public int getStatus() { return status; } Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java?rev=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java (original) +++ tomcat/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java Thu Nov 5 01:16:53 2009 @@ -83,6 +83,7 @@ * * @exception IOException If an I/O error occurs */ + @Override public int read() throws IOException { int b0 = fInputStream.read(); if (b0 > 0x80) { @@ -106,6 +107,7 @@ * * @exception IOException If an I/O error occurs */ + @Override public int read(char ch[], int offset, int length) throws IOException { if (length > fBuffer.length) { length = fBuffer.length; @@ -132,6 +134,7 @@ * * @exception IOException If an I/O error occurs */ + @Override public long skip(long n) throws IOException { return fInputStream.skip(n); } // skip(long):long @@ -145,6 +148,7 @@ * * @exception IOException If an I/O error occurs */ + @Override public boolean ready() throws IOException { return false; } // ready() @@ -152,6 +156,7 @@ /** * Tell whether this stream supports the mark() operation. */ + @Override public boolean markSupported() { return fInputStream.markSupported(); } // markSupported() @@ -169,6 +174,7 @@ * @exception IOException If the stream does not support mark(), * or if some other I/O error occurs */ + @Override public void mark(int readAheadLimit) throws IOException { fInputStream.mark(readAheadLimit); } // mark(int) @@ -186,6 +192,7 @@ * or if the stream does not support reset(), * or if some other I/O error occurs */ + @Override public void reset() throws IOException { fInputStream.reset(); } // reset() @@ -197,7 +204,8 @@ * * @exception IOException If an I/O error occurs */ - public void close() throws IOException { + @Override + public void close() throws IOException { fInputStream.close(); } // close() Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/TreeNode.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/TreeNode.java?rev=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/xmlparser/TreeNode.java (original) +++ tomcat/trunk/java/org/apache/jasper/xmlparser/TreeNode.java Thu Nov 5 01:16:53 2009 @@ -294,6 +294,7 @@ /** * Return a String representation of this TreeNode. */ + @Override public String toString() { StringBuilder sb = new StringBuilder(); Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/UCSReader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/UCSReader.java?rev=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/xmlparser/UCSReader.java (original) +++ tomcat/trunk/java/org/apache/jasper/xmlparser/UCSReader.java Thu Nov 5 01:16:53 2009 @@ -110,6 +110,7 @@ * * @exception IOException If an I/O error occurs */ + @Override public int read() throws IOException { int b0 = fInputStream.read() & 0xff; if (b0 == 0xff) @@ -152,6 +153,7 @@ * * @exception IOException If an I/O error occurs */ + @Override public int read(char ch[], int offset, int length) throws IOException { int byteLength = length << ((fEncoding >= 4)?2:1); if (byteLength > fBuffer.length) { @@ -220,6 +222,7 @@ * * @exception IOException If an I/O error occurs */ + @Override public long skip(long n) throws IOException { // charWidth will represent the number of bits to move // n leftward to get num of bytes to skip, and then move the result rightward @@ -242,6 +245,7 @@ * * @exception IOException If an I/O error occurs */ + @Override public boolean ready() throws IOException { return false; } // ready() @@ -249,6 +253,7 @@ /** * Tell whether this stream supports the mark() operation. */ + @Override public boolean markSupported() { return fInputStream.markSupported(); } // markSupported() @@ -266,6 +271,7 @@ * @exception IOException If the stream does not support mark(), * or if some other I/O error occurs */ + @Override public void mark(int readAheadLimit) throws IOException { fInputStream.mark(readAheadLimit); } // mark(int) @@ -283,6 +289,7 @@ * or if the stream does not support reset(), * or if some other I/O error occurs */ + @Override public void reset() throws IOException { fInputStream.reset(); } // reset() @@ -294,7 +301,8 @@ * * @exception IOException If an I/O error occurs */ - public void close() throws IOException { + @Override + public void close() throws IOException { fInputStream.close(); } // close() Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java?rev=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java (original) +++ tomcat/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java Thu Nov 5 01:16:53 2009 @@ -95,6 +95,7 @@ * * @exception IOException If an I/O error occurs */ + @Override public int read() throws IOException { // decode character @@ -230,6 +231,7 @@ * * @exception IOException If an I/O error occurs */ + @Override public int read(char ch[], int offset, int length) throws IOException { // handle surrogate @@ -511,6 +513,7 @@ * * @exception IOException If an I/O error occurs */ + @Override public long skip(long n) throws IOException { long remaining = n; @@ -540,6 +543,7 @@ * * @exception IOException If an I/O error occurs */ + @Override public boolean ready() throws IOException { return false; } // ready() @@ -547,6 +551,7 @@ /** * Tell whether this stream supports the mark() operation. */ + @Override public boolean markSupported() { return false; } // markSupported() @@ -564,6 +569,7 @@ * @exception IOException If the stream does not support mark(), * or if some other I/O error occurs */ + @Override public void mark(int readAheadLimit) throws IOException { throw new IOException( Localizer.getMessage("jsp.error.xml.operationNotSupported", @@ -583,6 +589,7 @@ * or if the stream does not support reset(), * or if some other I/O error occurs */ + @Override public void reset() throws IOException { fOffset = 0; fSurrogate = -1; @@ -595,6 +602,7 @@ * * @exception IOException If an I/O error occurs */ + @Override public void close() throws IOException { fInputStream.close(); } // close() Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java?rev=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java (original) +++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java Thu Nov 5 01:16:53 2009 @@ -1092,6 +1092,7 @@ fOffset = fStartOffset; } + @Override public int read() throws IOException { int b = 0; if (fOffset < fLength) { @@ -1115,6 +1116,7 @@ return b & 0xff; } + @Override public int read(byte[] b, int off, int len) throws IOException { int bytesLeft = fLength - fOffset; if (bytesLeft == 0) { @@ -1148,6 +1150,7 @@ return len; } + @Override public long skip(long n) throws IOException { @@ -1182,6 +1185,7 @@ return fInputStream.skip(n) + bytesLeft; } + @Override public int available() throws IOException { int bytesLeft = fLength - fOffset; if (bytesLeft == 0) { @@ -1194,18 +1198,22 @@ return bytesLeft; } + @Override public void mark(int howMuch) { fMark = fOffset; } + @Override public void reset() { fOffset = fMark; } + @Override public boolean markSupported() { return true; } + @Override public void close() throws IOException { if (fInputStream != null) { fInputStream.close(); Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLString.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLString.java?rev=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLString.java (original) +++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLString.java Thu Nov 5 01:16:53 2009 @@ -190,6 +190,7 @@ // /** Returns a string representation of this object. */ + @Override public String toString() { return length > 0 ? new String(ch, offset, length) : ""; } // toString():String Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java?rev=832953&r1=832952&r2=832953&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java (original) +++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java Thu Nov 5 01:16:53 2009 @@ -105,6 +105,7 @@ // /** Clears the string buffer. */ + @Override public void clear() { offset = 0; length = 0; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
