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
6 changed files with 33 additions and 29 deletions
|
@ -1,5 +1,5 @@
|
|||
/* 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.
|
||||
|
||||
|
@ -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
|
||||
exception statement from your version. */
|
||||
|
||||
|
||||
package java.nio.channels;
|
||||
|
||||
import gnu.java.nio.ChannelInputStream;
|
||||
|
@ -62,7 +63,10 @@ public final class Channels
|
|||
/**
|
||||
* 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.
|
||||
|
|
|
@ -147,19 +147,19 @@ public abstract class Charset implements Comparable
|
|||
* 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 (); )
|
||||
{
|
||||
|
@ -167,15 +167,15 @@ public abstract class Charset implements Comparable
|
|||
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 ()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue