Merged gcj-eclipse branch to trunk.

From-SVN: r120621

libjava/classpath/java/security/cert/CertStoreSpi.java

@@ -50,7 +50,7 @@ import java.util.Collection;
  * implement the {@link CertStoreParameters} interface, if they require
  * parameters.
  *
- * @since JDK 1.4
+ * @since 1.4
  * @see CertStore
  * @see CollectionCertStoreParameters
  * @see LDAPCertStoreParameters
@@ -86,7 +86,7 @@ public abstract class CertStoreSpi
    * @return A (non-null) collection of certificates.
    * @throws CertStoreException If the certificates cannot be retrieved.
    */
-  public abstract Collection engineGetCertificates(CertSelector selector)
+  public abstract Collection<? extends Certificate> engineGetCertificates(CertSelector selector)
   throws CertStoreException;
 
   /**
@@ -98,6 +98,6 @@ public abstract class CertStoreSpi
    * @return A (non-null) collection of certificate revocation list.
    * @throws CertStoreException If the CRLs cannot be retrieved.
    */
-  public abstract Collection engineGetCRLs(CRLSelector selector)
+  public abstract Collection<? extends CRL> engineGetCRLs(CRLSelector selector)
   throws CertStoreException;
 }