1 files changed, 6 insertions, 14 deletions

diff --git a/libjava/classpath/gnu/java/util/prefs/GConfBasedPreferences.java b/libjava/classpath/gnu/java/util/prefs/GConfBasedPreferences.java
index a7e2322b524..0fd4df36616 100644
--- a/libjava/classpath/gnu/java/util/prefs/GConfBasedPreferences.java
+++ b/libjava/classpath/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);
               }
           }