Author: markt
Date: Sat Dec 17 22:51:29 2011
New Revision: 1220292
URL: http://svn.apache.org/viewvc?rev=1220292&view=rev
Log:
Servlet 3.1 generics additions
Modified:
tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java
tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java
tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java
Modified: tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java?rev=1220292&r1=1220291&r2=1220292&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java Sat Dec 17
22:51:29 2011
@@ -430,9 +430,7 @@ public class ServletRequestWrapper imple
* @param wrappedType
* @since Servlet 3.0 TODO SERVLET3 - Add comments
*/
- @SuppressWarnings("unchecked")
- // Spec API does not use generics
- public boolean isWrapperFor(@SuppressWarnings("rawtypes") Class
wrappedType) {
+ public boolean isWrapperFor(Class<?> wrappedType) {
if (wrappedType.isAssignableFrom(request.getClass())) {
return true;
}
Modified: tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java?rev=1220292&r1=1220291&r2=1220292&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java Sat Dec 17
22:51:29 2011
@@ -224,9 +224,7 @@ public class ServletResponseWrapper impl
* @param wrappedType
* @since Servlet 3.0 TODO SERVLET3 - Add comments
*/
- @SuppressWarnings("unchecked")
- // Spec API does not use generics
- public boolean isWrapperFor(@SuppressWarnings("rawtypes") Class
wrappedType) {
+ public boolean isWrapperFor(Class<?> wrappedType) {
if (wrappedType.isAssignableFrom(response.getClass())) {
return true;
}
Modified: tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java?rev=1220292&r1=1220291&r2=1220292&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java Sat Dec 17
22:51:29 2011
@@ -29,12 +29,11 @@ import java.lang.annotation.Target;
*/
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
-@SuppressWarnings("rawtypes") // Spec API does not use generics
public @interface HandlesTypes {
/**
* @return array of classes
*/
- Class[] value();
+ Class<?>[] value();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
