From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 26 Dec 2008 19:47:08 +0000 (+0000)
Subject: o.a.c generics changes
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c9020f848b4f84908a6a4f6f55d88c69b4cc0bd5;p=tomcat7.0

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 96f60705e..7847461fd 100644
--- 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 fb3ff9352..e4ad0e2e6 100644
--- 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 14766cee8..18f4b8d83 100644
--- 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 b6c48bd7c..0d6010a44 100644
--- 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 461ac518f..82e759c89 100644
--- 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