You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jb...@apache.org on 2010/11/13 15:11:18 UTC
svn commit: r1034762 [1/2] - in /tomcat/taglibs/standard/trunk:
impl/src/main/java/org/apache/taglibs/standard/tag/common/core/
impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/
impl/src/main/java/org/apache/taglibs/standard/tag/common/sql...
Author: jboynes
Date: Sat Nov 13 14:11:15 2010
New Revision: 1034762
URL: http://svn.apache.org/viewvc?rev=1034762&view=rev
Log:
apply patch from Sebb for #50264 that adds @Override annotations
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OtherwiseTag.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OutSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RemoveTag.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/IfTag.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/SetTag.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/WhenTag.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/IfTag.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/WhenTag.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/IndexedValueExpression.java
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedValueExpression.java
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/functions/TestEndsWith.java
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test34109.java
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestSetTag.java
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test33054.java
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test43831.java
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test30068.java
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test35216.java
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java Sat Nov 13 14:11:15 2010
@@ -47,6 +47,7 @@ public class CatchTag extends TagSupport
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
super.release();
init();
@@ -67,6 +68,7 @@ public class CatchTag extends TagSupport
//*********************************************************************
// Tag logic
+ @Override
public int doStartTag() {
caught = false;
return EVAL_BODY_INCLUDE;
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java Sat Nov 13 14:11:15 2010
@@ -46,6 +46,7 @@ public class ChooseTag extends TagSuppor
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
super.release();
init();
@@ -87,6 +88,7 @@ public class ChooseTag extends TagSuppor
// Tag logic
// always include body
+ @Override
public int doStartTag() throws JspException {
subtagGateClosed = false; // when we start, no children have run
return EVAL_BODY_INCLUDE;
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java Sat Nov 13 14:11:15 2010
@@ -254,14 +254,17 @@ public abstract class ForEachSupport ext
// (We inherit semantics and Javadoc from LoopTagSupport.)
+ @Override
protected boolean hasNext() throws JspTagException {
return items.hasNext();
}
+ @Override
protected Object next() throws JspTagException {
return items.next();
}
+ @Override
protected void prepare() throws JspTagException {
// produce the right sort of ForEachIterator
if (rawItems != null) {
@@ -290,6 +293,7 @@ public abstract class ForEachSupport ext
// Tag logic and lifecycle management
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
super.release();
items = null;
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java Sat Nov 13 14:11:15 2010
@@ -69,6 +69,7 @@ public abstract class ForTokensSupport e
* We inherit semantics and Javadoc from LoopTagSupport.
*/
+ @Override
protected void prepare() throws JspTagException {
if (items instanceof ValueExpression) {
deferredExpression = (ValueExpression) items;
@@ -84,10 +85,12 @@ public abstract class ForTokensSupport e
}
}
+ @Override
protected boolean hasNext() throws JspTagException {
return st.hasMoreElements();
}
+ @Override
protected Object next() throws JspTagException {
if (deferredExpression!=null) {
st.nextElement();
@@ -108,6 +111,7 @@ public abstract class ForTokensSupport e
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
super.release();
items = delims = null;
@@ -118,6 +122,7 @@ public abstract class ForTokensSupport e
* Get the delimiter for string tokens. Used only for constructing
* the deferred expression for it.
*/
+ @Override
protected String getDelims() {
return delims;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java Sat Nov 13 14:11:15 2010
@@ -118,6 +118,7 @@ public abstract class ImportSupport exte
// Tag logic
// determines what kind of import and variable exposure to perform
+ @Override
public int doStartTag() throws JspException {
// Sanity check
if (context != null
@@ -151,6 +152,7 @@ public abstract class ImportSupport exte
}
// manages connections as necessary (creating or destroying)
+ @Override
public int doEndTag() throws JspException {
try {
// If we didn't expose a Reader earlier...
@@ -189,6 +191,7 @@ public abstract class ImportSupport exte
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
super.release();
@@ -386,6 +389,7 @@ public abstract class ImportSupport exte
super(request);
}
+ @Override
public String getMethod() {
return "GET";
}
@@ -428,7 +432,8 @@ public abstract class ImportSupport exte
/** A ServletOutputStream we convey, tied to this Writer. */
private ServletOutputStream sos = new ServletOutputStream() {
- public void write(int b) throws IOException {
+ @Override
+ public void write(int b) throws IOException {
bos.write(b);
}
};
@@ -451,7 +456,8 @@ public abstract class ImportSupport exte
}
/** Returns a Writer designed to buffer the output. */
- public PrintWriter getWriter() {
+ @Override
+ public PrintWriter getWriter() {
if (isStreamUsed)
throw new IllegalStateException(
Resources.getMessage("IMPORT_ILLEGAL_STREAM"));
@@ -460,7 +466,8 @@ public abstract class ImportSupport exte
}
/** Returns a ServletOutputStream designed to buffer the output. */
- public ServletOutputStream getOutputStream() {
+ @Override
+ public ServletOutputStream getOutputStream() {
if (isWriterUsed)
throw new IllegalStateException(
Resources.getMessage("IMPORT_ILLEGAL_WRITER"));
@@ -469,16 +476,19 @@ public abstract class ImportSupport exte
}
/** Has no effect. */
- public void setContentType(String x) {
+ @Override
+ public void setContentType(String x) {
// ignore
}
/** Has no effect. */
- public void setLocale(Locale x) {
+ @Override
+ public void setLocale(Locale x) {
// ignore
}
- public void setStatus(int status) {
+ @Override
+ public void setStatus(int status) {
this.status = status;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OtherwiseTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OtherwiseTag.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OtherwiseTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OtherwiseTag.java Sat Nov 13 14:11:15 2010
@@ -32,6 +32,7 @@ public class OtherwiseTag extends WhenTa
*/
// Don't let the condition stop us... :-)
+ @Override
protected boolean condition() {
return true;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OutSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OutSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OutSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OutSupport.java Sat Nov 13 14:11:15 2010
@@ -59,6 +59,7 @@ public abstract class OutSupport extends
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
output = null;
super.release();
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java Sat Nov 13 14:11:15 2010
@@ -68,6 +68,7 @@ public abstract class ParamSupport exten
// Tag logic
// simply send our name and value to our appropriate ancestor
+ @Override
public int doEndTag() throws JspException {
Tag t = findAncestorWithClass(this, ParamParent.class);
if (t == null)
@@ -101,6 +102,7 @@ public abstract class ParamSupport exten
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java Sat Nov 13 14:11:15 2010
@@ -86,6 +86,7 @@ public abstract class RedirectSupport ex
// Tag logic
// resets any parameters that might be sent
+ @Override
public int doStartTag() throws JspException {
params = new ParamSupport.ParamManager();
return EVAL_BODY_BUFFERED;
@@ -93,6 +94,7 @@ public abstract class RedirectSupport ex
// gets the right value, encodes it, and prints or stores it
+ @Override
public int doEndTag() throws JspException {
String result; // the eventual result
@@ -117,6 +119,7 @@ public abstract class RedirectSupport ex
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RemoveTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RemoveTag.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RemoveTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RemoveTag.java Sat Nov 13 14:11:15 2010
@@ -58,6 +58,7 @@ public class RemoveTag extends TagSuppor
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
super.release();
init();
@@ -68,6 +69,7 @@ public class RemoveTag extends TagSuppor
// Tag logic
// removes the variable (from a specific scope, if specified)
+ @Override
public int doEndTag() throws JspException {
if (!scopeSpecified)
pageContext.removeAttribute(var);
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java Sat Nov 13 14:11:15 2010
@@ -68,6 +68,7 @@ public abstract class SetSupport extends
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
var = null;
scope = null;
@@ -78,6 +79,7 @@ public abstract class SetSupport extends
//*********************************************************************
// Tag logic
+ @Override
public int doEndTag() throws JspException {
// decide what to do with the result
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java Sat Nov 13 14:11:15 2010
@@ -90,6 +90,7 @@ public abstract class UrlSupport extends
// Tag logic
// resets any parameters that might be sent
+ @Override
public int doStartTag() throws JspException {
params = new ParamSupport.ParamManager();
return EVAL_BODY_BUFFERED;
@@ -97,6 +98,7 @@ public abstract class UrlSupport extends
// gets the right value, encodes it, and prints or stores it
+ @Override
public int doEndTag() throws JspException {
String result; // the eventual result
@@ -126,6 +128,7 @@ public abstract class UrlSupport extends
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java Sat Nov 13 14:11:15 2010
@@ -49,6 +49,7 @@ public abstract class WhenTagSupport ext
* ChooseTag wants it to do so. The condition will not even be
* evaluated if ChooseTag instructs us not to run.
*/
+ @Override
public int doStartTag() throws JspException {
Tag parent;
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java Sat Nov 13 14:11:15 2010
@@ -92,11 +92,13 @@ public abstract class BundleSupport exte
//*********************************************************************
// Tag logic
+ @Override
public int doStartTag() throws JspException {
locCtxt = getLocalizationContext(pageContext, basename);
return EVAL_BODY_BUFFERED;
}
+ @Override
public int doEndTag() throws JspException {
if (bodyContent != null) {
try {
@@ -110,6 +112,7 @@ public abstract class BundleSupport exte
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
super.release();
init();
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java Sat Nov 13 14:11:15 2010
@@ -114,6 +114,7 @@ public abstract class FormatDateSupport
/*
* Formats the given date and time.
*/
+ @Override
public int doEndTag() throws JspException {
String formatted = null;
@@ -176,6 +177,7 @@ public abstract class FormatDateSupport
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java Sat Nov 13 14:11:15 2010
@@ -122,6 +122,7 @@ public abstract class FormatNumberSuppor
//*********************************************************************
// Tag logic
+ @Override
public int doEndTag() throws JspException {
String formatted = null;
Object input = null;
@@ -212,6 +213,7 @@ public abstract class FormatNumberSuppor
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java Sat Nov 13 14:11:15 2010
@@ -113,11 +113,13 @@ public abstract class MessageSupport ext
//*********************************************************************
// Tag logic
+ @Override
public int doStartTag() throws JspException {
params.clear();
return EVAL_BODY_BUFFERED;
}
+ @Override
public int doEndTag() throws JspException {
String key = null;
@@ -211,6 +213,7 @@ public abstract class MessageSupport ext
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java Sat Nov 13 14:11:15 2010
@@ -60,6 +60,7 @@ public abstract class ParamSupport exten
// Tag logic
// Supply our value to our parent <fmt:message> tag
+ @Override
public int doEndTag() throws JspException {
Tag t = findAncestorWithClass(this, MessageSupport.class);
if (t == null) {
@@ -89,6 +90,7 @@ public abstract class ParamSupport exten
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java Sat Nov 13 14:11:15 2010
@@ -103,6 +103,7 @@ public abstract class ParseDateSupport e
//*********************************************************************
// Tag logic
+ @Override
public int doEndTag() throws JspException {
String input = null;
@@ -197,6 +198,7 @@ public abstract class ParseDateSupport e
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java Sat Nov 13 14:11:15 2010
@@ -100,6 +100,7 @@ public abstract class ParseNumberSupport
//*********************************************************************
// Tag logic
+ @Override
public int doEndTag() throws JspException {
String input = null;
@@ -174,6 +175,7 @@ public abstract class ParseNumberSupport
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java Sat Nov 13 14:11:15 2010
@@ -75,6 +75,7 @@ public abstract class RequestEncodingSup
//*********************************************************************
// Tag logic
+ @Override
public int doEndTag() throws JspException {
charEncoding = value;
if ((charEncoding == null)
@@ -105,6 +106,7 @@ public abstract class RequestEncodingSup
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java Sat Nov 13 14:11:15 2010
@@ -77,6 +77,7 @@ public abstract class SetBundleSupport e
//*********************************************************************
// Tag logic
+ @Override
public int doEndTag() throws JspException {
LocalizationContext locCtxt =
BundleSupport.getLocalizationContext(pageContext, basename);
@@ -92,6 +93,7 @@ public abstract class SetBundleSupport e
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java Sat Nov 13 14:11:15 2010
@@ -90,6 +90,7 @@ public abstract class SetLocaleSupport e
//*********************************************************************
// Tag logic
+ @Override
public int doEndTag() throws JspException {
Locale locale = null;
@@ -112,6 +113,7 @@ public abstract class SetLocaleSupport e
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java Sat Nov 13 14:11:15 2010
@@ -79,6 +79,7 @@ public abstract class SetTimeZoneSupport
//*********************************************************************
// Tag logic
+ @Override
public int doEndTag() throws JspException {
TimeZone timeZone = null;
@@ -104,6 +105,7 @@ public abstract class SetTimeZoneSupport
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java Sat Nov 13 14:11:15 2010
@@ -73,6 +73,7 @@ public abstract class TimeZoneSupport ex
//*********************************************************************
// Tag logic
+ @Override
public int doStartTag() throws JspException {
if (value == null) {
@@ -90,6 +91,7 @@ public abstract class TimeZoneSupport ex
return EVAL_BODY_BUFFERED;
}
+ @Override
public int doEndTag() throws JspException {
try {
pageContext.getOut().print(bodyContent.getString());
@@ -101,6 +103,7 @@ public abstract class TimeZoneSupport ex
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java Sat Nov 13 14:11:15 2010
@@ -65,6 +65,7 @@ public abstract class DateParamTagSuppor
//*********************************************************************
// Tag logic
+ @Override
public int doEndTag() throws JspException {
SQLExecutionTag parent = (SQLExecutionTag)
findAncestorWithClass(this, SQLExecutionTag.class);
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java Sat Nov 13 14:11:15 2010
@@ -37,6 +37,7 @@ public abstract class ParamTagSupport ex
//*********************************************************************
// Tag logic
+ @Override
public int doEndTag() throws JspException {
SQLExecutionTag parent = (SQLExecutionTag)
findAncestorWithClass(this, SQLExecutionTag.class);
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java Sat Nov 13 14:11:15 2010
@@ -138,6 +138,7 @@ public abstract class QueryTagSupport ex
* Prepares for execution by setting the initial state, such as
* getting the <code>Connection</code>
*/
+ @Override
public int doStartTag() throws JspException {
if (!maxRowsSpecified) {
@@ -181,6 +182,7 @@ public abstract class QueryTagSupport ex
* element, or is retrieved from a JSP scope attribute
* named <code>javax.servlet.jstl.sql.dataSource</code>.
*/
+ @Override
public int doEndTag() throws JspException {
/*
* Use the SQL statement specified by the sql attribute, if any,
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java Sat Nov 13 14:11:15 2010
@@ -85,6 +85,7 @@ public class SetDataSourceTagSupport ext
//*********************************************************************
// Tag logic
+ @Override
public int doStartTag() throws JspException {
DataSource ds;
@@ -124,6 +125,7 @@ public class SetDataSourceTagSupport ext
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java Sat Nov 13 14:11:15 2010
@@ -87,6 +87,7 @@ public abstract class TransactionTagSupp
* getting the <code>Connection</code> and preparing it for
* the transaction.
*/
+ @Override
public int doStartTag() throws JspException {
if ((rawDataSource == null) && dataSourceSpecified) {
@@ -121,6 +122,7 @@ public abstract class TransactionTagSupp
/**
* Commits the transaction.
*/
+ @Override
public int doEndTag() throws JspException {
try {
conn.commit();
@@ -168,6 +170,7 @@ public abstract class TransactionTagSupp
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
dataSourceSpecified = false;
rawDataSource = null;
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java Sat Nov 13 14:11:15 2010
@@ -110,6 +110,7 @@ public abstract class UpdateTagSupport e
* Prepares for execution by setting the initial state, such as
* getting the <code>Connection</code>
*/
+ @Override
public int doStartTag() throws JspException {
try {
@@ -134,6 +135,7 @@ public abstract class UpdateTagSupport e
* element, or is retrieved from a JSP scope attribute
* named <code>javax.servlet.jsp.jstl.sql.dataSource</code>.
*/
+ @Override
public int doEndTag() throws JspException {
/*
* Use the SQL statement specified by the sql attribute, if any,
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java Sat Nov 13 14:11:15 2010
@@ -63,6 +63,7 @@ public abstract class ExprSupport extend
// Tag logic
// applies XPath expression from 'select' and prints the result
+ @Override
public int doStartTag() throws JspException {
try {
XPathUtil xu = new XPathUtil(pageContext);
@@ -75,6 +76,7 @@ public abstract class ExprSupport extend
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
super.release();
init();
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java Sat Nov 13 14:11:15 2010
@@ -45,16 +45,19 @@ public class ForEachTag extends LoopTagS
// (We inherit semantics and Javadoc from LoopTagSupport.)
+ @Override
protected void prepare() throws JspTagException {
nodesIndex = 0;
XPathUtil xu = new XPathUtil(pageContext);
nodes = xu.selectNodes(XPathUtil.getContext(this), select);
}
+ @Override
protected boolean hasNext() throws JspTagException {
return (nodesIndex < nodes.size());
}
+ @Override
protected Object next() throws JspTagException {
Object o = nodes.get(nodesIndex++);
if (!(o instanceof org.w3c.dom.Node))
@@ -69,6 +72,7 @@ public class ForEachTag extends LoopTagS
// Tag logic and lifecycle management
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
super.release();
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/IfTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/IfTag.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/IfTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/IfTag.java Sat Nov 13 14:11:15 2010
@@ -38,6 +38,7 @@ public class IfTag extends ConditionalTa
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
super.release();
init();
@@ -47,6 +48,7 @@ public class IfTag extends ConditionalTa
//*********************************************************************
// Supplied conditional logic
+ @Override
protected boolean condition() throws JspTagException {
XPathUtil xu = new XPathUtil(pageContext);
return (xu.booleanValueOf(XPathUtil.getContext(this), select));
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java Sat Nov 13 14:11:15 2010
@@ -58,6 +58,7 @@ public abstract class ParamSupport exten
// Tag logic
// simply send our name and value to our parent <transform> tag
+ @Override
public int doEndTag() throws JspException {
Tag t = findAncestorWithClass(this, TransformSupport.class);
if (t == null)
@@ -77,6 +78,7 @@ public abstract class ParamSupport exten
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java Sat Nov 13 14:11:15 2010
@@ -103,6 +103,7 @@ public abstract class ParseSupport exten
// Tag logic
// parse 'source' or body, storing result in 'var'
+ @Override
public int doEndTag() throws JspException {
try {
@@ -163,6 +164,7 @@ public abstract class ParseSupport exten
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
init();
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/SetTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/SetTag.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/SetTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/SetTag.java Sat Nov 13 14:11:15 2010
@@ -64,6 +64,7 @@ public class SetTag extends TagSupport {
// Tag logic
// applies XPath expression from 'select' and stores the result in 'var'
+ @Override
public int doStartTag() throws JspException {
// process the query
XPathUtil xu = new XPathUtil(pageContext);
@@ -85,6 +86,7 @@ public class SetTag extends TagSupport {
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
super.release();
init();
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java Sat Nov 13 14:11:15 2010
@@ -113,12 +113,14 @@ public abstract class TransformSupport e
//*********************************************************************
// Tag logic
+ @Override
public int doStartTag() throws JspException {
// set up transformer in the start tag so that nested <param> tags can set parameters directly
t = getTransformer(xslt, xsltSystemId);
return EVAL_BODY_BUFFERED;
}
+ @Override
public int doEndTag() throws JspException {
Source source = xmlSpecified ? getSourceFromXmlAttribute() : getDocumentFromBodyContent();
@@ -148,6 +150,7 @@ public abstract class TransformSupport e
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
super.release();
init();
@@ -339,12 +342,15 @@ public abstract class TransformSupport e
this.w = w;
}
+ @Override
public void close() {
}
+ @Override
public void flush() {
}
+ @Override
public void write(char[] cbuf, int off, int len) throws IOException {
w.write(cbuf, off, len);
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/WhenTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/WhenTag.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/WhenTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/WhenTag.java Sat Nov 13 14:11:15 2010
@@ -39,6 +39,7 @@ public class WhenTag extends WhenTagSupp
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
super.release();
init();
@@ -48,6 +49,7 @@ public class WhenTag extends WhenTagSupp
//*********************************************************************
// Supplied conditional logic
+ @Override
protected boolean condition() throws JspTagException {
XPathUtil xu = new XPathUtil(pageContext);
return (xu.booleanValueOf(XPathUtil.getContext(this), select));
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java Sat Nov 13 14:11:15 2010
@@ -218,6 +218,7 @@ public class XPathUtil {
* (from xalan: which must be passed in order to lazy evaluate variables.)
* @param qname The qualified name of the variable.
*/
+ @Override
public XObject getVariableOrParam(
XPathContext xctxt,
org.apache.xml.utils.QName qname)
@@ -867,10 +868,12 @@ class JSTLNodeList extends Vector implem
return (Node)nodeVector.elementAt( index );
}
+ @Override
public Object elementAt ( int index ) {
return nodeVector.elementAt( index );
}
+ @Override
public Object get ( int index ) {
return nodeVector.get( index );
}
@@ -879,6 +882,7 @@ class JSTLNodeList extends Vector implem
return nodeVector.size( );
}
+ @Override
public int size ( ) {
//System.out.println("JSTL node list size => " + nodeVector.size() );
return nodeVector.size( );
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/IfTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/IfTag.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/IfTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/IfTag.java Sat Nov 13 14:11:15 2010
@@ -40,6 +40,7 @@ public class IfTag extends ConditionalTa
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
super.release();
init();
@@ -49,6 +50,7 @@ public class IfTag extends ConditionalTa
//*********************************************************************
// Supplied conditional logic
+ @Override
protected boolean condition() {
return test;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/WhenTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/WhenTag.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/WhenTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/WhenTag.java Sat Nov 13 14:11:15 2010
@@ -37,6 +37,7 @@ public class WhenTag extends WhenTagSupp
}
// Releases any resources we may have (or inherit)
+ @Override
public void release() {
super.release();
init();
@@ -46,6 +47,7 @@ public class WhenTag extends WhenTagSupp
//*********************************************************************
// Supplied conditional logic
+ @Override
protected boolean condition() {
return test;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java Sat Nov 13 14:11:15 2010
@@ -44,10 +44,12 @@ public class TransactionTag extends Tran
/**
* Setter method for the Transaction Isolation level.
*/
+ @Override
public void setIsolation(String isolation) {
this.isolationRT = isolation;
}
+ @Override
public int doStartTag() throws JspException {
if (isolationRT != null)
super.setIsolation(isolationRT);
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java Sat Nov 13 14:11:15 2010
@@ -33,6 +33,7 @@ import javax.servlet.jsp.tagext.Variable
public class DeclareTEI extends TagExtraInfo {
// purposely inherit JavaDoc and semantics from TagExtraInfo
+ @Override
public VariableInfo[] getVariableInfo(TagData data) {
// construct the relevant VariableInfo object
VariableInfo id = new VariableInfo(
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java Sat Nov 13 14:11:15 2010
@@ -37,6 +37,7 @@ public class ForEachTEI extends TagExtra
*
* - If 'items' is not specified, 'begin' and 'end' must be
*/
+ @Override
public boolean isValid(TagData us) {
if (!Util.isSpecified(us, ITEMS))
if (!Util.isSpecified(us, BEGIN) || !(Util.isSpecified(us, END)))
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java Sat Nov 13 14:11:15 2010
@@ -31,6 +31,7 @@ public class ImportTEI extends TagExtraI
final private static String VAR = "var";
final private static String VAR_READER = "varReader";
+ @Override
public boolean isValid(TagData us) {
// don't allow both VAR and VAR_READER, together
if (Util.isSpecified(us, VAR) && Util.isSpecified(us, VAR_READER))
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java Sat Nov 13 14:11:15 2010
@@ -33,6 +33,7 @@ public class XmlParseTEI extends TagExtr
final private static String SCOPE = "scope";
final private static String SCOPE_DOM = "scopeDom";
+ @Override
public boolean isValid(TagData us) {
// must have no more than one of VAR and VAR_DOM ...
if (Util.isSpecified(us, VAR) && Util.isSpecified(us, VAR_DOM))
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java Sat Nov 13 14:11:15 2010
@@ -32,6 +32,7 @@ public class XmlTransformTEI extends Tag
final private static String RESULT = "result";
final private static String VAR = "var";
+ @Override
public boolean isValid(TagData us) {
// require XSLT
if (!Util.isSpecified(us, XSLT))
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java Sat Nov 13 14:11:15 2010
@@ -111,6 +111,7 @@ public abstract class JstlBaseTLV extend
config = null;
}
+ @Override
public void release() {
super.release();
init();
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java Sat Nov 13 14:11:15 2010
@@ -92,6 +92,7 @@ public class JstlCoreTLV extends JstlBas
//*********************************************************************
// set its type and delegate validation to super-class
+ @Override
public ValidationMessage[] validate(
String prefix, String uri, PageData page) {
return super.validate( TYPE_CORE, prefix, uri, page );
@@ -101,6 +102,7 @@ public class JstlCoreTLV extends JstlBas
//*********************************************************************
// Contract fulfillment
+ @Override
protected DefaultHandler getHandler() {
return new Handler();
}
@@ -123,7 +125,8 @@ public class JstlCoreTLV extends JstlBas
private boolean bodyIllegal = false;
// process under the existing context (state), then modify it
- public void startElement(
+ @Override
+ public void startElement(
String ns, String ln, String qn, Attributes a) {
// substitute our own parsed 'ln' if it's not provided
@@ -254,7 +257,8 @@ public class JstlCoreTLV extends JstlBas
depth++;
}
- public void characters(char[] ch, int start, int length) {
+ @Override
+ public void characters(char[] ch, int start, int length) {
bodyNecessary = false; // body is no longer necessary!
@@ -284,7 +288,8 @@ public class JstlCoreTLV extends JstlBas
}
}
- public void endElement(String ns, String ln, String qn) {
+ @Override
+ public void endElement(String ns, String ln, String qn) {
// consistently, we ignore JSP_TEXT
if (isJspTag(ns, ln, TEXT))
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java Sat Nov 13 14:11:15 2010
@@ -92,6 +92,7 @@ public class JstlFmtTLV extends JstlBase
//*********************************************************************
// set its type and delegate validation to super-class
+ @Override
public ValidationMessage[] validate(
String prefix, String uri, PageData page) {
return super.validate( TYPE_FMT, prefix, uri, page );
@@ -101,6 +102,7 @@ public class JstlFmtTLV extends JstlBase
//*********************************************************************
// Contract fulfillment
+ @Override
protected DefaultHandler getHandler() {
return new Handler();
}
@@ -120,7 +122,8 @@ public class JstlFmtTLV extends JstlBase
private boolean bodyIllegal = false;
// process under the existing context (state), then modify it
- public void startElement(
+ @Override
+ public void startElement(
String ns, String ln, String qn, Attributes a) {
// substitute our own parsed 'ln' if it's not provided
@@ -217,7 +220,8 @@ public class JstlFmtTLV extends JstlBase
depth++;
}
- public void characters(char[] ch, int start, int length) {
+ @Override
+ public void characters(char[] ch, int start, int length) {
bodyNecessary = false; // body is no longer necessary!
@@ -232,7 +236,8 @@ public class JstlFmtTLV extends JstlBase
lastElementName));
}
- public void endElement(String ns, String ln, String qn) {
+ @Override
+ public void endElement(String ns, String ln, String qn) {
// consistently, we ignore JSP_TEXT
if (qn.equals(JSP_TEXT))
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java Sat Nov 13 14:11:15 2010
@@ -54,6 +54,7 @@ public class JstlSqlTLV extends JstlBase
//*********************************************************************
// set its type and delegate validation to super-class
+ @Override
public ValidationMessage[] validate(
String prefix, String uri, PageData page) {
return super.validate( TYPE_SQL, prefix, uri, page );
@@ -63,6 +64,7 @@ public class JstlSqlTLV extends JstlBase
//*********************************************************************
// Contract fulfillment
+ @Override
protected DefaultHandler getHandler() {
return new Handler();
}
@@ -84,7 +86,8 @@ public class JstlSqlTLV extends JstlBase
private boolean bodyIllegal = false;
// process under the existing context (state), then modify it
- public void startElement(
+ @Override
+ public void startElement(
String ns, String ln, String qn, Attributes a) {
// substitute our own parsed 'ln' if it's not provided
@@ -185,7 +188,8 @@ public class JstlSqlTLV extends JstlBase
depth++;
}
- public void characters(char[] ch, int start, int length) {
+ @Override
+ public void characters(char[] ch, int start, int length) {
bodyNecessary = false; // body is no longer necessary!
@@ -199,7 +203,8 @@ public class JstlSqlTLV extends JstlBase
fail(Resources.getMessage("TLV_ILLEGAL_BODY", lastElementName));
}
- public void endElement(String ns, String ln, String qn) {
+ @Override
+ public void endElement(String ns, String ln, String qn) {
// consistently, we ignore JSP_TEXT
if (qn.equals(JSP_TEXT))
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java Sat Nov 13 14:11:15 2010
@@ -87,6 +87,7 @@ public class JstlXmlTLV extends JstlBase
//*********************************************************************
// set its type and delegate validation to super-class
+ @Override
public ValidationMessage[] validate(
String prefix, String uri, PageData page) {
return super.validate( TYPE_XML, prefix, uri, page );
@@ -96,6 +97,7 @@ public class JstlXmlTLV extends JstlBase
//*********************************************************************
// Contract fulfillment
+ @Override
protected DefaultHandler getHandler() {
return new Handler();
}
@@ -118,7 +120,8 @@ public class JstlXmlTLV extends JstlBase
private Stack transformWithSource = new Stack();
// process under the existing context (state), then modify it
- public void startElement(
+ @Override
+ public void startElement(
String ns, String ln, String qn, Attributes a) {
// substitute our own parsed 'ln' if it's not provided
@@ -232,7 +235,8 @@ public class JstlXmlTLV extends JstlBase
depth++;
}
- public void characters(char[] ch, int start, int length) {
+ @Override
+ public void characters(char[] ch, int start, int length) {
bodyNecessary = false; // body is no longer necessary!
@@ -262,7 +266,8 @@ public class JstlXmlTLV extends JstlBase
}
}
- public void endElement(String ns, String ln, String qn) {
+ @Override
+ public void endElement(String ns, String ln, String qn) {
// consistently, we ignore JSP_TEXT
if (qn.equals(JSP_TEXT))
Modified: tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java Sat Nov 13 14:11:15 2010
@@ -27,11 +27,13 @@ public class VersionTest
super(name);
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
version = new Version();
}
+ @Override
protected void tearDown() throws Exception {
version = null;
super.tearDown();
Modified: tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java (original)
+++ tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java Sat Nov 13 14:11:15 2010
@@ -79,6 +79,7 @@ public abstract class ConditionalTagSupp
/**
* Includes its body if <tt>condition()</tt> evaluates to true.
*/
+ @Override
public int doStartTag() throws JspException {
// execute our condition() method once per invocation
@@ -97,6 +98,7 @@ public abstract class ConditionalTagSupp
/**
* Releases any resources this ConditionalTagSupport may have (or inherit).
*/
+ @Override
public void release() {
super.release();
init();
Modified: tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/IndexedValueExpression.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/IndexedValueExpression.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/IndexedValueExpression.java (original)
+++ tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/IndexedValueExpression.java Sat Nov 13 14:11:15 2010
@@ -53,6 +53,7 @@ public final class IndexedValueExpressio
this.i = i;
}
+ @Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
@@ -61,34 +62,42 @@ public final class IndexedValueExpressio
return i.equals(that.i) && orig.equals(that.orig);
}
+ @Override
public Class getExpectedType() {
return orig.getExpectedType();
}
+ @Override
public String getExpressionString() {
return orig.getExpressionString();
}
+ @Override
public Class getType(ELContext elContext) {
return elContext.getELResolver().getType(elContext, orig.getValue(elContext), i);
}
+ @Override
public Object getValue(ELContext elContext) {
return elContext.getELResolver().getValue(elContext, orig.getValue(elContext), i);
}
+ @Override
public int hashCode() {
return orig.hashCode()+i;
}
+ @Override
public boolean isLiteralText() {
return false;
}
+ @Override
public boolean isReadOnly(ELContext elContext) {
return elContext.getELResolver().isReadOnly(elContext, orig.getValue(elContext), i);
}
+ @Override
public void setValue(ELContext elContext, Object arg1) {
elContext.getELResolver().setValue(elContext, orig.getValue(elContext), i, arg1);
}
Modified: tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedValueExpression.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedValueExpression.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedValueExpression.java (original)
+++ tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedValueExpression.java Sat Nov 13 14:11:15 2010
@@ -39,6 +39,7 @@ public final class IteratedValueExpressi
this.i = i;
}
+ @Override
public boolean equals(Object obj) {
if (this == obj) return true;
if (obj == null || getClass() != obj.getClass()) return false;
@@ -47,34 +48,42 @@ public final class IteratedValueExpressi
return i == that.i && iteratedExpression.equals(that.iteratedExpression);
}
+ @Override
public Class getExpectedType() {
return iteratedExpression.getValueExpression().getExpectedType();
}
+ @Override
public String getExpressionString() {
return iteratedExpression.getValueExpression().getExpressionString();
}
+ @Override
public Class getType(ELContext elContext) {
return iteratedExpression.getValueExpression().getType(elContext);
}
+ @Override
public Object getValue(ELContext elContext) {
return iteratedExpression.getItem(elContext, i);
}
+ @Override
public int hashCode() {
return iteratedExpression.hashCode()+i;
}
+ @Override
public boolean isLiteralText() {
return false;
}
+ @Override
public boolean isReadOnly(ELContext elContext) {
return true;
}
+ @Override
public void setValue(ELContext elContext, Object arg1) {
}
Modified: tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java (original)
+++ tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java Sat Nov 13 14:11:15 2010
@@ -209,6 +209,7 @@ public abstract class LoopTagSupport
/**
* Releases any resources this LoopTagSupport may have (or inherit).
*/
+ @Override
public void release() {
super.release();
init();
@@ -217,6 +218,7 @@ public abstract class LoopTagSupport
/**
* Begins iterating by processing the first item.
*/
+ @Override
public int doStartTag() throws JspException {
if (end != -1 && begin > end) {
// JSTL 1.1. We simply do not execute the loop.
@@ -257,6 +259,7 @@ public abstract class LoopTagSupport
* Continues the iteration when appropriate -- that is, if we (a) have
* more items and (b) don't run over our 'end' (given our 'step').
*/
+ @Override
public int doAfterBody() throws JspException {
// re-sync the index, given our prior behind-the-scenes 'step'
Modified: tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java (original)
+++ tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java Sat Nov 13 14:11:15 2010
@@ -84,6 +84,7 @@ public class PermittedTaglibsTLV extends
permittedTaglibs = null;
}
+ @Override
public void release() {
super.release();
init();
@@ -93,6 +94,7 @@ public class PermittedTaglibsTLV extends
//*********************************************************************
// Validation entry point
+ @Override
public synchronized ValidationMessage[] validate(
String prefix, String uri, PageData page) {
try {
@@ -164,6 +166,7 @@ public class PermittedTaglibsTLV extends
private class PermittedTaglibsHandler extends DefaultHandler {
// if the element is <jsp:root>, check its "xmlns:" attributes
+ @Override
public void startElement(
String ns, String ln, String qn, Attributes a) {
Modified: tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java (original)
+++ tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java Sat Nov 13 14:11:15 2010
@@ -77,7 +77,8 @@ public class ScriptFreeTLV extends TagLi
* @param initParms a mapping from the names of the initialization parameters
* to their values, as specified in the TLD.
*/
- public void setInitParameters (Map<java.lang.String, java.lang.Object> initParms) {
+ @Override
+public void setInitParameters (Map<java.lang.String, java.lang.Object> initParms) {
super.setInitParameters(initParms);
String declarationsParm = (String) initParms.get("allowDeclarations");
String scriptletsParm = (String) initParms.get("allowScriptlets");
@@ -101,7 +102,8 @@ public class ScriptFreeTLV extends TagLi
* @return null, if the page is valid; otherwise, a ValidationMessage[]
* containing one or more messages indicating why the page is not valid.
*/
- public ValidationMessage[] validate
+ @Override
+public ValidationMessage[] validate
(String prefix, String uri, PageData page) {
InputStream in = null;
SAXParser parser;
@@ -150,6 +152,7 @@ public class ScriptFreeTLV extends TagLi
* which attributes actually support request-time attribute values
* and checking only those is far more trouble than it's worth.)
*/
+ @Override
public void startElement (String namespaceUri,
String localName, String qualifiedName,
Attributes atts) {
Modified: tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/functions/TestEndsWith.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/functions/TestEndsWith.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/functions/TestEndsWith.java (original)
+++ tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/functions/TestEndsWith.java Sat Nov 13 14:11:15 2010
@@ -28,10 +28,12 @@ public class TestEndsWith
super(name);
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
}
Modified: tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test34109.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test34109.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test34109.java (original)
+++ tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test34109.java Sat Nov 13 14:11:15 2010
@@ -27,10 +27,12 @@ public class Test34109 extends JspTestCa
super(name);
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
}
Modified: tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java (original)
+++ tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java Sat Nov 13 14:11:15 2010
@@ -29,10 +29,12 @@ public class Test37466 extends JspTestCa
super(name);
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org