[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[cp-patches] [generics] Patch: FYI: genericize java.security.cert
From: |
Tom Tromey |
Subject: |
[cp-patches] [generics] Patch: FYI: genericize java.security.cert |
Date: |
Fri, 25 Nov 2005 15:05:50 -0700 |
I'm checking this in on the generics branch.
This genericizes java.security.cert.
While I was in there... it seems like we have a number of stubs in
here. Also there is some unimplemented stuff.
Tom
2005-11-25 Tom Tromey <address@hidden>
* java/security/cert/X509Extension.java (getCriticalExtensionOIDs):
Genericized.
(getNonCriticalExtensionOIDs): Likewise.
* java/security/cert/X509Certificate.java (getExtendedKeyUsage):
Genericized.
(getIssuerAlternativeNames): Likewise.
(getSubjectAlternativeNames): Likewise.
* java/security/cert/X509CertSelector.java (setExtendedKeyUsage):
Genericized.
(setSubjectAlternativeNames): Likewise.
* java/security/cert/X509CRLSelector.java (getIssuerNames):
Genericized.
(setIssuerNames): Likewise.
* java/security/cert/X509CRL.java (getRevokedCertificates):
Genericized.
* java/security/cert/PolicyNode.java (getChildren): Genericized.
(getExpectedPolicies): Likewise.
(getPolicyQualifiers): Likewise.
* java/security/cert/PKIXCertPathChecker.java (check): Genericized.
(getSupportedExtensions): Likewise.
* java/security/cert/CertificateFactorySpi.java
(engineGenerateCertPath): Genericized.
(engineGenerateCertificates): Likewise.
(engineGenerateCRLs): Likewise.
(engineGetCertPathEncodings): Likewise.
* java/security/cert/CertificateFactory.java (generateCertificates):
Genericized.
(generateCertPath): Likewise.
(generateCRLs): Likewise.
(getCertPathEncodings): Likewise.
* java/security/cert/CertStoreSpi.java (engineGetCertificates):
Genericized.
(engineGetCRLs): Likewise.
* java/security/cert/CertStore.java (getCertificates): Genericized.
(getCRLs): Likewise.
* java/security/cert/CertPath.java (getCertificates): Genericized.
(getEncodings): Likewise.
* java/security/cert/PKIXParameters.java (PKIXParameters):
Genericized.
(getCertStores): Likewise.
(getCertPathCheckers): Likewise.
(getInitialPolicies): Likewise.
(getTrustAnchors): Likewise.
(setCertPathCheckers): Likewise.
(setCertStores): Likewise.
(setInitialPolicies): Likewise.
(setTrustAnchors): Likewise.
* java/security/cert/PKIXBuilderParameters.java
(PKIXBuilderParameters): Genericized.
* java/security/cert/CollectionCertStoreParameters.java
(CollectionCertStoreParameters): Genericized.
(getCollection): Likewise.
* java/security/cert/PolicyQualifierInfo.java: No longer final.
Index: java/security/cert/CertPath.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/cert/CertPath.java,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 CertPath.java
--- java/security/cert/CertPath.java 2 Aug 2005 20:12:26 -0000 1.1.2.2
+++ java/security/cert/CertPath.java 25 Nov 2005 22:15:17 -0000
@@ -161,7 +161,7 @@
*
* @return the iterator of supported encodings in the path
*/
- public abstract Iterator getEncodings();
+ public abstract Iterator<String> getEncodings();
/**
* Compares this path to another for semantic equality. To be equal, both
@@ -226,7 +226,7 @@
*
* @return the list of certificates, non-null but possibly empty
*/
- public abstract List getCertificates();
+ public abstract List<? extends Certificate> getCertificates();
/**
* Serializes the path in its encoded form, to ensure reserialization with
Index: java/security/cert/CertStore.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/cert/CertStore.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 CertStore.java
--- java/security/cert/CertStore.java 2 Aug 2005 20:12:26 -0000 1.2.2.2
+++ java/security/cert/CertStore.java 25 Nov 2005 22:15:17 -0000
@@ -52,7 +52,7 @@
* A CertStore is a read-only repository for certificates and
* certificate revocation lists.
*
- * @since JDK 1.4
+ * @since 1.4
*/
public class CertStore
{
@@ -268,7 +268,7 @@
* @return The collection of certificates.
* @throws CertStoreException If the certificates cannot be retrieved.
*/
- public final Collection getCertificates(CertSelector selector)
+ public final Collection<? extends Certificate> getCertificates(CertSelector
selector)
throws CertStoreException
{
return storeSpi.engineGetCertificates(selector);
@@ -286,7 +286,7 @@
* @return The collection of certificate revocation lists.
* @throws CertStoreException If the CRLs cannot be retrieved.
*/
- public final Collection getCRLs(CRLSelector selector)
+ public final Collection<? extends CRL> getCRLs(CRLSelector selector)
throws CertStoreException
{
return storeSpi.engineGetCRLs(selector);
Index: java/security/cert/CertStoreSpi.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/cert/CertStoreSpi.java,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 CertStoreSpi.java
--- java/security/cert/CertStoreSpi.java 2 Aug 2005 20:12:26 -0000
1.1.2.1
+++ java/security/cert/CertStoreSpi.java 25 Nov 2005 22:15:17 -0000
@@ -49,7 +49,7 @@
* implement the address@hidden CertStoreParameters} interface, if they require
* parameters.
*
- * @since JDK 1.4
+ * @since 1.4
* @see CertStore
* @see CollectionCertStoreParameters
* @see LDAPCertStoreParameters
@@ -85,7 +85,7 @@
* @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;
/**
@@ -97,6 +97,6 @@
* @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;
}
Index: java/security/cert/CertificateFactory.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/java/security/cert/CertificateFactory.java,v
retrieving revision 1.6.2.3
diff -u -r1.6.2.3 CertificateFactory.java
--- java/security/cert/CertificateFactory.java 2 Aug 2005 20:12:26 -0000
1.6.2.3
+++ java/security/cert/CertificateFactory.java 25 Nov 2005 22:15:17 -0000
@@ -56,7 +56,7 @@
*
* @author Mark Benvenuto
* @author Casey Marshall
- * @since JDK 1.2
+ * @since 1.2
* @status Fully compatible with JDK 1.4.
*/
public class CertificateFactory
@@ -249,7 +249,7 @@
* @throws CertificateException If an error occurs decoding the
* certificates.
*/
- public final Collection generateCertificates(InputStream inStream)
+ public final Collection<? extends Certificate>
generateCertificates(InputStream inStream)
throws CertificateException
{
return certFacSpi.engineGenerateCertificates(inStream);
@@ -291,7 +291,7 @@
* InputStream data.
* @throws CRLException If an error occurs decoding the CRLs.
*/
- public final Collection generateCRLs(InputStream inStream)
+ public final Collection<? extends CRL> generateCRLs(InputStream inStream)
throws CRLException
{
return certFacSpi.engineGenerateCRLs( inStream );
@@ -338,7 +338,7 @@
* @throws CertificateException If an error occurs generating the
* CertPath.
*/
- public final CertPath generateCertPath(List certificates)
+ public final CertPath generateCertPath(List<? extends Certificate>
certificates)
throws CertificateException
{
return certFacSpi.engineGenerateCertPath(certificates);
@@ -351,7 +351,7 @@
*
* @return The Iterator of supported encodings.
*/
- public final Iterator getCertPathEncodings()
+ public final Iterator<String> getCertPathEncodings()
{
return certFacSpi.engineGetCertPathEncodings();
}
Index: java/security/cert/CertificateFactorySpi.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/java/security/cert/CertificateFactorySpi.java,v
retrieving revision 1.5.2.1
diff -u -r1.5.2.1 CertificateFactorySpi.java
--- java/security/cert/CertificateFactorySpi.java 2 Aug 2005 20:12:26
-0000 1.5.2.1
+++ java/security/cert/CertificateFactorySpi.java 25 Nov 2005 22:15:17
-0000
@@ -54,7 +54,7 @@
Certificate factories are used to generate certificates and
certificate revocation lists (CRL) from their encoding.
- @since JDK 1.2
+ @since 1.2
@author Mark Benvenuto
*/
@@ -117,7 +117,7 @@
@throws CertificateException Certificate parsing error
*/
- public abstract Collection engineGenerateCertificates(InputStream inStream)
+ public abstract Collection<? extends Certificate>
engineGenerateCertificates(InputStream inStream)
throws CertificateException;
/**
@@ -157,7 +157,7 @@
@throws CRLException CRL parsing error
*/
- public abstract Collection engineGenerateCRLs(InputStream inStream)
+ public abstract Collection<? extends CRL> engineGenerateCRLs(InputStream
inStream)
throws CRLException;
// 1.4 instance methods.
@@ -204,7 +204,7 @@
* @throws CertificateException If an error occurs generating the
* CertPath.
*/
- public CertPath engineGenerateCertPath(List certificates)
+ public CertPath engineGenerateCertPath(List<? extends Certificate>
certificates)
throws CertificateException
{
throw new UnsupportedOperationException("not implemented");
@@ -217,7 +217,7 @@
*
* @return The Iterator of supported encodings.
*/
- public Iterator engineGetCertPathEncodings()
+ public Iterator<String> engineGetCertPathEncodings()
{
throw new UnsupportedOperationException("not implemented");
}
Index: java/security/cert/CollectionCertStoreParameters.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/java/security/cert/CollectionCertStoreParameters.java,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 CollectionCertStoreParameters.java
--- java/security/cert/CollectionCertStoreParameters.java 2 Aug 2005
20:12:26 -0000 1.1.2.1
+++ java/security/cert/CollectionCertStoreParameters.java 25 Nov 2005
22:15:17 -0000
@@ -51,6 +51,7 @@
* collection may be changed at any time.
*
* @see CertStore
+ * @since 1.4
*/
public class CollectionCertStoreParameters implements CertStoreParameters
{
@@ -81,7 +82,7 @@
* @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 @@
*
* @return The collection.
*/
- public Collection getCollection()
+ public Collection<?> getCollection()
{
return collection;
}
Index: java/security/cert/PKIXBuilderParameters.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/java/security/cert/PKIXBuilderParameters.java,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 PKIXBuilderParameters.java
--- java/security/cert/PKIXBuilderParameters.java 2 Aug 2005 20:12:26
-0000 1.1.2.1
+++ java/security/cert/PKIXBuilderParameters.java 25 Nov 2005 22:15:17
-0000
@@ -48,6 +48,7 @@
* Parameters for building certificate paths using the PKIX algorithm.
*
* @see CertPathBuilder
+ * @since 1.4
*/
public class PKIXBuilderParameters extends PKIXParameters
{
@@ -97,7 +98,8 @@
* @throws ClassCastException If every element in <i>trustAnchors</i>
* is not a address@hidden TrustAnchor}.
*/
- public PKIXBuilderParameters(Set trustAnchors, CertSelector
targetConstraints)
+ public PKIXBuilderParameters(Set<TrustAnchor> trustAnchors,
+ CertSelector targetConstraints)
throws InvalidAlgorithmParameterException
{
super(trustAnchors);
Index: java/security/cert/PKIXCertPathChecker.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/java/security/cert/PKIXCertPathChecker.java,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 PKIXCertPathChecker.java
--- java/security/cert/PKIXCertPathChecker.java 2 Aug 2005 20:12:26 -0000
1.1.2.1
+++ java/security/cert/PKIXCertPathChecker.java 25 Nov 2005 22:15:17 -0000
@@ -59,6 +59,7 @@
* the most-trusted certificate.
*
* @see PKIXParameters
+ * @since 1.4
*/
public abstract class PKIXCertPathChecker implements Cloneable
{
@@ -116,7 +117,7 @@
* @return An immutable set of Strings of the supported X.509 OIDs, or
* null if no extensions are supported.
*/
- public abstract Set getSupportedExtensions();
+ public abstract Set<String> getSupportedExtensions();
/**
* Checks a certificate, removing any critical extensions that are
@@ -128,6 +129,6 @@
* @throws CertPathValidatorException If this certificate fails this
* check.
*/
- public abstract void check(Certificate cert, Collection unresolvedCritExts)
+ public abstract void check(Certificate cert, Collection<String>
unresolvedCritExts)
throws CertPathValidatorException;
}
Index: java/security/cert/PKIXParameters.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/cert/PKIXParameters.java,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 PKIXParameters.java
--- java/security/cert/PKIXParameters.java 2 Aug 2005 20:12:26 -0000
1.1.2.1
+++ java/security/cert/PKIXParameters.java 25 Nov 2005 22:15:17 -0000
@@ -55,7 +55,8 @@
* Parameters for verifying certificate paths using the PKIX
* (Public-Key Infrastructure (X.509)) algorithm.
*
- * @see CertPathBulider
+ * @see CertPathBuilder
+ * @since 1.4
*/
public class PKIXParameters implements CertPathParameters
{
@@ -144,7 +145,7 @@
* @throws ClassCastException If every element in <i>trustAnchors</i>
* is not a address@hidden TrustAnchor}.
*/
- public PKIXParameters(Set trustAnchors)
+ public PKIXParameters(Set<TrustAnchor> trustAnchors)
throws InvalidAlgorithmParameterException
{
this();
@@ -199,7 +200,7 @@
*
* @return A (never null, never empty) immutable set of trust anchors.
*/
- public Set getTrustAnchors()
+ public Set<TrustAnchor> getTrustAnchors()
{
return Collections.unmodifiableSet(trustAnchors);
}
@@ -216,7 +217,7 @@
* @throws ClassCastException If every element in <i>trustAnchors</i>
* is not a address@hidden TrustAnchor}.
*/
- public void setTrustAnchors(Set trustAnchors)
+ public void setTrustAnchors(Set<TrustAnchor> trustAnchors)
throws InvalidAlgorithmParameterException
{
if (trustAnchors.isEmpty())
@@ -235,7 +236,7 @@
* @return An immutable set of initial policy OID strings, or the
* empty set if any policy is acceptable.
*/
- public Set getInitialPolicies()
+ public Set<String> getInitialPolicies()
{
return Collections.unmodifiableSet(initPolicies);
}
@@ -249,7 +250,7 @@
* @throws ClassCastException If any element in <i>initPolicies</i> is
* not a string.
*/
- public void setInitialPolicies(Set initPolicies)
+ public void setInitialPolicies(Set<String> initPolicies)
{
this.initPolicies.clear();
if (initPolicies == null)
@@ -277,7 +278,7 @@
*
* @return The list of cert stores.
*/
- public List getCertStores()
+ public List<CertStore> getCertStores()
{
return Collections.unmodifiableList(certStores);
}
@@ -288,7 +289,7 @@
*
* @param certStores The cert stores.
*/
- public void setCertStores(List certStores)
+ public void setCertStores(List<CertStore> certStores)
{
this.certStores.clear();
if (certStores == null)
@@ -446,7 +447,7 @@
*
* @return An immutable list of all certificate path checkers.
*/
- public List getCertPathCheckers()
+ public List<PKIXCertPathChecker> getCertPathCheckers()
{
return Collections.unmodifiableList(pathCheckers);
}
@@ -459,7 +460,7 @@
* @throws ClassCastException If any element of <i>pathCheckers</i> is
* not a address@hidden PKIXCertPathChecker}.
*/
- public void setCertPathCheckers(List pathCheckers)
+ public void setCertPathCheckers(List<PKIXCertPathChecker> pathCheckers)
{
this.pathCheckers.clear();
if (pathCheckers == null)
Index: java/security/cert/PolicyNode.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/cert/PolicyNode.java,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 PolicyNode.java
--- java/security/cert/PolicyNode.java 2 Aug 2005 20:12:26 -0000 1.1.2.1
+++ java/security/cert/PolicyNode.java 25 Nov 2005 22:15:17 -0000
@@ -38,6 +38,12 @@
package java.security.cert;
+import java.util.Iterator;
+import java.util.Set;
+
+/**
+ * @since 1.4
+ */
public interface PolicyNode
{
@@ -47,7 +53,7 @@
*
* @return An iterator over the child nodes.
*/
- java.util.Iterator getChildren();
+ Iterator<? extends PolicyNode> getChildren();
/**
* Get the depth of this node within the tree, starting at 0 for the
@@ -64,7 +70,7 @@
*
* @return The set of expected policies.
*/
- java.util.Set getExpectedPolicies();
+ Set<String> getExpectedPolicies();
/**
* Returns the parent node of this node, or null if this is the root
@@ -81,7 +87,7 @@
*
* @return The set of address@hidden PolicyQualifierInfo} objects.
*/
- java.util.Set getPolicyQualifiers();
+ Set<? extends PolicyQualifierInfo> getPolicyQualifiers();
/**
* Get the policy OID this node represents. The root node should return
Index: java/security/cert/PolicyQualifierInfo.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/java/security/cert/PolicyQualifierInfo.java,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 PolicyQualifierInfo.java
--- java/security/cert/PolicyQualifierInfo.java 2 Aug 2005 20:12:26 -0000
1.2.2.2
+++ java/security/cert/PolicyQualifierInfo.java 25 Nov 2005 22:15:17 -0000
@@ -59,9 +59,10 @@
* PolicyQualifierId ::= OBJECT IDENTIFIER
* </pre>
*
- * @since JDK 1.4
+ * @since 1.4
+ * @specnote this class was final in 1.4, but beginning with 1.5 is not
*/
-public final class PolicyQualifierInfo
+public class PolicyQualifierInfo
{
// Fields.
Index: java/security/cert/X509CRL.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/cert/X509CRL.java,v
retrieving revision 1.4.2.2
diff -u -r1.4.2.2 X509CRL.java
--- java/security/cert/X509CRL.java 2 Aug 2005 20:12:26 -0000 1.4.2.2
+++ java/security/cert/X509CRL.java 25 Nov 2005 22:15:17 -0000
@@ -97,7 +97,7 @@
@author Mark Benvenuto
- @since JDK 1.2
+ @since 1.2
*/
public abstract class X509CRL extends CRL implements X509Extension
{
@@ -304,7 +304,7 @@
@return a set of revoked certificates.
*/
- public abstract Set getRevokedCertificates();
+ public abstract Set<? extends X509CRLEntry> getRevokedCertificates();
/**
Returns the DER ASN.1 encoded tbsCertList which is
Index: java/security/cert/X509CRLSelector.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/cert/X509CRLSelector.java,v
retrieving revision 1.5.2.4
diff -u -r1.5.2.4 X509CRLSelector.java
--- java/security/cert/X509CRLSelector.java 2 Aug 2005 20:12:26 -0000
1.5.2.4
+++ java/security/cert/X509CRLSelector.java 25 Nov 2005 22:15:18 -0000
@@ -69,6 +69,7 @@
* use or modify this class then they need to synchronize on the object.
*
* @author Casey Marshall (address@hidden)
+ * @since 1.4
*/
public class X509CRLSelector implements CRLSelector, Cloneable
{
@@ -157,7 +158,7 @@
* @throws IOException If any of the elements in the collection is not
* a valid name.
*/
- public void setIssuerNames(Collection names) throws IOException
+ public void setIssuerNames(Collection<?> names) throws IOException
{
if (names == null)
{
@@ -224,7 +225,7 @@
*
* @return The set of issuer names.
*/
- public Collection getIssuerNames()
+ public Collection<Object> getIssuerNames()
{
if (issuerNames != null)
return Collections.unmodifiableList(issuerNames);
Index: java/security/cert/X509CertSelector.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/java/security/cert/X509CertSelector.java,v
retrieving revision 1.4.2.4
diff -u -r1.4.2.4 X509CertSelector.java
--- java/security/cert/X509CertSelector.java 2 Aug 2005 20:12:26 -0000
1.4.2.4
+++ java/security/cert/X509CertSelector.java 25 Nov 2005 22:15:18 -0000
@@ -76,6 +76,7 @@
* use or modify this class then they need to synchronize on the object.
*
* @author Casey Marshall (address@hidden)
+ * @since 1.4
*/
public class X509CertSelector implements CertSelector, Cloneable
{
@@ -588,7 +589,7 @@
* @param keyPurposeSet The set of key purpose OIDs.
* @throws IOException If any element of the set is not a valid OID string.
*/
- public void setExtendedKeyUsage(Set keyPurposeSet) throws IOException
+ public void setExtendedKeyUsage(Set<String> keyPurposeSet) throws IOException
{
if (keyPurposeSet == null)
{
@@ -653,7 +654,7 @@
* @param altNames The alternative names.
* @throws IOException If any element of the argument is invalid.
*/
- public void setSubjectAlternativeNames(Collection altNames)
+ public void setSubjectAlternativeNames(Collection<List<?>> altNames)
throws IOException
{
if (altNames == null)
@@ -786,7 +787,7 @@
// certificate, and check it against the specified set.
// FIXME
-// public void setPolicy(Set policy) throws IOException
+// public void setPolicy(Set<String> policy) throws IOException
// {
// if (policy != null)
// {
@@ -807,7 +808,7 @@
// }
// FIXME
-// public void setPathToNames(Collection names) throws IOException
+// public void setPathToNames(Collection<List<?>> names) throws IOException
// {
// if (names == null)
// {
@@ -843,19 +844,19 @@
// }
// FIXME
-// public Collection getSubjectAlternativeNames()
+// public Collection<List<?>> getSubjectAlternativeNames()
// {
// return null;
// }
// FIXME
-// public Set getPolicy()
+// public Set<String> getPolicy()
// {
// return null;
// }
// FIXME
-// public Collection getPathToNames()
+// public Collection<List<?>> getPathToNames()
// {
// return null;
// }
Index: java/security/cert/X509Certificate.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/cert/X509Certificate.java,v
retrieving revision 1.6.2.2
diff -u -r1.6.2.2 X509Certificate.java
--- java/security/cert/X509Certificate.java 2 Aug 2005 20:12:26 -0000
1.6.2.2
+++ java/security/cert/X509Certificate.java 25 Nov 2005 22:15:18 -0000
@@ -41,6 +41,7 @@
import java.math.BigInteger;
import java.security.Principal;
import java.util.Date;
+import java.util.List;
/**
* X509Certificate is the abstract class for X.509 certificates.
@@ -131,7 +132,7 @@
* Profile</a></i>.</li>
* </ol>
*
- * @since JDK 1.2
+ * @since 1.2
* @author Mark Benvenuto
* @author Casey Marshall (address@hidden)
*/
@@ -487,7 +488,7 @@
* @throws CertificateParsingException If this extension cannot be
* parsed from its encoded form.
*/
- public java.util.List getExtendedKeyUsage()
+ public java.util.List<String> getExtendedKeyUsage()
throws CertificateParsingException
{
throw new UnsupportedOperationException();
@@ -531,7 +532,7 @@
* be parsed.
* @since JDK 1.4
*/
- public java.util.Collection getSubjectAlternativeNames()
+ public java.util.Collection<List<?>> getSubjectAlternativeNames()
throws CertificateParsingException
{
throw new UnsupportedOperationException();
@@ -558,7 +559,7 @@
* be parsed.
* @since JDK 1.4
*/
- public java.util.Collection getIssuerAlternativeNames()
+ public java.util.Collection<List<?>> getIssuerAlternativeNames()
throws CertificateParsingException
{
throw new UnsupportedOperationException();
Index: java/security/cert/X509Extension.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/cert/X509Extension.java,v
retrieving revision 1.6.2.1
diff -u -r1.6.2.1 X509Extension.java
--- java/security/cert/X509Extension.java 2 Aug 2005 20:12:26 -0000
1.6.2.1
+++ java/security/cert/X509Extension.java 25 Nov 2005 22:15:18 -0000
@@ -70,7 +70,7 @@
@author Mark Benvenuto
- @since JDK 1.2
+ @since 1.2
*/
public interface X509Extension
{
@@ -91,7 +91,7 @@
@return A Set containing the OIDs. If there are no CRITICAL
extensions or extensions at all this returns null.
*/
- Set getCriticalExtensionOIDs();
+ Set<String> getCriticalExtensionOIDs();
/**
Returns a set of the NON-CRITICAL extension OIDs from the
@@ -101,7 +101,7 @@
@return A Set containing the OIDs. If there are no NON-CRITICAL
extensions or extensions at all this returns null.
*/
- Set getNonCriticalExtensionOIDs();
+ Set<String> getNonCriticalExtensionOIDs();
/**
Returns the DER encoded OCTET string for the specified
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [cp-patches] [generics] Patch: FYI: genericize java.security.cert,
Tom Tromey <=