From 948bfab248d4cb1faf00c5999f8a55580e89999f Mon Sep 17 00:00:00 2001
From: Adam Young <ayoung@redhat.com>
Date: Mon, 5 Dec 2011 17:15:56 -0500
Subject: TreeSet

ArraySet and AttributeNameEnumeration both were not updated to handfle Generics.
Neither are really needed,  and are likely to introduce errors.

ArraySet can be safely replaced by TreeSet.
TreeSet provides a stricter ordering constraint than ArraySet did.
This will not hurt anything, and may actually be closer to the desired behavior

AttributeNameEnumeration  was a thin wrapper around Vector.
It has been replaced with Vector<String>
In addition,  this patch cleans up the Type safety in of the collections used in the related files.

removed files from cmake

Removed custom collection files

Supressed watnings generated by the clone method.
---
 .../util/src/netscape/security/extensions/GenericASN1Extension.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java')

diff --git a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java b/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java
index f4a8f3aa4..bd0fd7e1f 100644
--- a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java
+++ b/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java
@@ -28,12 +28,13 @@ import java.text.ParseException;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.StringTokenizer;
+import java.util.Vector;
 
 import netscape.security.util.BigInt;
 import netscape.security.util.DerOutputStream;
 import netscape.security.util.DerValue;
 import netscape.security.util.ObjectIdentifier;
-import netscape.security.x509.AttributeNameEnumeration;
+
 import netscape.security.x509.CertAttrSet;
 import netscape.security.x509.Extension;
 import netscape.security.x509.OIDMap;
@@ -351,7 +352,7 @@ implements CertAttrSet {
      * attribute.
      */
     public Enumeration getElements () {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+        Vector<String> elements = new Vector<String>();
         elements.addElement("octet");
 
 	    return (elements.elements());
-- 
cgit