Some minor clean up

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@733103 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/javax/servlet/http/Cookie.java b/java/javax/servlet/http/Cookie.java
index 53b90ad..22897e0 100644 (file)
--- a/java/javax/servlet/http/Cookie.java
+++ b/java/javax/servlet/http/Cookie.java
@@ -19,8 +19,6 @@ package javax.servlet.http;
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
-import javax.servlet.DispatcherType;
-
 /**
  *
  * Creates a cookie, a small amount of information sent by a servlet to 

diff --git a/java/javax/servlet/http/HttpServlet.java b/java/javax/servlet/http/HttpServlet.java
index 7b92854..44480de 100644 (file)
--- a/java/javax/servlet/http/HttpServlet.java
+++ b/java/javax/servlet/http/HttpServlet.java
@@ -416,7 +416,7 @@ public abstract class HttpServlet extends GenericServlet
     }
     
 
-    private static Method[] getAllDeclaredMethods(Class c) {
+    private static Method[] getAllDeclaredMethods(Class<?> c) {
 
         if (c.equals(javax.servlet.http.HttpServlet.class)) {
             return null;
@@ -501,7 +501,7 @@ public abstract class HttpServlet extends GenericServlet
         
         String allow = null;
         if (ALLOW_GET)
-            if (allow==null) allow=METHOD_GET;
+            allow=METHOD_GET;
         if (ALLOW_HEAD)
             if (allow==null) allow=METHOD_HEAD;
             else allow += ", " + METHOD_HEAD;
@@ -558,10 +558,10 @@ public abstract class HttpServlet extends GenericServlet
         String responseString = "TRACE "+ req.getRequestURI()+
             " " + req.getProtocol();
         
-        Enumeration reqHeaderEnum = req.getHeaderNames();
+        Enumeration<String> reqHeaderEnum = req.getHeaderNames();
         
         while( reqHeaderEnum.hasMoreElements() ) {
-            String headerName = (String)reqHeaderEnum.nextElement();
+            String headerName = reqHeaderEnum.nextElement();
             responseString += CRLF + headerName + ": " +
                 req.getHeader(headerName); 
         }

diff --git a/java/javax/servlet/http/HttpUtils.java b/java/javax/servlet/http/HttpUtils.java
index 12bce80..dc612f6 100644 (file)
--- a/java/javax/servlet/http/HttpUtils.java
+++ b/java/javax/servlet/http/HttpUtils.java
@@ -95,7 +95,7 @@ public class HttpUtils {
        StringBuffer sb = new StringBuffer();
        StringTokenizer st = new StringTokenizer(s, "&");
        while (st.hasMoreTokens()) {
-           String pair = (String)st.nextToken();
+           String pair = st.nextToken();
            int pos = pair.indexOf('=');
            if (pos == -1) {
                // XXX