Author: markt
Date: Tue May 8 16:49:56 2007
New Revision: 536380
URL: http://svn.apache.org/viewvc?view=rev&rev=536380
Log:
Fix generics related warnings in o.a.c.authenticator package
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SavedRequest.java?view=diff&rev=536380&r1=536379&r2=536380
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
Tue May 8 16:49:56 2007
@@ -48,7 +48,7 @@
/**
* 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 @@
* 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 @@
/**
* 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 @@
* 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);
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?view=diff&rev=536380&r1=536379&r2=536380
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
Tue May 8 16:49:56 2007
@@ -74,7 +74,8 @@
* 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 @@
* 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>();
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
