* gnu/java/nio/SelectorImpl.java (keys): Changed type.

	(selected): Likewise.
	(SelectorImpl): Updated.
	(keys): Changed return type.
	(getFDsAsArray): Updated.
	(select): Likewise.
	(selectedKeys): Changed return type.
	(deregisterCancelledKeys): Updated.
	* java/nio/channels/Selector.java (selectedKeys): Changed return
	type.
	(keys): Likewise.

3 files changed, 26 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index d9e3f0225..8524bf6b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2005-10-24  Tom Tromey  <tromey@redhat.com>
 
+	* gnu/java/nio/SelectorImpl.java (keys): Changed type.
+	(selected): Likewise.
+	(SelectorImpl): Updated.
+	(keys): Changed return type.
+	(getFDsAsArray): Updated.
+	(select): Likewise.
+	(selectedKeys): Changed return type.
+	(deregisterCancelledKeys): Updated.
+	* java/nio/channels/Selector.java (selectedKeys): Changed return
+	type.
+	(keys): Likewise.
+
+2005-10-24  Tom Tromey  <tromey@redhat.com>
+
 	* java/awt/image/ReplicateScaleFilter.java (setProperties): Changed
 	argument type.
 	* java/awt/image/CropImageFilter.java (setProperties): Changed
diff --git a/gnu/java/nio/SelectorImpl.java b/gnu/java/nio/SelectorImpl.java
index dcafedeb8..f0f56f9c3 100644
--- a/gnu/java/nio/SelectorImpl.java
+++ b/gnu/java/nio/SelectorImpl.java
@@ -53,8 +53,8 @@ import java.util.Set;
 
 public class SelectorImpl extends AbstractSelector
 {
-  private Set keys;
-  private Set selected;
+  private Set<SelectionKey> keys;
+  private Set<SelectionKey> selected;
 
   /**
    * A dummy object whose monitor regulates access to both our
@@ -82,8 +82,8 @@ public class SelectorImpl extends AbstractSelector
   {
     super (provider);
     
-    keys = new HashSet ();
-    selected = new HashSet ();
+    keys = new HashSet<SelectionKey> ();
+    selected = new HashSet<SelectionKey> ();
   }
 
   protected void finalize() throws Throwable
@@ -109,7 +109,7 @@ public class SelectorImpl extends AbstractSelector
       }
   }
 
-  public final Set keys()
+  public final Set<SelectionKey> keys()
   {
     if (!isOpen())
       throw new ClosedSelectorException();
@@ -135,7 +135,7 @@ public class SelectorImpl extends AbstractSelector
   {
     int[] result;
     int counter = 0;
-    Iterator it = keys.iterator ();
+    Iterator<SelectionKey> it = keys.iterator ();
 
     // Count the number of file descriptors needed
     while (it.hasNext ())
@@ -252,7 +252,7 @@ public class SelectorImpl extends AbstractSelector
                 selectThread = null;
               }
 
-            Iterator it = keys.iterator ();
+            Iterator<SelectionKey> it = keys.iterator ();
 
             while (it.hasNext ())
               {
@@ -317,7 +317,7 @@ public class SelectorImpl extends AbstractSelector
         }
   }
     
-  public final Set selectedKeys()
+  public final Set<SelectionKey> selectedKeys()
   {
     if (!isOpen())
       throw new ClosedSelectorException();
@@ -350,10 +350,10 @@ public class SelectorImpl extends AbstractSelector
 
   private final void deregisterCancelledKeys()
   {
-    Set ckeys = cancelledKeys ();
+    Set<SelectionKey> ckeys = cancelledKeys ();
     synchronized (ckeys)
     {
-      Iterator it = ckeys.iterator();
+      Iterator<SelectionKey> it = ckeys.iterator();
 
       while (it.hasNext ())
         {
diff --git a/java/nio/channels/Selector.java b/java/nio/channels/Selector.java
index 2c883efd1..1c09db702 100644
--- a/java/nio/channels/Selector.java
+++ b/java/nio/channels/Selector.java
@@ -82,7 +82,7 @@ public abstract class Selector
    *
    * @exception ClosedSelectorException If this selector is closed.
    */
-  public abstract Set keys();
+  public abstract Set<SelectionKey> keys();
 
   /**
    * Returns the SelectorProvider that created the selector.
@@ -115,7 +115,7 @@ public abstract class Selector
    *
    * @exception ClosedSelectorException If this selector is closed.
    */
-  public abstract Set selectedKeys();
+  public abstract Set<SelectionKey> selectedKeys();
 
   /**
    * Selects a set of keys whose corresponding channels are ready