o.a.c generics changes

Also fix some Eclipse warnings

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

diff --git a/java/org/apache/catalina/Authenticator.java b/java/org/apache/catalina/Authenticator.java
index 96f6070..7847461 100644 (file)
--- a/java/org/apache/catalina/Authenticator.java
+++ b/java/org/apache/catalina/Authenticator.java
@@ -31,6 +31,5 @@ package org.apache.catalina;
  */
 
 public interface Authenticator {
-
-
+    // No methods
 }

diff --git a/java/org/apache/catalina/Group.java b/java/org/apache/catalina/Group.java
index fb3ff93..e4ad0e2 100644 (file)
--- a/java/org/apache/catalina/Group.java
+++ b/java/org/apache/catalina/Group.java
@@ -72,7 +72,7 @@ public interface Group extends Principal {
     /**
      * Return the set of {@link Role}s assigned specifically to this group.
      */
-    public Iterator getRoles();
+    public Iterator<Role> getRoles();
 
 
     /**
@@ -84,7 +84,7 @@ public interface Group extends Principal {
     /**
      * Return the set of {@link User}s that are members of this group.
      */
-    public Iterator getUsers();
+    public Iterator<User> getUsers();
 
 
     // --------------------------------------------------------- Public Methods

diff --git a/java/org/apache/catalina/Session.java b/java/org/apache/catalina/Session.java
index 14766ce..18f4b8d 100644 (file)
--- a/java/org/apache/catalina/Session.java
+++ b/java/org/apache/catalina/Session.java
@@ -281,7 +281,7 @@ public interface Session {
      * Return an Iterator containing the String names of all notes bindings
      * that exist for this session.
      */
-    public Iterator getNoteNames();
+    public Iterator<String> getNoteNames();
 
 
     /**

diff --git a/java/org/apache/catalina/User.java b/java/org/apache/catalina/User.java
index b6c48bd..0d6010a 100644 (file)
--- a/java/org/apache/catalina/User.java
+++ b/java/org/apache/catalina/User.java
@@ -57,7 +57,7 @@ public interface User extends Principal {
     /**
      * Return the set of {@link Group}s to which this user belongs.
      */
-    public Iterator getGroups();
+    public Iterator<Group> getGroups();
 
 
     /**
@@ -81,7 +81,7 @@ public interface User extends Principal {
     /**
      * Return the set of {@link Role}s assigned specifically to this user.
      */
-    public Iterator getRoles();
+    public Iterator<Role> getRoles();
 
 
     /**

diff --git a/java/org/apache/catalina/UserDatabase.java b/java/org/apache/catalina/UserDatabase.java
index 461ac51..82e759c 100644 (file)
--- a/java/org/apache/catalina/UserDatabase.java
+++ b/java/org/apache/catalina/UserDatabase.java
@@ -42,7 +42,7 @@ public interface UserDatabase {
     /**
      * Return the set of {@link Group}s defined in this user database.
      */
-    public Iterator getGroups();
+    public Iterator<Group> getGroups();
 
 
     /**
@@ -54,13 +54,13 @@ public interface UserDatabase {
     /**
      * Return the set of {@link Role}s defined in this user database.
      */
-    public Iterator getRoles();
+    public Iterator<Role> getRoles();
 
 
     /**
      * Return the set of {@link User}s defined in this user database.
      */
-    public Iterator getUsers();
+    public Iterator<User> getUsers();
 
 
     // --------------------------------------------------------- Public Methods