+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>
* gnu/java/net/protocol/ftp/ActiveModeDTP.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.
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package gnu.java.nio;
import java.io.IOException;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import gnu.classpath.Configuration;
public class SelectorImpl extends AbstractSelector
{
-
private Set keys;
private Set selected;
SelectionKeyImpl result;
if (ch instanceof SocketChannelImpl)
- {
- SocketChannelImpl sc = (SocketChannelImpl) ch;
- result = new SocketChannelSelectionKey (ch, this);
- }
+ result = new SocketChannelSelectionKey (ch, this);
else if (ch instanceof DatagramChannelImpl)
- {
- DatagramChannelImpl dc = (DatagramChannelImpl) ch;
- result = new DatagramChannelSelectionKey (ch, this);
- }
+ result = new DatagramChannelSelectionKey (ch, this);
else if (ch instanceof ServerSocketChannelImpl)
- {
- ServerSocketChannelImpl ssc = (ServerSocketChannelImpl) ch;
- result = new ServerSocketChannelSelectionKey (ch, this);
- }
+ result = new ServerSocketChannelSelectionKey (ch, this);
else
- {
- throw new InternalError ("No known channel type");
- }
+ throw new InternalError ("No known channel type");
synchronized (keys)
{
/* 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.
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package java.nio.channels;
import gnu.java.nio.ChannelInputStream;
/**
* 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.
* Retrieves a charset for the given charset name.
*
* @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
*/
- private static Charset charsetForName (String charsetName)
+ private static Charset charsetForName(String charsetName)
{
checkName (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 (); )
{
charsets.put (cs.name (), cs);
}
- return Collections.unmodifiableSortedMap (charsets);
+ return Collections.unmodifiableSortedMap(charsets);
}
// XXX: we need to support multiple providers, reading them from
// java.nio.charset.spi.CharsetProvider in the resource directory
// META-INF/services
- private static CharsetProvider provider ()
+ private static CharsetProvider provider()
{
- return Provider.provider ();
+ return Provider.provider();
}
public final String name ()
public abstract class RemoteObject
implements Remote, Serializable {
-public static final long serialVersionUID = -3215090123894869218l;
+private static final long serialVersionUID = -3215090123894869218l;
protected transient RemoteRef ref;
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 long baseTime = System.currentTimeMillis();