* java/util/prefs/Preferences.java (getFactory): Genericized.

	* java/util/prefs/AbstractPreferences.java (childCache): Genericized.
	(nodeListeners): Likewise.
	(preferenceListeners): Likewise.
	(cachedChildren): Rewrote.
	(childrenNames): Updated.
	(addNodeChangeListener): Likewise.
	(addPreferenceChangeListener): Likewise.
	* gnu/java/util/prefs/gconf/GConfNativePeer.java (getKeys):
	Genericized.
	(getChildrenNodes): Likewise.
	(gconf_client_all_nodes): Likewise.
	(gconf_client_all_keys): Likewise.
	* gnu/java/util/prefs/MemoryBasedPreferences.java (entries):
	Genericized.
	(keysSpi): Likewise.
	(getSpi): Likewise.
	* gnu/java/util/prefs/GConfBasedPreferences.java (childrenNamesSpi):
	Genericized.
	(keysSpi): Likewise.
	(postorderRemove): Likewise.
	* gnu/java/util/prefs/EventDispatcher.java (queue): Genericized.
	(run): Updated.

7 files changed, 54 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index c72e99cb1..c54f7740d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2006-12-18  Tom Tromey  <tromey@redhat.com>
+
+	* java/util/prefs/Preferences.java (getFactory): Genericized.
+	* java/util/prefs/AbstractPreferences.java (childCache): Genericized.
+	(nodeListeners): Likewise.
+	(preferenceListeners): Likewise.
+	(cachedChildren): Rewrote.
+	(childrenNames): Updated.
+	(addNodeChangeListener): Likewise.
+	(addPreferenceChangeListener): Likewise.
+	* gnu/java/util/prefs/gconf/GConfNativePeer.java (getKeys):
+	Genericized.
+	(getChildrenNodes): Likewise.
+	(gconf_client_all_nodes): Likewise.
+	(gconf_client_all_keys): Likewise.
+	* gnu/java/util/prefs/MemoryBasedPreferences.java (entries):
+	Genericized.
+	(keysSpi): Likewise.
+	(getSpi): Likewise.
+	* gnu/java/util/prefs/GConfBasedPreferences.java (childrenNamesSpi):
+	Genericized.
+	(keysSpi): Likewise.
+	(postorderRemove): Likewise.
+	* gnu/java/util/prefs/EventDispatcher.java (queue): Genericized.
+	(run): Updated.
+
 2006-12-18  Francis Kung  <fkung@redhat.com>
 
 	* gnu/java/awt/peer/gtk/BufferedImageGraphics.java
diff --git a/gnu/java/util/prefs/EventDispatcher.java b/gnu/java/util/prefs/EventDispatcher.java
index ecddd3a55..f73c3e703 100644
--- a/gnu/java/util/prefs/EventDispatcher.java
+++ b/gnu/java/util/prefs/EventDispatcher.java
@@ -53,7 +53,7 @@ public class EventDispatcher extends Thread
   // This is a queue of events to dispatch.  This thread waits on
   // the queue and when notified will remove events until the queue
   // is empty.
-  private static final ArrayList queue = new ArrayList();
+  private static final ArrayList<Runnable> queue = new ArrayList<Runnable>();
 
   // FIXME: this thread probably ought to go in some classpath-internal
   // ThreadGroup.  But we don't have that yet.
@@ -81,7 +81,7 @@ public class EventDispatcher extends Thread
                     // Ignore.
                   }
               }
-            r = (Runnable) queue.remove(0);
+            r = queue.remove(0);
           }
         // Invoke outside the synchronization, so that 
         // we aren't blocking other threads from posting events.
diff --git a/gnu/java/util/prefs/GConfBasedPreferences.java b/gnu/java/util/prefs/GConfBasedPreferences.java
index a7e2322b5..0fd4df366 100644
--- a/gnu/java/util/prefs/GConfBasedPreferences.java
+++ b/gnu/java/util/prefs/GConfBasedPreferences.java
@@ -41,7 +41,6 @@ import gnu.java.util.prefs.gconf.GConfNativePeer;
 
 import java.security.Permission;
 
