From 65bf3316cf384588453604be6b4f0ed3751a8b0f Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 9 Jan 2007 19:58:05 +0000
Subject: Merged gcj-eclipse branch to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/classpath/javax/security/sasl/Sasl.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'libjava/classpath/javax/security/sasl/Sasl.java')

diff --git a/libjava/classpath/javax/security/sasl/Sasl.java b/libjava/classpath/javax/security/sasl/Sasl.java
index dbe4cc8c2ae..52210d971ac 100644
--- a/libjava/classpath/javax/security/sasl/Sasl.java
+++ b/libjava/classpath/javax/security/sasl/Sasl.java
@@ -356,7 +356,8 @@ public class Sasl
   public static SaslClient createSaslClient(String[] mechanisms,
                                             String authorizationID,
                                             String protocol,
-                                            String serverName, Map props,
+                                            String serverName,
+                                            Map<String, ?> props,
                                             CallbackHandler cbh)
     throws SaslException
   {
@@ -444,7 +445,7 @@ public class Sasl
    * {@link SaslClient} instance.
    * @see #createSaslClient(String[],String,String,String,Map,CallbackHandler)
    */
-  public static Enumeration getSaslClientFactories()
+  public static Enumeration<SaslClientFactory> getSaslClientFactories()
   {
     Vector result = new Vector();
     HashSet names = new HashSet();
@@ -559,7 +560,8 @@ public class Sasl
    */
   public static SaslServer createSaslServer(String mechanism, String protocol,
                                             String serverName,
-                                            Map props, CallbackHandler cbh)
+                                            Map<String, ?> props,
+                                            CallbackHandler cbh)
     throws SaslException
   {
     if (mechanism == null)
@@ -636,7 +638,7 @@ public class Sasl
    * {@link SaslServer} instance.
    * @see #createSaslServer(String,String,String,Map,CallbackHandler)
    */
-  public static Enumeration getSaslServerFactories()
+  public static Enumeration<SaslServerFactory> getSaslServerFactories()
   {
     Vector result = new Vector();
     HashSet names = new HashSet();
-- 
cgit v1.2.3