You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ml...@apache.org on 2006/04/13 15:09:16 UTC
svn commit: r393797 [2/3] - in
/incubator/harmony/enhanced/classlib/trunk/modules:
auth/src/main/java/common/javax/security/sasl/
luni-kernel/src/main/java/java/lang/ luni/src/main/java/java/lang/
luni/src/main/java/java/util/ security-kernel/src/main/...
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/SecureClassLoader.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/SecureClassLoader.java?rev=393797&r1=393796&r2=393797&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/SecureClassLoader.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/SecureClassLoader.java Thu Apr 13 06:08:58 2006
@@ -59,7 +59,7 @@
/**
* @com.intel.drl.spec_ref
*/
- protected final Class defineClass(String name, byte[] b, int off, int len,
+ protected final Class<?> defineClass(String name, byte[] b, int off, int len,
CodeSource cs) {
return cs == null ? defineClass(name, b, off, len) : defineClass(name,
b, off, len, getPD(cs));
@@ -68,7 +68,7 @@
/**
* @com.intel.drl.spec_ref
*/
- protected final Class defineClass(String name, ByteBuffer b, CodeSource cs) {
+ protected final Class<?> defineClass(String name, ByteBuffer b, CodeSource cs) {
//FIXME 1.5 - remove b.array(), call super.defineClass(,ByteBuffer,)
// directly
byte[] data = b.array();
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Security.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Security.java?rev=393797&r1=393796&r2=393797&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Security.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Security.java Thu Apr 13 06:08:58 2006
@@ -261,7 +261,7 @@
* @com.intel.drl.spec_ref
*
*/
- public static synchronized Provider[] getProviders(Map filter) {
+ public static synchronized Provider[] getProviders(Map<String,String> filter) {
if (filter == null) {
throw new NullPointerException("The filter is null");
}
@@ -348,7 +348,7 @@
* @com.intel.drl.spec_ref
*
*/
- public static Set getAlgorithms(String serviceName) {
+ public static Set<String> getAlgorithms(String serviceName) {
// FIXME for 1.5 classes
// new HashSet() -> emptySet()
Set result = new HashSet();
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/Acl.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/Acl.java?rev=393797&r1=393796&r2=393797&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/Acl.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/Acl.java Thu Apr 13 06:08:58 2006
@@ -54,15 +54,13 @@
/**
* @com.intel.drl.spec_ref
- * TODO change in 1.5
*/
- Enumeration getPermissions(Principal user);
+ Enumeration<Permission> getPermissions(Principal user);
/**
* @com.intel.drl.spec_ref
- * TODO change in 1.5
*/
- Enumeration entries();
+ Enumeration<AclEntry> entries();
/**
* @com.intel.drl.spec_ref
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/AclEntry.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/AclEntry.java?rev=393797&r1=393796&r2=393797&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/AclEntry.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/AclEntry.java Thu Apr 13 06:08:58 2006
@@ -68,9 +68,8 @@
/**
* @com.intel.drl.spec_ref
- * TODO change in 1.5
*/
- Enumeration permissions();
+ Enumeration<Permission> permissions();
/**
* @com.intel.drl.spec_ref
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/Group.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/Group.java?rev=393797&r1=393796&r2=393797&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/Group.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/Group.java Thu Apr 13 06:08:58 2006
@@ -48,8 +48,7 @@
/**
* @com.intel.drl.spec_ref
- * TODO change in 1.5
*/
- Enumeration members();
+ Enumeration<? extends Principal> members();
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertPath.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertPath.java?rev=393797&r1=393796&r2=393797&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertPath.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertPath.java Thu Apr 13 06:08:58 2006
@@ -105,7 +105,7 @@
/**
* @com.intel.drl.spec_ref
*/
- public abstract List getCertificates();
+ public abstract List<? extends Certificate> getCertificates();
/**
* @com.intel.drl.spec_ref
@@ -122,7 +122,7 @@
/**
* @com.intel.drl.spec_ref
*/
- public abstract Iterator getEncodings();
+ public abstract Iterator<String> getEncodings();
/**
* @com.intel.drl.spec_ref
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertStore.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertStore.java?rev=393797&r1=393796&r2=393797&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertStore.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertStore.java Thu Apr 13 06:08:58 2006
@@ -183,7 +183,7 @@
/**
* @com.intel.drl.spec_ref
*/
- public final Collection getCertificates(CertSelector selector)
+ public final Collection<? extends Certificate> getCertificates(CertSelector selector)
throws CertStoreException {
return spiImpl.engineGetCertificates(selector);
}
@@ -191,7 +191,7 @@
/**
* @com.intel.drl.spec_ref
*/
- public final Collection getCRLs(CRLSelector selector)
+ public final Collection<? extends CRL> getCRLs(CRLSelector selector)
throws CertStoreException {
return spiImpl.engineGetCRLs(selector);
}
@@ -209,4 +209,4 @@
);
return (defaultType == null ? DEFAULTPROPERTY : defaultType);
}
-}
\ No newline at end of file
+}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertStoreSpi.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertStoreSpi.java?rev=393797&r1=393796&r2=393797&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertStoreSpi.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertStoreSpi.java Thu Apr 13 06:08:58 2006
@@ -44,7 +44,7 @@
*
* FIXME: 1.5 updated are needed Collection <? extends Certificate>
*/
- public abstract Collection engineGetCertificates(CertSelector selector)
+ public abstract Collection<? extends Certificate> engineGetCertificates(CertSelector selector)
throws CertStoreException;
/**
@@ -52,6 +52,6 @@
*
* FIXME: 1.5 updated are needed Collection <? extends CRL>
*/
- public abstract Collection engineGetCRLs(CRLSelector selector)
+ public abstract Collection<? extends CRL> engineGetCRLs(CRLSelector selector)
throws CertStoreException;
-}
\ No newline at end of file
+}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertificateFactory.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertificateFactory.java?rev=393797&r1=393796&r2=393797&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertificateFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertificateFactory.java Thu Apr 13 06:08:58 2006
@@ -160,10 +160,8 @@
/**
* @com.intel.drl.spec_ref
- *
- * FIXME: update to Iterator <String>getCertPathEncodings()
*/
- public final Iterator getCertPathEncodings() {
+ public final Iterator<String> getCertPathEncodings() {
return spiImpl.engineGetCertPathEncodings();
}
@@ -189,20 +187,16 @@
/**
* @com.intel.drl.spec_ref
- *
- * FIXME: update parameter to (List <? extends Certificate> certificates)
*/
- public final CertPath generateCertPath(List certificates)
+ public final CertPath generateCertPath(List<? extends Certificate> certificates)
throws CertificateException {
return spiImpl.engineGenerateCertPath(certificates);
}
/**
* @com.intel.drl.spec_ref
- *
- * FIXME: update returned value to Collection <? extends Certificate>
*/
- public final Collection generateCertificates(InputStream inStream)
+ public final Collection<? extends Certificate> generateCertificates(InputStream inStream)
throws CertificateException {
return spiImpl.engineGenerateCertificates(inStream);
}
@@ -216,11 +210,9 @@
/**
* @com.intel.drl.spec_ref
- *
- * FIXME: update returned value to Collection <? extends CRL>
*/
- public final Collection generateCRLs(InputStream inStream)
+ public final Collection<? extends CRL> generateCRLs(InputStream inStream)
throws CRLException {
return spiImpl.engineGenerateCRLs(inStream);
}
-}
\ No newline at end of file
+}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertificateFactorySpi.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertificateFactorySpi.java?rev=393797&r1=393796&r2=393797&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertificateFactorySpi.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertificateFactorySpi.java Thu Apr 13 06:08:58 2006
@@ -47,11 +47,9 @@
/**
* @com.intel.drl.spec_ref
- *
- * FIXME: 1.5 updates are needed Collection <? extends Certificate>
*/
- public abstract Collection engineGenerateCertificates(InputStream inStream)
- throws CertificateException;
+ public abstract Collection<? extends Certificate>
+ engineGenerateCertificates(InputStream inStream) throws CertificateException;
/**
* @com.intel.drl.spec_ref
@@ -61,11 +59,9 @@
/**
* @com.intel.drl.spec_ref
- *
- * FIXME: 1.5 updates are needed Collection <? extends CRL>
*/
- public abstract Collection engineGenerateCRLs(InputStream inStream)
- throws CRLException;
+ public abstract Collection<? extends CRL>
+ engineGenerateCRLs(InputStream inStream) throws CRLException;
/**
* @com.intel.drl.spec_ref
@@ -88,7 +84,7 @@
/**
* @com.intel.drl.spec_ref
*/
- public CertPath engineGenerateCertPath(List certificates)
+ public CertPath engineGenerateCertPath(List<? extends Certificate> certificates)
throws CertificateException {
throw new UnsupportedOperationException(
"Method engineGenerateCertPath(List certificates) is not supported");
@@ -96,11 +92,9 @@
/**
* @com.intel.drl.spec_ref
- *
- * FIXME: 1.5 updates are needed Iterator <String>
*/
- public Iterator engineGetCertPathEncodings() {
+ public Iterator<String> engineGetCertPathEncodings() {
throw new UnsupportedOperationException(
"Method engineGetCertPathEncodings() is not supported");
}
-}
\ No newline at end of file
+}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CollectionCertStoreParameters.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CollectionCertStoreParameters.java?rev=393797&r1=393796&r2=393797&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CollectionCertStoreParameters.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CollectionCertStoreParameters.java Thu Apr 13 06:08:58 2006
@@ -47,7 +47,7 @@
/**
* @com.intel.drl.spec_ref
*/
- public CollectionCertStoreParameters(Collection collection) {
+ public CollectionCertStoreParameters(Collection<?> collection) {
this.collection = collection;
if (this.collection == null) {
throw new NullPointerException();
@@ -64,7 +64,7 @@
/**
* @com.intel.drl.spec_ref
*/
- public Collection getCollection() {
+ public Collection<?> getCollection() {
return collection;
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PKIXBuilderParameters.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PKIXBuilderParameters.java?rev=393797&r1=393796&r2=393797&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PKIXBuilderParameters.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PKIXBuilderParameters.java Thu Apr 13 06:08:58 2006
@@ -38,7 +38,7 @@
/**
* @com.intel.drl.spec_ref
*/
- public PKIXBuilderParameters(Set trustAnchors,
+ public PKIXBuilderParameters(Set<TrustAnchor> trustAnchors,
CertSelector targetConstraints)
throws InvalidAlgorithmParameterException {
super(trustAnchors);
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PKIXCertPathChecker.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PKIXCertPathChecker.java?rev=393797&r1=393796&r2=393797&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PKIXCertPathChecker.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PKIXCertPathChecker.java Thu Apr 13 06:08:58 2006
@@ -60,11 +60,11 @@
/**
* @com.intel.drl.spec_ref
*/
- public abstract Set getSupportedExtensions();
+ public abstract Set<String> getSupportedExtensions();
/**
* @com.intel.drl.spec_ref
*/
- public abstract void check(Certificate cert, Collection unresolvedCritExts)
+ public abstract void check(Certificate cert, Collection<String> unresolvedCritExts)
throws CertPathValidatorException;
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PKIXParameters.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PKIXParameters.java?rev=393797&r1=393796&r2=393797&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PKIXParameters.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PKIXParameters.java Thu Apr 13 06:08:58 2006
@@ -39,16 +39,16 @@
*/
public class PKIXParameters implements CertPathParameters {
// Set of trust anchors - most trusted CAs
- private Set trustAnchors;
+ private Set<TrustAnchor> trustAnchors;
// Set of acceptable initial policy identifiers (OID strings)
- private Set initialPolicies;
+ private Set<String> initialPolicies;
// List of cert stores that used to find certificates and CRLs
- private List certStores;
+ private List<CertStore> certStores;
// Time for which the valididty of the certification
// patch should be determined
private Date date;
// List of certification patch checkers (PKIXCertPathChecker)
- private List certPathCheckers;
+ private List<PKIXCertPathChecker> certPathCheckers;
// Preferred signature provider name
private String sigProvider;
// Required constraints on the target certificate
@@ -69,14 +69,14 @@
/**
* @com.intel.drl.spec_ref
*/
- public PKIXParameters(Set trustAnchors)
+ public PKIXParameters(Set<TrustAnchor> trustAnchors)
throws InvalidAlgorithmParameterException {
if (trustAnchors == null) {
throw new NullPointerException(
"the trustAnchors parameter is null");
}
checkTrustAnchors(trustAnchors);
- this.trustAnchors = new HashSet(trustAnchors);
+ this.trustAnchors = new HashSet<TrustAnchor>(trustAnchors);
}
/**
@@ -95,7 +95,7 @@
"the keystore is empty");
}
// keyStore is not null and loaded
- trustAnchors = new HashSet();
+ trustAnchors = new HashSet<TrustAnchor>();
for (Enumeration i = keyStore.aliases(); i.hasMoreElements();) {
String alias = (String) i.nextElement();
if (keyStore.isCertificateEntry(alias)) {
@@ -115,14 +115,14 @@
/**
* @com.intel.drl.spec_ref
*/
- public Set getTrustAnchors() {
+ public Set<TrustAnchor> getTrustAnchors() {
return Collections.unmodifiableSet(trustAnchors);
}
/**
* @com.intel.drl.spec_ref
*/
- public void setTrustAnchors(Set trustAnchors)
+ public void setTrustAnchors(Set<TrustAnchor> trustAnchors)
throws InvalidAlgorithmParameterException {
if (trustAnchors == null) {
throw new NullPointerException(
@@ -130,7 +130,7 @@
}
checkTrustAnchors(trustAnchors);
// make shallow copy
- this.trustAnchors = new HashSet(trustAnchors);
+ this.trustAnchors = new HashSet<TrustAnchor>(trustAnchors);
}
/**
@@ -150,10 +150,10 @@
/**
* @com.intel.drl.spec_ref
*/
- public List getCertPathCheckers() {
+ public List<PKIXCertPathChecker> getCertPathCheckers() {
if (certPathCheckers == null) {
// set to empty List if has not been set yet
- certPathCheckers = new ArrayList();
+ certPathCheckers = new ArrayList<PKIXCertPathChecker>();
}
if (certPathCheckers.isEmpty()) {
// no content - no need to copy,
@@ -162,9 +162,11 @@
return Collections.unmodifiableList(certPathCheckers);
}
// List is not empty - do deep copy
- ArrayList modifiableList = new ArrayList();
- for (Iterator i = certPathCheckers.iterator(); i.hasNext();) {
- modifiableList.add(((PKIXCertPathChecker)i.next()).clone());
+ ArrayList<PKIXCertPathChecker> modifiableList =
+ new ArrayList<PKIXCertPathChecker>();
+ for (Iterator<PKIXCertPathChecker> i
+ = certPathCheckers.iterator(); i.hasNext();) {
+ modifiableList.add((PKIXCertPathChecker)i.next().clone());
}
return Collections.unmodifiableList(modifiableList);
}
@@ -172,7 +174,7 @@
/**
* @com.intel.drl.spec_ref
*/
- public void setCertPathCheckers(List certPathCheckers) {
+ public void setCertPathCheckers(List<PKIXCertPathChecker> certPathCheckers) {
if (certPathCheckers == null || certPathCheckers.isEmpty()) {
// empty list or null provided
if (this.certPathCheckers != null &&
@@ -183,9 +185,10 @@
return;
}
// non-empty list provided - do deep copy
- this.certPathCheckers = new ArrayList();
- for (Iterator i = certPathCheckers.iterator(); i.hasNext();) {
- this.certPathCheckers.add(((PKIXCertPathChecker)i.next()).clone());
+ this.certPathCheckers = new ArrayList<PKIXCertPathChecker>();
+ for (Iterator<PKIXCertPathChecker> i
+ = certPathCheckers.iterator(); i.hasNext();) {
+ this.certPathCheckers.add((PKIXCertPathChecker)i.next().clone());
}
}
@@ -199,19 +202,19 @@
}
if (certPathCheckers == null) {
// set to empty List if has not been set yet
- certPathCheckers = new ArrayList();
+ certPathCheckers = new ArrayList<PKIXCertPathChecker>();
}
// add a copy to avoid possible modifications
- certPathCheckers.add(checker.clone());
+ certPathCheckers.add((PKIXCertPathChecker) checker.clone());
}
/**
* @com.intel.drl.spec_ref
*/
- public List getCertStores() {
+ public List<CertStore> getCertStores() {
if (certStores == null) {
// set to empty List if has not been set yet
- certStores = new ArrayList();
+ certStores = new ArrayList<CertStore>();
}
if (certStores.isEmpty()) {
// no content - no need to copy,
@@ -220,14 +223,15 @@
return Collections.unmodifiableList(certStores);
}
// List is not empty - do shallow copy
- ArrayList modifiableList = new ArrayList(certStores);
+ ArrayList<CertStore> modifiableList
+ = new ArrayList<CertStore>(certStores);
return Collections.unmodifiableList(modifiableList);
}
/**
* @com.intel.drl.spec_ref
*/
- public void setCertStores(List certStores) {
+ public void setCertStores(List<CertStore> certStores) {
if (certStores == null || certStores.isEmpty()) {
// empty list or null provided
if (this.certStores != null && !this.certStores.isEmpty()) {
@@ -294,7 +298,7 @@
/**
* @com.intel.drl.spec_ref
*/
- public Set getInitialPolicies() {
+ public Set<String> getInitialPolicies() {
if (initialPolicies == null) {
// set to empty Set if has not been set yet
initialPolicies = new HashSet();
@@ -313,7 +317,7 @@
/**
* @com.intel.drl.spec_ref
*/
- public void setInitialPolicies(Set initialPolicies) {
+ public void setInitialPolicies(Set<String> initialPolicies) {
if (initialPolicies == null || initialPolicies.isEmpty()) {
// empty list or null provided
if (this.initialPolicies != null &&
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PolicyNode.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PolicyNode.java?rev=393797&r1=393796&r2=393797&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PolicyNode.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PolicyNode.java Thu Apr 13 06:08:58 2006
@@ -32,10 +32,8 @@
/**
* @com.intel.drl.spec_ref
- *
- * FIXME: for 1.5 update Iterator <? extends PolicyNode> getChildren();
*/
- public Iterator getChildren();
+ public Iterator<? extends PolicyNode> getChildren();
/**
* @com.intel.drl.spec_ref
@@ -44,10 +42,8 @@
/**
* @com.intel.drl.spec_ref
- *
- * FIXME: for 1.5 update Set <String>getExpectedPolicies();
*/
- public Set getExpectedPolicies();
+ public Set<String> getExpectedPolicies();
/**
* @com.intel.drl.spec_ref
@@ -56,11 +52,8 @@
/**
* @com.intel.drl.spec_ref
- *
- * FIXME: for 1.5 update Set <? extends PolicyQualifierInfo>
- * getPolicyQualifiers();
*/
- public Set getPolicyQualifiers();
+ public Set<? extends PolicyQualifierInfo> getPolicyQualifiers();
/**
* @com.intel.drl.spec_ref
@@ -71,4 +64,4 @@
* @com.intel.drl.spec_ref
*/
public boolean isCritical();
-}
\ No newline at end of file
+}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CRL.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CRL.java?rev=393797&r1=393796&r2=393797&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CRL.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CRL.java Thu Apr 13 06:08:58 2006
@@ -150,7 +150,7 @@
/**
* @com.intel.drl.spec_ref
*/
- public abstract Set/*<? extends X509CRLEntry>*/ getRevokedCertificates();
+ public abstract Set<? extends X509CRLEntry> getRevokedCertificates();
/**
* @com.intel.drl.spec_ref
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CRLSelector.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CRLSelector.java?rev=393797&r1=393796&r2=393797&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CRLSelector.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CRLSelector.java Thu Apr 13 06:08:58 2006
@@ -58,7 +58,7 @@
/**
* @com.intel.drl.spec_ref
*/
- public void setIssuers(Collection/*FIXME<X500Principal>*/ issuers) {
+ public void setIssuers(Collection<X500Principal> issuers) {
if (issuers == null) {
issuerNames = null;
return;
@@ -69,7 +69,7 @@
/**
* @com.intel.drl.spec_ref
*/
- public void setIssuerNames(Collection/*FIXME<?>*/names) throws IOException {
+ public void setIssuerNames(Collection<?> names) throws IOException {
if (names == null) {
issuerNames = null;
return;
@@ -158,7 +158,7 @@
/**
* @com.intel.drl.spec_ref
*/
- public Collection/*FIXME<X500Principal>*/ getIssuers() {
+ public Collection<X500Principal> getIssuers() {
if (issuerNames == null) {
return null;
}
@@ -168,7 +168,7 @@
/**
* @com.intel.drl.spec_ref
*/
- public Collection/*FIXME<Object>*/ getIssuerNames() {
+ public Collection<Object> getIssuerNames() {
if (issuerNames == null) {
return null;
}