diff options
author | Mark Wielaard <mark@gcc.gnu.org> | 2006-03-10 21:46:48 +0000 |
---|---|---|
committer | Mark Wielaard <mark@gcc.gnu.org> | 2006-03-10 21:46:48 +0000 |
commit | 8aa540d2f783474d1d2e06f16744bf67b9c1facc (patch) | |
tree | ea38c56431c5d4528fb54254c3f8e50f517bede3 /libjava/classpath/java/nio | |
parent | 27079765d00123f8e53d0e1ef7f9d46559266e6d (diff) | |
download | gcc-8aa540d2f783474d1d2e06f16744bf67b9c1facc.zip gcc-8aa540d2f783474d1d2e06f16744bf67b9c1facc.tar.gz gcc-8aa540d2f783474d1d2e06f16744bf67b9c1facc.tar.bz2 |
Imported GNU Classpath 0.90
Imported GNU Classpath 0.90
* scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
* gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
* java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
* java/lang/Math.java: New override file.
* java/lang/Character.java: Merged from Classpath.
(start, end): Now 'int's.
(canonicalName): New field.
(CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
(UnicodeBlock): Added argument.
(of): New overload.
(forName): New method.
Updated unicode blocks.
(sets): Updated.
* sources.am: Regenerated.
* Makefile.in: Likewise.
From-SVN: r111942
Diffstat (limited to 'libjava/classpath/java/nio')
30 files changed, 58 insertions, 7 deletions
diff --git a/libjava/classpath/java/nio/BufferOverflowException.java b/libjava/classpath/java/nio/BufferOverflowException.java index 588c032..c72ae92 100644 --- a/libjava/classpath/java/nio/BufferOverflowException.java +++ b/libjava/classpath/java/nio/BufferOverflowException.java @@ -42,6 +42,8 @@ package java.nio; */ public class BufferOverflowException extends RuntimeException { + private static final long serialVersionUID = - 5484897634319144535L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/BufferUnderflowException.java b/libjava/classpath/java/nio/BufferUnderflowException.java index 4b4161c..a6d391e 100644 --- a/libjava/classpath/java/nio/BufferUnderflowException.java +++ b/libjava/classpath/java/nio/BufferUnderflowException.java @@ -42,6 +42,8 @@ package java.nio; */ public class BufferUnderflowException extends RuntimeException { + private static final long serialVersionUID = - 1713313658691622206L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/InvalidMarkException.java b/libjava/classpath/java/nio/InvalidMarkException.java index 937d417..013f02f 100644 --- a/libjava/classpath/java/nio/InvalidMarkException.java +++ b/libjava/classpath/java/nio/InvalidMarkException.java @@ -43,6 +43,8 @@ package java.nio; */ public class InvalidMarkException extends IllegalStateException { + private static final long serialVersionUID = 1698329710438510774L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/ReadOnlyBufferException.java b/libjava/classpath/java/nio/ReadOnlyBufferException.java index d710e1b..22f8a6f 100644 --- a/libjava/classpath/java/nio/ReadOnlyBufferException.java +++ b/libjava/classpath/java/nio/ReadOnlyBufferException.java @@ -43,6 +43,8 @@ package java.nio; */ public class ReadOnlyBufferException extends UnsupportedOperationException { + private static final long serialVersionUID = - 1210063976496234090L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/AlreadyConnectedException.java b/libjava/classpath/java/nio/channels/AlreadyConnectedException.java index 133547e..979486f 100644 --- a/libjava/classpath/java/nio/channels/AlreadyConnectedException.java +++ b/libjava/classpath/java/nio/channels/AlreadyConnectedException.java @@ -39,6 +39,8 @@ package java.nio.channels; public class AlreadyConnectedException extends IllegalStateException { + private static final long serialVersionUID = - 7331895245053773357L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/AsynchronousCloseException.java b/libjava/classpath/java/nio/channels/AsynchronousCloseException.java index f45fdd8..31e4152 100644 --- a/libjava/classpath/java/nio/channels/AsynchronousCloseException.java +++ b/libjava/classpath/java/nio/channels/AsynchronousCloseException.java @@ -44,6 +44,8 @@ package java.nio.channels; */ public class AsynchronousCloseException extends ClosedChannelException { + private static final long serialVersionUID = 6891178312432313966L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/CancelledKeyException.java b/libjava/classpath/java/nio/channels/CancelledKeyException.java index 02108f6..d94e650 100644 --- a/libjava/classpath/java/nio/channels/CancelledKeyException.java +++ b/libjava/classpath/java/nio/channels/CancelledKeyException.java @@ -44,6 +44,8 @@ package java.nio.channels; */ public class CancelledKeyException extends IllegalStateException { + private static final long serialVersionUID = - 8438032138028814268L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/Channels.java b/libjava/classpath/java/nio/channels/Channels.java index cdb2e83..cfd8605 100644 --- a/libjava/classpath/java/nio/channels/Channels.java +++ b/libjava/classpath/java/nio/channels/Channels.java @@ -49,6 +49,7 @@ import java.io.Writer; import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; +import java.nio.charset.UnsupportedCharsetException; /** diff --git a/libjava/classpath/java/nio/channels/ClosedByInterruptException.java b/libjava/classpath/java/nio/channels/ClosedByInterruptException.java index 17858f6..ade7e2a 100644 --- a/libjava/classpath/java/nio/channels/ClosedByInterruptException.java +++ b/libjava/classpath/java/nio/channels/ClosedByInterruptException.java @@ -44,6 +44,8 @@ package java.nio.channels; */ public class ClosedByInterruptException extends AsynchronousCloseException { + private static final long serialVersionUID = - 4488191543534286750L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/ClosedChannelException.java b/libjava/classpath/java/nio/channels/ClosedChannelException.java index 0f8df9b..ea896a0 100644 --- a/libjava/classpath/java/nio/channels/ClosedChannelException.java +++ b/libjava/classpath/java/nio/channels/ClosedChannelException.java @@ -46,6 +46,8 @@ import java.io.IOException; */ public class ClosedChannelException extends IOException { + private static final long serialVersionUID = 882777185433553857L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/ClosedSelectorException.java b/libjava/classpath/java/nio/channels/ClosedSelectorException.java index e1b7a8c..9dfbd7b 100644 --- a/libjava/classpath/java/nio/channels/ClosedSelectorException.java +++ b/libjava/classpath/java/nio/channels/ClosedSelectorException.java @@ -44,6 +44,8 @@ package java.nio.channels; */ public class ClosedSelectorException extends IllegalStateException { + private static final long serialVersionUID = 6466297122317847835L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/ConnectionPendingException.java b/libjava/classpath/java/nio/channels/ConnectionPendingException.java index b0b7129..2e54ed6 100644 --- a/libjava/classpath/java/nio/channels/ConnectionPendingException.java +++ b/libjava/classpath/java/nio/channels/ConnectionPendingException.java @@ -44,6 +44,8 @@ package java.nio.channels; */ public class ConnectionPendingException extends IllegalStateException { + private static final long serialVersionUID = 2008393366501760879L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/DatagramChannel.java b/libjava/classpath/java/nio/channels/DatagramChannel.java index d257ff3..b8815f4 100644 --- a/libjava/classpath/java/nio/channels/DatagramChannel.java +++ b/libjava/classpath/java/nio/channels/DatagramChannel.java @@ -124,7 +124,6 @@ public abstract class DatagramChannel extends AbstractSelectableChannel /** * Tells whether or not this channel's socket is connected. * - * @exception IOException If an error occurs. * @exception NotYetConnectedException The channel's socket is not connected. */ public abstract boolean isConnected(); @@ -200,7 +199,6 @@ public abstract class DatagramChannel extends AbstractSelectableChannel /** * Retrieves the valid operations for this channel. * - * @exception IOException If an error occurs. * @exception NotYetConnectedException The channel's socket is not connected. */ public final int validOps() diff --git a/libjava/classpath/java/nio/channels/FileChannel.java b/libjava/classpath/java/nio/channels/FileChannel.java index 944ec0b..0eefffb 100644 --- a/libjava/classpath/java/nio/channels/FileChannel.java +++ b/libjava/classpath/java/nio/channels/FileChannel.java @@ -219,7 +219,7 @@ public abstract class FileChannel extends AbstractInterruptibleChannel public abstract void force(boolean metaData) throws IOException; /** - * Creates a file lock for the whole assoziated file. + * Creates a file lock for the whole associated file. * * @exception AsynchronousCloseException If another thread closes this channel * while the transfer is in progress. @@ -242,7 +242,7 @@ public abstract class FileChannel extends AbstractInterruptibleChannel } /** - * Creates a file lock for a region of the assoziated file. + * Creates a file lock for a region of the associated file. * * @exception AsynchronousCloseException If another thread closes this channel * while the transfer is in progress. @@ -265,7 +265,7 @@ public abstract class FileChannel extends AbstractInterruptibleChannel throws IOException; /** - * Tries to aqquire alock on the whole assoziated file. + * Tries to aqquire alock on the whole associated file. * * @exception ClosedChannelException If this channel is closed. * @exception IOException If an I/O error occurs. @@ -280,7 +280,7 @@ public abstract class FileChannel extends AbstractInterruptibleChannel } /** - * Tries to aqquire a lock on a region of the assoziated file. + * Tries to aqquire a lock on a region of the associated file. * * @exception ClosedChannelException If this channel is closed. * @exception IllegalArgumentException If the preconditions on the parameters diff --git a/libjava/classpath/java/nio/channels/FileLockInterruptionException.java b/libjava/classpath/java/nio/channels/FileLockInterruptionException.java index 7d9e620..f1024331 100644 --- a/libjava/classpath/java/nio/channels/FileLockInterruptionException.java +++ b/libjava/classpath/java/nio/channels/FileLockInterruptionException.java @@ -46,6 +46,8 @@ import java.io.IOException; */ public class FileLockInterruptionException extends IOException { + private static final long serialVersionUID = 7104080643653532383L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/IllegalBlockingModeException.java b/libjava/classpath/java/nio/channels/IllegalBlockingModeException.java index 7352b54..f34d763 100644 --- a/libjava/classpath/java/nio/channels/IllegalBlockingModeException.java +++ b/libjava/classpath/java/nio/channels/IllegalBlockingModeException.java @@ -47,6 +47,8 @@ package java.nio.channels; */ public class IllegalBlockingModeException extends IllegalStateException { + private static final long serialVersionUID = - 3335774961855590474L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/IllegalSelectorException.java b/libjava/classpath/java/nio/channels/IllegalSelectorException.java index 049a8d5..01b2252 100644 --- a/libjava/classpath/java/nio/channels/IllegalSelectorException.java +++ b/libjava/classpath/java/nio/channels/IllegalSelectorException.java @@ -44,6 +44,8 @@ package java.nio.channels; */ public class IllegalSelectorException extends IllegalArgumentException { + private static final long serialVersionUID = - 8406323347253320987L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/NoConnectionPendingException.java b/libjava/classpath/java/nio/channels/NoConnectionPendingException.java index afefebf..8dcbdf6 100644 --- a/libjava/classpath/java/nio/channels/NoConnectionPendingException.java +++ b/libjava/classpath/java/nio/channels/NoConnectionPendingException.java @@ -44,6 +44,8 @@ package java.nio.channels; */ public class NoConnectionPendingException extends IllegalStateException { + private static final long serialVersionUID = - 8296561183633134743L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/NonReadableChannelException.java b/libjava/classpath/java/nio/channels/NonReadableChannelException.java index e6852a7..bf4f4a4 100644 --- a/libjava/classpath/java/nio/channels/NonReadableChannelException.java +++ b/libjava/classpath/java/nio/channels/NonReadableChannelException.java @@ -44,6 +44,8 @@ package java.nio.channels; */ public class NonReadableChannelException extends IllegalStateException { + private static final long serialVersionUID = - 3200915679294993514L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/NonWritableChannelException.java b/libjava/classpath/java/nio/channels/NonWritableChannelException.java index 61d40bb..98c86ea 100644 --- a/libjava/classpath/java/nio/channels/NonWritableChannelException.java +++ b/libjava/classpath/java/nio/channels/NonWritableChannelException.java @@ -44,6 +44,8 @@ package java.nio.channels; */ public class NonWritableChannelException extends IllegalStateException { + private static final long serialVersionUID = - 7071230488279011621L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/NotYetBoundException.java b/libjava/classpath/java/nio/channels/NotYetBoundException.java index 7d0c663..74bf1ed 100644 --- a/libjava/classpath/java/nio/channels/NotYetBoundException.java +++ b/libjava/classpath/java/nio/channels/NotYetBoundException.java @@ -44,6 +44,8 @@ package java.nio.channels; */ public class NotYetBoundException extends IllegalStateException { + private static final long serialVersionUID = 4640999303950202242L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/NotYetConnectedException.java b/libjava/classpath/java/nio/channels/NotYetConnectedException.java index 463e059..083ff6c 100644 --- a/libjava/classpath/java/nio/channels/NotYetConnectedException.java +++ b/libjava/classpath/java/nio/channels/NotYetConnectedException.java @@ -44,6 +44,8 @@ package java.nio.channels; */ public class NotYetConnectedException extends IllegalStateException { + private static final long serialVersionUID = 4697316551909513464L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/OverlappingFileLockException.java b/libjava/classpath/java/nio/channels/OverlappingFileLockException.java index ce0900c..aa2cedd 100644 --- a/libjava/classpath/java/nio/channels/OverlappingFileLockException.java +++ b/libjava/classpath/java/nio/channels/OverlappingFileLockException.java @@ -44,6 +44,8 @@ package java.nio.channels; */ public class OverlappingFileLockException extends IllegalStateException { + private static final long serialVersionUID = 2047812138163068433L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/UnresolvedAddressException.java b/libjava/classpath/java/nio/channels/UnresolvedAddressException.java index 4db95a7..7a59170 100644 --- a/libjava/classpath/java/nio/channels/UnresolvedAddressException.java +++ b/libjava/classpath/java/nio/channels/UnresolvedAddressException.java @@ -44,6 +44,8 @@ package java.nio.channels; */ public class UnresolvedAddressException extends IllegalArgumentException { + private static final long serialVersionUID = 6136959093620794148L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/UnsupportedAddressTypeException.java b/libjava/classpath/java/nio/channels/UnsupportedAddressTypeException.java index 7c16c81..759d096 100644 --- a/libjava/classpath/java/nio/channels/UnsupportedAddressTypeException.java +++ b/libjava/classpath/java/nio/channels/UnsupportedAddressTypeException.java @@ -44,6 +44,8 @@ package java.nio.channels; */ public class UnsupportedAddressTypeException extends IllegalArgumentException { + private static final long serialVersionUID = - 2964323842829700493L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/channels/spi/AbstractInterruptibleChannel.java b/libjava/classpath/java/nio/channels/spi/AbstractInterruptibleChannel.java index 25e8785..8e5b7b0 100644 --- a/libjava/classpath/java/nio/channels/spi/AbstractInterruptibleChannel.java +++ b/libjava/classpath/java/nio/channels/spi/AbstractInterruptibleChannel.java @@ -40,6 +40,7 @@ package java.nio.channels.spi; import java.io.IOException; import java.nio.channels.AsynchronousCloseException; import java.nio.channels.Channel; +import java.nio.channels.ClosedByInterruptException; import java.nio.channels.InterruptibleChannel; @@ -86,7 +87,6 @@ public abstract class AbstractInterruptibleChannel * @param completed true if the task completed successfully, * false otherwise * - * @exception IOException if an error occurs * @exception AsynchronousCloseException If the channel was asynchronously * closed. * @exception ClosedByInterruptException If the thread blocked in the diff --git a/libjava/classpath/java/nio/charset/CharacterCodingException.java b/libjava/classpath/java/nio/charset/CharacterCodingException.java index 6812ebb..d0580c9 100644 --- a/libjava/classpath/java/nio/charset/CharacterCodingException.java +++ b/libjava/classpath/java/nio/charset/CharacterCodingException.java @@ -44,6 +44,8 @@ import java.io.IOException; */ public class CharacterCodingException extends IOException { + private static final long serialVersionUID = 8421532232154627783L; + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/charset/CoderMalfunctionError.java b/libjava/classpath/java/nio/charset/CoderMalfunctionError.java index 08294ca..5770ade 100644 --- a/libjava/classpath/java/nio/charset/CoderMalfunctionError.java +++ b/libjava/classpath/java/nio/charset/CoderMalfunctionError.java @@ -42,6 +42,8 @@ package java.nio.charset; */ public class CoderMalfunctionError extends Error { + private static final long serialVersionUID = - 1151412348057794301L; + /** * Creates the error */ diff --git a/libjava/classpath/java/nio/charset/MalformedInputException.java b/libjava/classpath/java/nio/charset/MalformedInputException.java index 0beceb4..463d368 100644 --- a/libjava/classpath/java/nio/charset/MalformedInputException.java +++ b/libjava/classpath/java/nio/charset/MalformedInputException.java @@ -42,6 +42,8 @@ package java.nio.charset; */ public class MalformedInputException extends CharacterCodingException { + private static final long serialVersionUID = - 3438823399834806194L; + private int inputLength; /** diff --git a/libjava/classpath/java/nio/charset/UnmappableCharacterException.java b/libjava/classpath/java/nio/charset/UnmappableCharacterException.java index 7190651..d22a238 100644 --- a/libjava/classpath/java/nio/charset/UnmappableCharacterException.java +++ b/libjava/classpath/java/nio/charset/UnmappableCharacterException.java @@ -42,6 +42,8 @@ package java.nio.charset; */ public class UnmappableCharacterException extends CharacterCodingException { + private static final long serialVersionUID = - 7026962371537706123L; + private int inputLength; /** |