SelectorImpl.java: Reworked import statements.
2005-02-19 Michael Koch <konqueror@gmx.de> * gnu/java/nio/SelectorImpl.java: Reworked import statements. (register): Removed unused code. * java/nio/channels/Channels.java: Reformatted. * java/nio/charset/Charset.java: Likewise. * java/rmi/server/RemoteObject.java (serialVersionUID): Made private. * java/rmi/server/UID.java (serialVersionUID): Likewise. From-SVN: r95273
This commit is contained in:
parent
4aec6c476f
commit
b376ca1ad6
|
@ -1,3 +1,15 @@
|
||||||
|
2005-02-19 Michael Koch <konqueror@gmx.de>
|
||||||
|
|
||||||
|
* gnu/java/nio/SelectorImpl.java:
|
||||||
|
Reworked import statements.
|
||||||
|
(register): Removed unused code.
|
||||||
|
* java/nio/channels/Channels.java: Reformatted.
|
||||||
|
* java/nio/charset/Charset.java: Likewise.
|
||||||
|
* java/rmi/server/RemoteObject.java
|
||||||
|
(serialVersionUID): Made private.
|
||||||
|
* java/rmi/server/UID.java
|
||||||
|
(serialVersionUID): Likewise.
|
||||||
|
|
||||||
2005-02-19 Michael Koch <konqueror@gmx.de>
|
2005-02-19 Michael Koch <konqueror@gmx.de>
|
||||||
|
|
||||||
* gnu/java/net/protocol/ftp/ActiveModeDTP.java,
|
* gnu/java/net/protocol/ftp/ActiveModeDTP.java,
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/* SelectorImpl.java --
|
/* SelectorImpl.java --
|
||||||
Copyright (C) 2002, 2003 Free Software Foundation, Inc.
|
Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of GNU Classpath.
|
This file is part of GNU Classpath.
|
||||||
|
|
||||||
|
@ -35,6 +35,7 @@ this exception to your version of the library, but you are not
|
||||||
obligated to do so. If you do not wish to do so, delete this
|
obligated to do so. If you do not wish to do so, delete this
|
||||||
exception statement from your version. */
|
exception statement from your version. */
|
||||||
|
|
||||||
|
|
||||||
package gnu.java.nio;
|
package gnu.java.nio;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
@ -49,11 +50,9 @@ import java.util.Collections;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import gnu.classpath.Configuration;
|
|
||||||
|
|
||||||
public class SelectorImpl extends AbstractSelector
|
public class SelectorImpl extends AbstractSelector
|
||||||
{
|
{
|
||||||
|
|
||||||
private Set keys;
|
private Set keys;
|
||||||
private Set selected;
|
private Set selected;
|
||||||
|
|
||||||
|
@ -375,24 +374,13 @@ public class SelectorImpl extends AbstractSelector
|
||||||
SelectionKeyImpl result;
|
SelectionKeyImpl result;
|
||||||
|
|
||||||
if (ch instanceof SocketChannelImpl)
|
if (ch instanceof SocketChannelImpl)
|
||||||
{
|
result = new SocketChannelSelectionKey (ch, this);
|
||||||
SocketChannelImpl sc = (SocketChannelImpl) ch;
|
|
||||||
result = new SocketChannelSelectionKey (ch, this);
|
|
||||||
}
|
|
||||||
else if (ch instanceof DatagramChannelImpl)
|
else if (ch instanceof DatagramChannelImpl)
|
||||||
{
|
result = new DatagramChannelSelectionKey (ch, this);
|
||||||
DatagramChannelImpl dc = (DatagramChannelImpl) ch;
|
|
||||||
result = new DatagramChannelSelectionKey (ch, this);
|
|
||||||
}
|
|
||||||
else if (ch instanceof ServerSocketChannelImpl)
|
else if (ch instanceof ServerSocketChannelImpl)
|
||||||
{
|
result = new ServerSocketChannelSelectionKey (ch, this);
|
||||||
ServerSocketChannelImpl ssc = (ServerSocketChannelImpl) ch;
|
|
||||||
result = new ServerSocketChannelSelectionKey (ch, this);
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
throw new InternalError ("No known channel type");
|
||||||
throw new InternalError ("No known channel type");
|
|
||||||
}
|
|
||||||
|
|
||||||
synchronized (keys)
|
synchronized (keys)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/* Channels.java --
|
/* Channels.java --
|
||||||
Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
|
Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of GNU Classpath.
|
This file is part of GNU Classpath.
|
||||||
|
|
||||||
|
@ -35,6 +35,7 @@ this exception to your version of the library, but you are not
|
||||||
obligated to do so. If you do not wish to do so, delete this
|
obligated to do so. If you do not wish to do so, delete this
|
||||||
exception statement from your version. */
|
exception statement from your version. */
|
||||||
|
|
||||||
|
|
||||||
package java.nio.channels;
|
package java.nio.channels;
|
||||||
|
|
||||||
import gnu.java.nio.ChannelInputStream;
|
import gnu.java.nio.ChannelInputStream;
|
||||||
|
@ -62,7 +63,10 @@ public final class Channels
|
||||||
/**
|
/**
|
||||||
* This class isn't intended to be instantiated.
|
* This class isn't intended to be instantiated.
|
||||||
*/
|
*/
|
||||||
private Channels() {}
|
private Channels()
|
||||||
|
{
|
||||||
|
// Do nothing here.
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs a stream that reads bytes from the given channel.
|
* Constructs a stream that reads bytes from the given channel.
|
||||||
|
|
|
@ -147,19 +147,19 @@ public abstract class Charset implements Comparable
|
||||||
* Retrieves a charset for the given charset name.
|
* Retrieves a charset for the given charset name.
|
||||||
*
|
*
|
||||||
* @return A charset object for the charset with the specified name, or
|
* @return A charset object for the charset with the specified name, or
|
||||||
* <code>null</code> if no such charset exists.
|
* <code>null</code> if no such charset exists.
|
||||||
*
|
*
|
||||||
* @throws IllegalCharsetNameException if the name is illegal
|
* @throws IllegalCharsetNameException if the name is illegal
|
||||||
*/
|
*/
|
||||||
private static Charset charsetForName (String charsetName)
|
private static Charset charsetForName(String charsetName)
|
||||||
{
|
{
|
||||||
checkName (charsetName);
|
checkName (charsetName);
|
||||||
return provider ().charsetForName (charsetName);
|
return provider ().charsetForName (charsetName);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static SortedMap availableCharsets ()
|
public static SortedMap availableCharsets()
|
||||||
{
|
{
|
||||||
TreeMap charsets = new TreeMap (String.CASE_INSENSITIVE_ORDER);
|
TreeMap charsets = new TreeMap(String.CASE_INSENSITIVE_ORDER);
|
||||||
|
|
||||||
for (Iterator i = provider ().charsets (); i.hasNext (); )
|
for (Iterator i = provider ().charsets (); i.hasNext (); )
|
||||||
{
|
{
|
||||||
|
@ -167,15 +167,15 @@ public abstract class Charset implements Comparable
|
||||||
charsets.put (cs.name (), cs);
|
charsets.put (cs.name (), cs);
|
||||||
}
|
}
|
||||||
|
|
||||||
return Collections.unmodifiableSortedMap (charsets);
|
return Collections.unmodifiableSortedMap(charsets);
|
||||||
}
|
}
|
||||||
|
|
||||||
// XXX: we need to support multiple providers, reading them from
|
// XXX: we need to support multiple providers, reading them from
|
||||||
// java.nio.charset.spi.CharsetProvider in the resource directory
|
// java.nio.charset.spi.CharsetProvider in the resource directory
|
||||||
// META-INF/services
|
// META-INF/services
|
||||||
private static CharsetProvider provider ()
|
private static CharsetProvider provider()
|
||||||
{
|
{
|
||||||
return Provider.provider ();
|
return Provider.provider();
|
||||||
}
|
}
|
||||||
|
|
||||||
public final String name ()
|
public final String name ()
|
||||||
|
|
|
@ -50,7 +50,7 @@ import java.util.WeakHashMap;
|
||||||
public abstract class RemoteObject
|
public abstract class RemoteObject
|
||||||
implements Remote, Serializable {
|
implements Remote, Serializable {
|
||||||
|
|
||||||
public static final long serialVersionUID = -3215090123894869218l;
|
private static final long serialVersionUID = -3215090123894869218l;
|
||||||
|
|
||||||
protected transient RemoteRef ref;
|
protected transient RemoteRef ref;
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ import java.io.Serializable;
|
||||||
|
|
||||||
public final class UID implements Serializable
|
public final class UID implements Serializable
|
||||||
{
|
{
|
||||||
public static final long serialVersionUID = 1086053664494604050L;
|
private static final long serialVersionUID = 1086053664494604050L;
|
||||||
|
|
||||||
private static final Object lock = UID.class;
|
private static final Object lock = UID.class;
|
||||||
private static long baseTime = System.currentTimeMillis();
|
private static long baseTime = System.currentTimeMillis();
|
||||||
|
|
Loading…
Reference in New Issue