-import java.util.Iterator;
 import java.util.List;
 import java.util.prefs.AbstractPreferences;
 import java.util.prefs.BackingStoreException;
@@ -185,7 +184,7 @@ public class GConfBasedPreferences
    */
   protected String[] childrenNamesSpi() throws BackingStoreException
   {
-    List nodeList = backend.getChildrenNodes(this.node);
+    List<String> nodeList = backend.getChildrenNodes(this.node);
     String[] nodes = new String[nodeList.size()];
     nodeList.toArray(nodes);
 
@@ -228,7 +227,7 @@ public class GConfBasedPreferences
    */
   protected String[] keysSpi() throws BackingStoreException
   {
-    List keyList = backend.getKeys(this.node);
+    List<String> keyList = backend.getKeys(this.node);
     String[] keys = new String[keyList.size()];
     keyList.toArray(keys);
 
@@ -246,31 +245,24 @@ public class GConfBasedPreferences
     try
       {
         // gets the listing of directories in this node
-        List dirs = backend.getChildrenNodes(directory);
+        List<String> dirs = backend.getChildrenNodes(directory);
 
         if (dirs.size() != 0)
           {
-            String currentDir = null;
-
-            for (Iterator itr = dirs.iterator(); itr.hasNext();)
+            for (String currentDir : dirs)
               {
-                currentDir = (String) itr.next();
-
                 // recursive search inside this directory
                 postorderRemove(currentDir);
               }
           }
 
         // remove all the keys associated to this directory
-        List entries = backend.getKeys(directory);
+        List<String> entries = backend.getKeys(directory);
 
         if (entries.size() != 0)
           {
-            String key = null;
-
-            for (Iterator keys = entries.iterator(); keys.hasNext();)
+            for (String key : entries)
               {
-                key = (String) keys.next();
                 this.removeSpi(key);
               }
           }
diff --git a/gnu/java/util/prefs/MemoryBasedPreferences.java b/gnu/java/util/prefs/MemoryBasedPreferences.java
index cccb9bf2f..dc8237916 100644
--- a/gnu/java/util/prefs/MemoryBasedPreferences.java
+++ b/gnu/java/util/prefs/MemoryBasedPreferences.java
@@ -52,7 +52,7 @@ public class MemoryBasedPreferences extends AbstractPreferences {
     private final boolean isUser;
 
     /** Contains all the preference entries of this node. */
-    private HashMap entries = new HashMap();
+    private HashMap<String, String> entries = new HashMap<String, String>();
 
     /**
      * Creates a new preferences node with the given name and parent.
@@ -98,7 +98,7 @@ public class MemoryBasedPreferences extends AbstractPreferences {
      * this node.
      */
     protected String[] keysSpi() throws BackingStoreException {
-        return (String[]) entries.keySet().toArray(new String[entries.size()]);
+        return entries.keySet().toArray(new String[entries.size()]);
     }
 
     /**
@@ -106,7 +106,7 @@ public class MemoryBasedPreferences extends AbstractPreferences {
      * null when the key has not been set.
      */
     protected String getSpi(String key) {
-        return (String) entries.get(key);
+        return entries.get(key);
     }
 
     /**
diff --git a/gnu/java/util/prefs/gconf/GConfNativePeer.java b/gnu/java/util/prefs/gconf/GConfNativePeer.java
index 6049863e9..5e12c718b 100644
--- a/gnu/java/util/prefs/gconf/GConfNativePeer.java
+++ b/gnu/java/util/prefs/gconf/GConfNativePeer.java
@@ -147,7 +147,7 @@ public final class GConfNativePeer
    * @return a java.util.List of keys. If there are no keys in the given node, a
    *         list of size 0 is returned.
    */
-  public List getKeys(String node) throws BackingStoreException
+  public List<String> getKeys(String node) throws BackingStoreException
   {
     return gconf_client_all_keys(node);
   }
@@ -159,7 +159,7 @@ public final class GConfNativePeer
    * @param node the node to get subnodes from. If there are no subnodes in the
    *          given node, a list of size 0 is returned.
    */
-  public List getChildrenNodes(String node) throws BackingStoreException
+  public List<String> getChildrenNodes(String node) throws BackingStoreException
   {
     return gconf_client_all_nodes(node);
   }
@@ -295,7 +295,7 @@ public final class GConfNativePeer
    * @return A list of nodes under the given source node.
    */
   native
-  static final protected List gconf_client_all_nodes(String node)
+  static final protected List<String> gconf_client_all_nodes(String node)
     throws BackingStoreException;
   
   /**
@@ -305,7 +305,7 @@ public final class GConfNativePeer
    * @return A list of all keys stored in the given node.
    */
   native
-  static final protected List gconf_client_all_keys(String node)
+  static final protected List<String> gconf_client_all_keys(String node)
     throws BackingStoreException;
 
   /**
diff --git a/java/util/prefs/AbstractPreferences.java b/java/util/prefs/AbstractPreferences.java
index e676dc310..f3a62e698 100644
--- a/java/util/prefs/AbstractPreferences.java
+++ b/java/util/prefs/AbstractPreferences.java
@@ -45,6 +45,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.TreeSet;
@@ -97,17 +98,18 @@ public abstract class AbstractPreferences extends Preferences {
      * accessed by earlier <code>getChild()</code> or <code>childSpi()</code>
      * invocations and that have not been removed.
      */
-    private HashMap childCache = new HashMap();
+    private HashMap<String, AbstractPreferences> childCache
+      = new HashMap<String, AbstractPreferences>();
 
     /**
      * A list of all the registered NodeChangeListener objects.
      */
-    private ArrayList nodeListeners;
+    private ArrayList<NodeChangeListener> nodeListeners;
 
     /**
      * A list of all the registered PreferenceChangeListener objects.
      */
-    private ArrayList preferenceListeners;
+    private ArrayList<PreferenceChangeListener> preferenceListeners;
 
     // constructor
 
@@ -202,7 +204,8 @@ public abstract class AbstractPreferences extends Preferences {
      */
     protected final AbstractPreferences[] cachedChildren()
     {
-      return (AbstractPreferences[]) childCache.values().toArray();
+      Collection<AbstractPreferences> vals = childCache.values();
+      return vals.toArray(new AbstractPreferences[vals.size()]);
     }
 
     /**
@@ -228,7 +231,7 @@ public abstract class AbstractPreferences extends Preferences {
             if (isRemoved())
                 throw new IllegalStateException("Node removed");
 
-            TreeSet childrenNames = new TreeSet();
+            TreeSet<String> childrenNames = new TreeSet<String>();
 
             // First get all cached node names
             childrenNames.addAll(childCache.keySet());
@@ -1165,7 +1168,7 @@ public abstract class AbstractPreferences extends Preferences {
           if (listener == null)
             throw new NullPointerException("listener is null");
           if (nodeListeners == null)
-            nodeListeners = new ArrayList();
+            nodeListeners = new ArrayList<NodeChangeListener>();
           nodeListeners.add(listener);
         }
     }
@@ -1184,7 +1187,7 @@ public abstract class AbstractPreferences extends Preferences {
           if (listener == null)
             throw new NullPointerException("listener is null");
           if (preferenceListeners == null)
-            preferenceListeners = new ArrayList();
+            preferenceListeners = new ArrayList<PreferenceChangeListener>();
           preferenceListeners.add(listener);
         }
     }
diff --git a/java/util/prefs/Preferences.java b/java/util/prefs/Preferences.java
index e53e4fc79..e8cdda8ed 100644
--- a/java/util/prefs/Preferences.java
+++ b/java/util/prefs/Preferences.java
@@ -183,9 +183,9 @@ public abstract class Preferences {
         // Get the factory
         if (factory == null) {
             // Caller might not have enough permissions
-            factory = (PreferencesFactory) AccessController.doPrivileged(
-                        new PrivilegedAction() {
-                            public Object run() {
+            factory = AccessController.doPrivileged(
+                        new PrivilegedAction<PreferencesFactory>() {
+                            public PreferencesFactory run() {
                                 PreferencesFactory pf = null;
                                 String className = System.getProperty
                                     ("java.util.prefs.PreferencesFactory");