svn commit: r733103 - in /tomcat/trunk/java/javax/servlet/http: Cookie.java HttpServlet.java HttpUtils.java

[markt]

Author: markt
Date: Fri Jan  9 10:18:29 2009
New Revision: 733103

URL: http://svn.apache.org/viewvc?rev=733103&view=rev
Log:
Some minor clean up

Modified:
    tomcat/trunk/java/javax/servlet/http/Cookie.java
    tomcat/trunk/java/javax/servlet/http/HttpServlet.java
    tomcat/trunk/java/javax/servlet/http/HttpUtils.java

Modified: tomcat/trunk/java/javax/servlet/http/Cookie.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/Cookie.java?rev=733103&r1=733102&r2=733103&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/Cookie.java (original)
+++ tomcat/trunk/java/javax/servlet/http/Cookie.java Fri Jan  9 10:18:29 2009
@@ -19,8 +19,6 @@
 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 

Modified: tomcat/trunk/java/javax/servlet/http/HttpServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServlet.java?rev=733103&r1=733102&r2=733103&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServlet.java Fri Jan  9 10:18:29 
2009
@@ -416,7 +416,7 @@
     }
     
 
-    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 @@
         
         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 @@
         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); 
         }

Modified: tomcat/trunk/java/javax/servlet/http/HttpUtils.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpUtils.java?rev=733103&r1=733102&r2=733103&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpUtils.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpUtils.java Fri Jan  9 10:18:29 2009
@@ -95,7 +95,7 @@
        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



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org