From da66af5951b18b6f5e8752cbbe11f5f842332a33 Mon Sep 17 00:00:00 2001
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sun, 10 Dec 2006 20:25:39 +0000
Subject: 2006-12-10  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* Merge of generics-branch to HEAD (woohoo!)
---
 java/security/cert/CollectionCertStoreParameters.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'java/security/cert/CollectionCertStoreParameters.java')

diff --git a/java/security/cert/CollectionCertStoreParameters.java b/java/security/cert/CollectionCertStoreParameters.java
index bac1e3b3e..b3ee93235 100644
--- a/java/security/cert/CollectionCertStoreParameters.java
+++ b/java/security/cert/CollectionCertStoreParameters.java
@@ -51,6 +51,7 @@ import java.util.Collections;
  * collection may be changed at any time.
  *
  * @see CertStore
+ * @since 1.4
  */
 public class CollectionCertStoreParameters implements CertStoreParameters
 {
@@ -81,7 +82,7 @@ public class CollectionCertStoreParameters implements CertStoreParameters
    * @param collection The collection.
    * @throws NullPointerException If <i>collection</i> is null.
    */
-  public CollectionCertStoreParameters(Collection collection)
+  public CollectionCertStoreParameters(Collection<?> collection)
   {
     if (collection == null)
       throw new NullPointerException();
@@ -103,7 +104,7 @@ public class CollectionCertStoreParameters implements CertStoreParameters
    *
    * @return The collection.
    */
-  public Collection getCollection()
+  public Collection<?> getCollection()
   {
     return collection;
   }
-- 
cgit v1.2.1