Author: markt
Date: Thu Nov 5 01:19:20 2009
New Revision: 832955
URL: http://svn.apache.org/viewvc?rev=832955&view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48132
Patch provided by sebb
Modified:
tomcat/trunk/java/javax/el/ArrayELResolver.java
tomcat/trunk/java/javax/el/BeanELResolver.java
tomcat/trunk/java/javax/el/CompositeELResolver.java
tomcat/trunk/java/javax/el/Expression.java
tomcat/trunk/java/javax/el/ListELResolver.java
tomcat/trunk/java/javax/el/MapELResolver.java
tomcat/trunk/java/javax/el/ResourceBundleELResolver.java
tomcat/trunk/java/javax/servlet/http/Cookie.java
tomcat/trunk/java/javax/servlet/http/HttpServlet.java
tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java
tomcat/trunk/java/javax/servlet/jsp/JspWriter.java
tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
tomcat/trunk/java/javax/servlet/jsp/tagext/BodyContent.java
tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTagSupport.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
Modified: tomcat/trunk/java/javax/el/ArrayELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ArrayELResolver.java?rev=832955&r1=832954&r2=832955&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ArrayELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ArrayELResolver.java Thu Nov 5 01:19:20 2009
@@ -34,7 +34,8 @@
this.readOnly = readOnly;
}
- public Object getValue(ELContext context, Object base, Object property)
+ @Override
+ public Object getValue(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -52,7 +53,8 @@
return null;
}
- public Class<?> getType(ELContext context, Object base, Object property)
+ @Override
+ public Class<?> getType(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -68,7 +70,8 @@
return null;
}
- public void setValue(ELContext context, Object base, Object property,
+ @Override
+ public void setValue(ELContext context, Object base, Object property,
Object value) throws NullPointerException,
PropertyNotFoundException, PropertyNotWritableException,
ELException {
@@ -91,7 +94,8 @@
}
}
- public boolean isReadOnly(ELContext context, Object base, Object
property)
+ @Override
+ public boolean isReadOnly(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -106,7 +110,8 @@
return this.readOnly;
}
- public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
+ @Override
+ public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
if (base != null && base.getClass().isArray()) {
FeatureDescriptor[] descs = new
FeatureDescriptor[Array.getLength(base)];
for (int i = 0; i < descs.length; i++) {
@@ -124,7 +129,8 @@
return null;
}
- public Class<?> getCommonPropertyType(ELContext context, Object base) {
+ @Override
+ public Class<?> getCommonPropertyType(ELContext context, Object base) {
if (base != null && base.getClass().isArray()) {
return Integer.class;
}
Modified: tomcat/trunk/java/javax/el/BeanELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?rev=832955&r1=832954&r2=832955&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/BeanELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanELResolver.java Thu Nov 5 01:19:20 2009
@@ -47,7 +47,8 @@
this.readOnly = readOnly;
}
- public Object getValue(ELContext context, Object base, Object property)
+ @Override
+ public Object getValue(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -71,7 +72,8 @@
}
}
- public Class<?> getType(ELContext context, Object base, Object property)
+ @Override
+ public Class<?> getType(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -84,7 +86,8 @@
return this.property(context, base, property).getPropertyType();
}
- public void setValue(ELContext context, Object base, Object property,
+ @Override
+ public void setValue(ELContext context, Object base, Object property,
Object value) throws NullPointerException,
PropertyNotFoundException, PropertyNotWritableException,
ELException {
@@ -117,7 +120,8 @@
}
}
- public boolean isReadOnly(ELContext context, Object base, Object
property)
+ @Override
+ public boolean isReadOnly(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -131,7 +135,8 @@
|| this.property(context, base,
property).isReadOnly();
}
- public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
+ @Override
+ public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
if (context == null) {
throw new NullPointerException();
}
@@ -155,7 +160,8 @@
return null;
}
- public Class<?> getCommonPropertyType(ELContext context, Object base) {
+ @Override
+ public Class<?> getCommonPropertyType(ELContext context, Object base) {
if (context == null) {
throw new NullPointerException();
}
Modified: tomcat/trunk/java/javax/el/CompositeELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/CompositeELResolver.java?rev=832955&r1=832954&r2=832955&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/CompositeELResolver.java (original)
+++ tomcat/trunk/java/javax/el/CompositeELResolver.java Thu Nov 5 01:19:20 2009
@@ -45,6 +45,7 @@
this.resolvers[this.size++] = elResolver;
}
+ @Override
public Object getValue(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
context.setPropertyResolved(false);
@@ -59,6 +60,7 @@
return null;
}
+ @Override
public void setValue(ELContext context, Object base, Object property,
Object value) throws NullPointerException,
PropertyNotFoundException, PropertyNotWritableException,
@@ -73,6 +75,7 @@
}
}
+ @Override
public boolean isReadOnly(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
context.setPropertyResolved(false);
@@ -87,10 +90,12 @@
return false;
}
+ @Override
public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
return new FeatureIterator(context, base, this.resolvers, this.size);
}
+ @Override
public Class<?> getCommonPropertyType(ELContext context, Object base) {
int sz = this.size;
Class<?> commonType = null, type = null;
@@ -104,6 +109,7 @@
return commonType;
}
+ @Override
public Class<?> getType(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
context.setPropertyResolved(false);
Modified: tomcat/trunk/java/javax/el/Expression.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/Expression.java?rev=832955&r1=832954&r2=832955&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/Expression.java (original)
+++ tomcat/trunk/java/javax/el/Expression.java Thu Nov 5 01:19:20 2009
@@ -24,8 +24,10 @@
*/
public abstract class Expression implements Serializable {
+ @Override
public abstract boolean equals(Object obj);
+ @Override
public abstract int hashCode();
public abstract String getExpressionString();
Modified: tomcat/trunk/java/javax/el/ListELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ListELResolver.java?rev=832955&r1=832954&r2=832955&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ListELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ListELResolver.java Thu Nov 5 01:19:20 2009
@@ -39,7 +39,8 @@
this.readOnly = readOnly;
}
- public Object getValue(ELContext context, Object base, Object property)
+ @Override
+ public Object getValue(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -58,7 +59,8 @@
return null;
}
- public Class<?> getType(ELContext context, Object base, Object property)
+ @Override
+ public Class<?> getType(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -78,7 +80,8 @@
return null;
}
- public void setValue(ELContext context, Object base, Object property,
+ @Override
+ public void setValue(ELContext context, Object base, Object property,
Object value) throws NullPointerException,
PropertyNotFoundException, PropertyNotWritableException,
ELException {
@@ -107,7 +110,8 @@
}
}
- public boolean isReadOnly(ELContext context, Object base, Object
property)
+ @Override
+ public boolean isReadOnly(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -127,7 +131,8 @@
return this.readOnly;
}
- public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
+ @Override
+ public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
if (base instanceof List) {
FeatureDescriptor[] descs = new
FeatureDescriptor[((List) base).size()];
for (int i = 0; i < descs.length; i++) {
@@ -145,7 +150,8 @@
return null;
}
- public Class<?> getCommonPropertyType(ELContext context, Object base) {
+ @Override
+ public Class<?> getCommonPropertyType(ELContext context, Object base) {
if (base != null && base instanceof List) {
return Integer.class;
}
Modified: tomcat/trunk/java/javax/el/MapELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/MapELResolver.java?rev=832955&r1=832954&r2=832955&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/MapELResolver.java (original)
+++ tomcat/trunk/java/javax/el/MapELResolver.java Thu Nov 5 01:19:20 2009
@@ -40,7 +40,8 @@
this.readOnly = readOnly;
}
- public Object getValue(ELContext context, Object base, Object property)
+ @Override
+ public Object getValue(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -54,7 +55,8 @@
return null;
}
- public Class<?> getType(ELContext context, Object base, Object property)
+ @Override
+ public Class<?> getType(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -69,7 +71,8 @@
return null;
}
- public void setValue(ELContext context, Object base, Object property,
+ @Override
+ public void setValue(ELContext context, Object base, Object property,
Object value) throws NullPointerException,
PropertyNotFoundException, PropertyNotWritableException,
ELException {
@@ -94,7 +97,8 @@
}
}
- public boolean isReadOnly(ELContext context, Object base, Object
property)
+ @Override
+ public boolean isReadOnly(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -108,7 +112,8 @@
return this.readOnly;
}
- public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
+ @Override
+ public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
if (base instanceof Map) {
Iterator itr = ((Map) base).keySet().iterator();
List<FeatureDescriptor> feats = new
ArrayList<FeatureDescriptor>();
@@ -131,7 +136,8 @@
return null;
}
- public Class<?> getCommonPropertyType(ELContext context, Object base) {
+ @Override
+ public Class<?> getCommonPropertyType(ELContext context, Object base) {
if (base instanceof Map) {
return Object.class;
}
Modified: tomcat/trunk/java/javax/el/ResourceBundleELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ResourceBundleELResolver.java?rev=832955&r1=832954&r2=832955&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ResourceBundleELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ResourceBundleELResolver.java Thu Nov 5
01:19:20 2009
@@ -31,7 +31,8 @@
super();
}
- public Object getValue(ELContext context, Object base, Object property)
+ @Override
+ public Object getValue(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -53,7 +54,8 @@
return null;
}
- public Class<?> getType(ELContext context, Object base, Object property)
+ @Override
+ public Class<?> getType(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -66,7 +68,8 @@
return null;
}
- public void setValue(ELContext context, Object base, Object property,
+ @Override
+ public void setValue(ELContext context, Object base, Object property,
Object value) throws NullPointerException,
PropertyNotFoundException, PropertyNotWritableException,
ELException {
@@ -82,7 +85,8 @@
}
}
- public boolean isReadOnly(ELContext context, Object base, Object
property)
+ @Override
+ public boolean isReadOnly(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -95,7 +99,8 @@
return true;
}
- public Iterator getFeatureDescriptors(ELContext context, Object base) {
+ @Override
+ public Iterator getFeatureDescriptors(ELContext context, Object base) {
if (base instanceof ResourceBundle) {
List<FeatureDescriptor> feats = new
ArrayList<FeatureDescriptor>();
Enumeration e = ((ResourceBundle) base).getKeys();
@@ -118,7 +123,8 @@
return null;
}
- public Class<?> getCommonPropertyType(ELContext context, Object base) {
+ @Override
+ public Class<?> getCommonPropertyType(ELContext context, Object base) {
if (base instanceof ResourceBundle) {
return String.class;
}
Modified: tomcat/trunk/java/javax/servlet/http/Cookie.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/Cookie.java?rev=832955&r1=832954&r2=832955&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/Cookie.java (original)
+++ tomcat/trunk/java/javax/servlet/http/Cookie.java Thu Nov 5 01:19:20 2009
@@ -584,6 +584,7 @@
*
*/
+ @Override
public Object clone() {
try {
return super.clone();
Modified: tomcat/trunk/java/javax/servlet/http/HttpServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServlet.java?rev=832955&r1=832954&r2=832955&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServlet.java Thu Nov 5 01:19:20
2009
@@ -706,6 +706,7 @@
*
* @see javax.servlet.Servlet#service
*/
+ @Override
public void service(ServletRequest req, ServletResponse res)
throws ServletException, IOException {
@@ -750,15 +751,18 @@
// SERVLET RESPONSE interface methods
+ @Override
public void setContentLength(int len) {
super.setContentLength(len);
didSetContentLength = true;
}
+ @Override
public ServletOutputStream getOutputStream() throws IOException {
return noBody;
}
+ @Override
public PrintWriter getWriter() throws UnsupportedEncodingException {
if (writer == null) {
@@ -796,10 +800,12 @@
return contentLength;
}
+ @Override
public void write(int b) {
contentLength++;
}
+ @Override
public void write(byte buf[], int offset, int len)
throws IOException
{
Modified: tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java?rev=832955&r1=832954&r2=832955&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java Thu Nov
5 01:19:20 2009
@@ -105,6 +105,7 @@
/** Return the session that changed. */
+ @Override
public HttpSession getSession () {
return super.getSession();
}
Modified: tomcat/trunk/java/javax/servlet/jsp/JspWriter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/JspWriter.java?rev=832955&r1=832954&r2=832955&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/JspWriter.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/JspWriter.java Thu Nov 5 01:19:20 2009
@@ -386,6 +386,7 @@
* @exception IOException If an I/O error occurs
*/
+ @Override
abstract public void flush() throws IOException;
/**
@@ -400,6 +401,7 @@
* @exception IOException If an I/O error occurs
*/
+ @Override
abstract public void close() throws IOException;
/**
Modified: tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java?rev=832955&r1=832954&r2=832955&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
(original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java Thu
Nov 5 01:19:20 2009
@@ -77,6 +77,7 @@
super();
}
+ @Override
public Object getValue(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
@@ -119,6 +120,7 @@
return null;
}
+ @Override
public Class<?> getType(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
@@ -134,6 +136,7 @@
return null;
}
+ @Override
public void setValue(ELContext context, Object base, Object property,
Object value) throws NullPointerException,
PropertyNotFoundException, PropertyNotWritableException,
@@ -151,6 +154,7 @@
}
}
+ @Override
public boolean isReadOnly(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
@@ -167,6 +171,7 @@
return false;
}
+ @Override
public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
List<FeatureDescriptor> feats = new ArrayList<FeatureDescriptor>(
SCOPE_NAMES.length);
@@ -185,6 +190,7 @@
return feats.iterator();
}
+ @Override
public Class<String> getCommonPropertyType(ELContext context, Object base)
{
if (base == null) {
return String.class;
@@ -233,18 +239,22 @@
public Map<String,Object> getApplicationScope() {
if (this.applicationScope == null) {
this.applicationScope = new ScopeMap<Object>() {
+ @Override
protected void setAttribute(String name, Object value) {
page.getServletContext().setAttribute(name, value);
}
+ @Override
protected void removeAttribute(String name) {
page.getServletContext().removeAttribute(name);
}
+ @Override
protected Enumeration<String> getAttributeNames() {
return page.getServletContext().getAttributeNames();
}
+ @Override
protected Object getAttribute(String name) {
return page.getServletContext().getAttribute(name);
}
@@ -256,6 +266,7 @@
public Map<String,Cookie> getCookie() {
if (this.cookie == null) {
this.cookie = new ScopeMap<Cookie>() {
+ @Override
protected Enumeration<String> getAttributeNames() {
Cookie[] c = ((HttpServletRequest) page.getRequest())
.getCookies();
@@ -269,6 +280,7 @@
return null;
}
+ @Override
protected Cookie getAttribute(String name) {
Cookie[] c = ((HttpServletRequest) page.getRequest())
.getCookies();
@@ -290,11 +302,13 @@
public Map<String,String> getHeader() {
if (this.header == null) {
this.header = new ScopeMap<String>() {
+ @Override
protected Enumeration<String> getAttributeNames() {
return ((HttpServletRequest) page.getRequest())
.getHeaderNames();
}
+ @Override
protected String getAttribute(String name) {
return ((HttpServletRequest) page.getRequest())
.getHeader(name);
@@ -307,11 +321,13 @@
public Map<String,String[]> getHeaderValues() {
if (this.headerValues == null) {
this.headerValues = new ScopeMap<String[]>() {
+ @Override
protected Enumeration<String> getAttributeNames() {
return ((HttpServletRequest) page.getRequest())
.getHeaderNames();
}
+ @Override
protected String[] getAttribute(String name) {
Enumeration<String> e =
((HttpServletRequest) page.getRequest())
@@ -334,10 +350,12 @@
public Map<String,String> getInitParam() {
if (this.initParam == null) {
this.initParam = new ScopeMap<String>() {
+ @Override
protected Enumeration<String> getAttributeNames() {
return
page.getServletContext().getInitParameterNames();
}
+ @Override
protected String getAttribute(String name) {
return page.getServletContext().getInitParameter(name);
}
@@ -353,19 +371,23 @@
public Map<String,Object> getPageScope() {
if (this.pageScope == null) {
this.pageScope = new ScopeMap<Object>() {
+ @Override
protected void setAttribute(String name, Object value) {
page.setAttribute(name, value);
}
+ @Override
protected void removeAttribute(String name) {
page.removeAttribute(name);
}
+ @Override
protected Enumeration<String> getAttributeNames() {
return page.getAttributeNamesInScope(
PageContext.PAGE_SCOPE);
}
+ @Override
protected Object getAttribute(String name) {
return page.getAttribute(name);
}
@@ -377,10 +399,12 @@
public Map<String,String> getParam() {
if (this.param == null) {
this.param = new ScopeMap<String>() {
+ @Override
protected Enumeration<String> getAttributeNames() {
return page.getRequest().getParameterNames();
}
+ @Override
protected String getAttribute(String name) {
return page.getRequest().getParameter(name);
}
@@ -392,10 +416,12 @@
public Map<String,String[]> getParamValues() {
if (this.paramValues == null) {
this.paramValues = new ScopeMap<String[]>() {
+ @Override
protected String[] getAttribute(String name) {
return page.getRequest().getParameterValues(name);
}
+ @Override
protected Enumeration<String> getAttributeNames() {
return page.getRequest().getParameterNames();
}
@@ -407,18 +433,22 @@
public Map<String,Object> getRequestScope() {
if (this.requestScope == null) {
this.requestScope = new ScopeMap<Object>() {
+ @Override
protected void setAttribute(String name, Object value) {
page.getRequest().setAttribute(name, value);
}
+ @Override
protected void removeAttribute(String name) {
page.getRequest().removeAttribute(name);
}
+ @Override
protected Enumeration<String> getAttributeNames() {
return page.getRequest().getAttributeNames();
}
+ @Override
protected Object getAttribute(String name) {
return page.getRequest().getAttribute(name);
}
@@ -430,11 +460,13 @@
public Map<String,Object> getSessionScope() {
if (this.sessionScope == null) {
this.sessionScope = new ScopeMap<Object>() {
+ @Override
protected void setAttribute(String name, Object value) {
((HttpServletRequest) page.getRequest()).getSession()
.setAttribute(name, value);
}
+ @Override
protected void removeAttribute(String name) {
HttpSession session = page.getSession();
if (session != null) {
@@ -442,6 +474,7 @@
}
}
+ @Override
protected Enumeration<String> getAttributeNames() {
HttpSession session = page.getSession();
if (session != null) {
@@ -450,6 +483,7 @@
return null;
}
+ @Override
protected Object getAttribute(String name) {
HttpSession session = page.getSession();
if (session != null) {
@@ -477,6 +511,7 @@
throw new UnsupportedOperationException();
}
+ @Override
public final Set<Map.Entry<String,V>> entrySet() {
Enumeration<String> e = getAttributeNames();
Set<Map.Entry<String, V>> set = new HashSet<Map.Entry<String,
V>>();
@@ -513,10 +548,12 @@
return null;
}
+ @Override
public boolean equals(Object obj) {
return (obj != null && this.hashCode() == obj.hashCode());
}
+ @Override
public int hashCode() {
return this.key.hashCode();
}
@@ -530,6 +567,7 @@
return null;
}
+ @Override
public final V put(String key, V value) {
if (key == null) {
throw new NullPointerException();
Modified: tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java?rev=832955&r1=832954&r2=832955&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
(original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java Thu
Nov 5 01:19:20 2009
@@ -37,7 +37,8 @@
super();
}
- public Object getValue(ELContext context, Object base, Object property)
+ @Override
+ public Object getValue(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -56,7 +57,8 @@
return null;
}
- public Class<Object> getType(ELContext context, Object base, Object
property)
+ @Override
+ public Class<Object> getType(ELContext context, Object base, Object
property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -70,7 +72,8 @@
return null;
}
- public void setValue(ELContext context, Object base, Object property,
+ @Override
+ public void setValue(ELContext context, Object base, Object property,
Object value) throws NullPointerException,
PropertyNotFoundException, PropertyNotWritableException,
ELException {
@@ -94,7 +97,8 @@
}
}
- public boolean isReadOnly(ELContext context, Object base, Object
property)
+ @Override
+ public boolean isReadOnly(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -107,7 +111,8 @@
return false;
}
- public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
+ @Override
+ public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
PageContext ctxt = (PageContext)
context.getContext(JspContext.class);
List<FeatureDescriptor> list = new
ArrayList<FeatureDescriptor>();
@@ -183,7 +188,8 @@
return list.iterator();
}
- public Class<String> getCommonPropertyType(ELContext context, Object
base) {
+ @Override
+ public Class<String> getCommonPropertyType(ELContext context, Object base)
{
if (base == null) {
return String.class;
}
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/BodyContent.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/BodyContent.java?rev=832955&r1=832954&r2=832955&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/BodyContent.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/BodyContent.java Thu Nov 5
01:19:20 2009
@@ -76,6 +76,7 @@
* @throws IOException always thrown
*/
+ @Override
public void flush() throws IOException {
throw new IOException("Illegal to flush within a custom tag");
}
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTagSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTagSupport.java?rev=832955&r1=832954&r2=832955&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTagSupport.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTagSupport.java Thu Nov 5
01:19:20 2009
@@ -55,6 +55,7 @@
* @see BodyTag#doStartTag
*/
+ @Override
public int doStartTag() throws JspException {
return EVAL_BODY_BUFFERED;
}
@@ -68,6 +69,7 @@
* @see Tag#doEndTag
*/
+ @Override
public int doEndTag() throws JspException {
return super.doEndTag();
}
@@ -114,6 +116,7 @@
* @see BodyTag#doAfterBody
*/
+ @Override
public int doAfterBody() throws JspException {
return SKIP_BODY;
}
@@ -125,6 +128,7 @@
* @see Tag#release
*/
+ @Override
public void release() {
bodyContent = null;
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagAttributeInfo.java?rev=832955&r1=832954&r2=832955&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagAttributeInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagAttributeInfo.java Thu Nov 5
01:19:20 2009
@@ -170,6 +170,7 @@
*
* @return a String representation of this TagAttributeInfo
*/
+ @Override
public String toString() {
StringBuilder b = new StringBuilder(64);
b.append("name = " + name + " ");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
