[Jnode-svn-commits] SF.net SVN: jnode: [3004] trunk/core/src/classpath/javax/javax/security/ auth

[<ls...@us...>]

Revision: 3004
          http://jnode.svn.sourceforge.net/jnode/?rev=3004&view=rev
Author:   lsantha
Date:     2007-01-07 00:24:38 -0800 (Sun, 07 Jan 2007)

Log Message:
-----------
Classpath patches.

Modified Paths:
--------------
    trunk/core/src/classpath/javax/javax/security/auth/Subject.java
    trunk/core/src/classpath/javax/javax/security/auth/login/AppConfigurationEntry.java
    trunk/core/src/classpath/javax/javax/security/auth/spi/LoginModule.java

Modified: trunk/core/src/classpath/javax/javax/security/auth/Subject.java
===================================================================
--- trunk/core/src/classpath/javax/javax/security/auth/Subject.java	2007-01-07 08:23:33 UTC (rev 3003)
+++ trunk/core/src/classpath/javax/javax/security/auth/Subject.java	2007-01-07 08:24:38 UTC (rev 3004)
@@ -91,8 +91,9 @@
     readOnly = false;
   }
 
-  public Subject (final boolean readOnly, final Set principals,
-                  final Set pubCred, final Set privCred)
+  public Subject (final boolean readOnly,
+                  final Set<? extends Principal> principals,
+                  final Set<?> pubCred, final Set<?> privCred)
   {
     if (principals == null || pubCred == null || privCred == null)
       {
@@ -265,12 +266,12 @@
       privCred.containsAll (that.getPrivateCredentials());
   }
 
-  public Set getPrincipals()
+  public Set<Principal> getPrincipals()
   {
     return principals;
   }
 
-  public Set getPrincipals(Class clazz)
+  public <T extends Principal> Set<T> getPrincipals(Class<T> clazz)
   {
     HashSet result = new HashSet (principals.size());
     for (Iterator it = principals.iterator(); it.hasNext(); )
@@ -284,12 +285,12 @@
     return Collections.unmodifiableSet (result);
   }
 
-  public Set getPrivateCredentials()
+  public Set<Object> getPrivateCredentials()
   {
     return privCred;
   }
 
-  public Set getPrivateCredentials (Class clazz)
+  public <T> Set<T> getPrivateCredentials (Class<T> clazz)
   {
     HashSet result = new HashSet (privCred.size());
     for (Iterator it = privCred.iterator(); it.hasNext(); )
@@ -303,12 +304,12 @@
     return Collections.unmodifiableSet (result);
   }
 
-  public Set getPublicCredentials()
+  public Set<Object> getPublicCredentials()
   {
     return pubCred;
   }
 
-  public Set getPublicCredentials (Class clazz)
+  public <T> Set<T> getPublicCredentials (Class<T> clazz)
   {
     HashSet result = new HashSet (pubCred.size());
     for (Iterator it = pubCred.iterator(); it.hasNext(); )

Modified: trunk/core/src/classpath/javax/javax/security/auth/login/AppConfigurationEntry.java
===================================================================
--- trunk/core/src/classpath/javax/javax/security/auth/login/AppConfigurationEntry.java	2007-01-07 08:23:33 UTC (rev 3003)
+++ trunk/core/src/classpath/javax/javax/security/auth/login/AppConfigurationEntry.java	2007-01-07 08:24:38 UTC (rev 3004)
@@ -56,7 +56,7 @@
 
   public AppConfigurationEntry (final String loginModuleName,
                                 final LoginModuleControlFlag controlFlag,
-                                final Map options)
+                                final Map<String, ?> options)
   {
     if (loginModuleName == null || loginModuleName.length() == 0)
       throw new IllegalArgumentException ("module name cannot be null nor empty");
@@ -88,7 +88,7 @@
     return loginModuleName;
   }
 
-  public Map getOptions()
+  public Map<String, ?> getOptions()
   {
     return options;
   }

Modified: trunk/core/src/classpath/javax/javax/security/auth/spi/LoginModule.java
===================================================================
--- trunk/core/src/classpath/javax/javax/security/auth/spi/LoginModule.java	2007-01-07 08:23:33 UTC (rev 3003)
+++ trunk/core/src/classpath/javax/javax/security/auth/spi/LoginModule.java	2007-01-07 08:24:38 UTC (rev 3004)
@@ -95,7 +95,7 @@
    * @param options A mapping of options given to this module.
    */
   void initialize(Subject subject, CallbackHandler handler,
-                  Map sharedState, Map options);
+                  Map<String, ?> sharedState, Map<String, ?> options);
 
   /**
    * Authenticates a subject to the system. This is the primary


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.