Merged gcj-eclipse branch to trunk.

From-SVN: r120621
This commit is contained in:
Tom Tromey 2007-01-09 19:58:05 +00:00
parent c648dedbde
commit 97b8365caf
17478 changed files with 606493 additions and 100744 deletions

View file

@ -54,8 +54,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
@ -83,8 +83,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
@ -110,7 +110,7 @@ public class SelectorImpl extends AbstractSelector
}
}
public final Set keys()
public final Set<SelectionKey> keys()
{
if (!isOpen())
throw new ClosedSelectorException();
@ -136,7 +136,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 ())
@ -253,7 +253,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 ())
{