Fix generics related warnings in o.a.c.authenticator package

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

diff --git a/java/org/apache/catalina/authenticator/SavedRequest.java b/java/org/apache/catalina/authenticator/SavedRequest.java
index 6bc6cd7..4602b4d 100644 (file)
--- a/java/org/apache/catalina/authenticator/SavedRequest.java
+++ b/java/org/apache/catalina/authenticator/SavedRequest.java
@@ -48,7 +48,7 @@ public final class SavedRequest {
     /**
      * The set of Cookies associated with this Request.
      */
-    private ArrayList cookies = new ArrayList();
+    private ArrayList<Cookie> cookies = new ArrayList<Cookie>();
 
     public void addCookie(Cookie cookie) {
         cookies.add(cookie);
@@ -65,12 +65,13 @@ public final class SavedRequest {
      * values for this header.  The values are returned as an Iterator when
      * you ask for them.
      */
-    private HashMap headers = new HashMap();
+    private HashMap<String,ArrayList<String>> headers =
+        new HashMap<String,ArrayList<String>>();
 
     public void addHeader(String name, String value) {
-        ArrayList values = (ArrayList) headers.get(name);
+        ArrayList<String> values = (ArrayList<String>) headers.get(name);
         if (values == null) {
-            values = new ArrayList();
+            values = new ArrayList<String>();
             headers.put(name, values);
         }
         values.add(value);
@@ -92,7 +93,7 @@ public final class SavedRequest {
     /**
      * The set of Locales associated with this Request.
      */
-    private ArrayList locales = new ArrayList();
+    private ArrayList<Locale> locales = new ArrayList<Locale>();
 
     public void addLocale(Locale locale) {
         locales.add(locale);
@@ -123,7 +124,8 @@ public final class SavedRequest {
      * entry is keyed by the parameter name, pointing at a String array of
      * the corresponding values.
      */
-    private HashMap parameters = new HashMap();
+    private HashMap<String,String[]> parameters =
+        new HashMap<String,String[]>();
 
     public void addParameter(String name, String values[]) {
         parameters.put(name, values);

diff --git a/java/org/apache/catalina/authenticator/SingleSignOn.java b/java/org/apache/catalina/authenticator/SingleSignOn.java
index 00c212a..f01a420 100644 (file)
--- a/java/org/apache/catalina/authenticator/SingleSignOn.java
+++ b/java/org/apache/catalina/authenticator/SingleSignOn.java
@@ -74,7 +74,8 @@ public class SingleSignOn
      * The cache of SingleSignOnEntry instances for authenticated Principals,
      * keyed by the cookie value that is used to select them.
      */
-    protected Map cache = new HashMap();
+    protected Map<String,SingleSignOnEntry> cache =
+        new HashMap<String,SingleSignOnEntry>();
 
 
     /**
@@ -100,7 +101,7 @@ public class SingleSignOn
      * The cache of single sign on identifiers, keyed by the Session that is
      * associated with them.
      */
-    protected Map reverse = new HashMap();
+    protected Map<Session,String> reverse = new HashMap<Session,String>();
 
 
     /**