1 files changed, 25 insertions, 30 deletions

diff --git a/javax/security/auth/x500/X500Principal.java b/javax/security/auth/x500/X500Principal.java
index 0a1e8c665..79c3336e1 100644
--- a/javax/security/auth/x500/X500Principal.java
+++ b/javax/security/auth/x500/X500Principal.java
@@ -1,5 +1,5 @@
 /* X500Principal.java -- X.500 principal.
-   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2014 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -89,9 +89,8 @@ public final class X500Principal implements Principal, Serializable
   private static final OID DC         = new OID("0.9.2342.19200300.100.1.25");
   private static final OID UID        = new OID("0.9.2342.19200300.100.1.1");
 
-  private transient List components;
-  private transient Map currentRdn;
-  private transient boolean fixed;
+  private transient List<Map<OID,String>> components;
+  private transient Map<OID,String> currentRdn;
   private transient byte[] encoded;
 
   // Constructors.
@@ -99,8 +98,8 @@ public final class X500Principal implements Principal, Serializable
 
   private X500Principal()
   {
-    components = new LinkedList();
-    currentRdn = new LinkedHashMap();
+    components = new LinkedList<Map<OID,String>>();
+    currentRdn = new LinkedHashMap<OID,String>();
     components.add (currentRdn);
   }
 
@@ -147,12 +146,11 @@ public final class X500Principal implements Principal, Serializable
     int result = size();
     for (int i = 0; i < size(); ++i)
       {
-        Map m = (Map) components.get(i);
-        for (Iterator it2 = m.entrySet().iterator(); it2.hasNext(); )
+        Map<OID,String> m = components.get(i);
+	for (Map.Entry<OID,String> e : m.entrySet())
           {
-            Map.Entry e = (Map.Entry) it2.next();
             // We don't bother looking at the value of the entry.
-            result = result * 31 + ((OID) e.getKey()).hashCode();
+            result = result * 31 + e.getKey().hashCode();
           }
       }
     return result;
@@ -166,12 +164,11 @@ public final class X500Principal implements Principal, Serializable
       return false;
     for (int i = 0; i < size(); i++)
       {
-        Map m = (Map) components.get (i);
-        for (Iterator it2 = m.entrySet().iterator(); it2.hasNext(); )
+        Map<OID,String> m = components.get (i);
+	for (Map.Entry<OID,String> e : m.entrySet())
           {
-            Map.Entry e = (Map.Entry) it2.next();
-            OID oid = (OID) e.getKey();
-            String v1 = (String) e.getValue();
+            OID oid = e.getKey();
+            String v1 = e.getValue();
             String v2 = ((X500Principal) o).getComponent (oid, i);
             if (v2 == null)
               return false;
@@ -203,14 +200,14 @@ public final class X500Principal implements Principal, Serializable
     if (! (rfc2253 || rfc1779 || canon))
       throw new IllegalArgumentException ("unsupported format " + format);
     CPStringBuilder str = new CPStringBuilder();
-    for (Iterator it = components.iterator(); it.hasNext(); )
+    for (Iterator<Map<OID,String>> it = components.iterator(); it.hasNext(); )
       {
-        Map m = (Map) it.next();
-        for (Iterator it2 = m.entrySet().iterator(); it2.hasNext(); )
+        Map<OID,String> m = it.next();
+        for (Iterator<Map.Entry<OID,String>> it2 = m.entrySet().iterator(); it2.hasNext(); )
           {
-            Map.Entry entry = (Map.Entry) it2.next();
-            OID oid = (OID) entry.getKey();
-            String value = (String) entry.getValue();
+            Map.Entry<OID,String> entry = it2.next();
+            OID oid = entry.getKey();
+            String value = entry.getValue();
             if (oid.equals (CN))
               str.append ("CN");
             else if (oid.equals (C))
@@ -278,22 +275,20 @@ public final class X500Principal implements Principal, Serializable
   {
     if (rdn >= size())
       return null;
-    return (String) ((Map) components.get (rdn)).get (oid);
+    return components.get(rdn).get(oid);
   }
 
   private void encodeDer()
   {
-    ArrayList name = new ArrayList(components.size());
-    for (Iterator it = components.iterator(); it.hasNext(); )
+    ArrayList<DERValue> name = new ArrayList<DERValue>(components.size());
+    for (Map<OID,String> m : components)
       {
-        Map m = (Map) it.next();
         if (m.isEmpty())
           continue;
-        Set rdn = new HashSet();
-        for (Iterator it2 = m.entrySet().iterator(); it2.hasNext(); )
+        Set<DERValue> rdn = new HashSet<DERValue>();
+	for (Map.Entry<OID,String> e : m.entrySet())
           {
-            Map.Entry e = (Map.Entry) it2.next();
-            ArrayList atav = new ArrayList(2);
+            ArrayList<DERValue> atav = new ArrayList<DERValue>(2);
             atav.add(new DERValue(DER.OBJECT_IDENTIFIER, e.getKey()));
             atav.add(new DERValue(DER.UTF8_STRING, e.getValue()));
             rdn.add(new DERValue(DER.SEQUENCE|DER.CONSTRUCTED, atav));
@@ -484,7 +479,7 @@ public final class X500Principal implements Principal, Serializable
 
   private void newRelativeDistinguishedName()
   {
-    currentRdn = new LinkedHashMap();
+    currentRdn = new LinkedHashMap<OID,String>();
     components.add(currentRdn);
   }