* gnu/java/nio/channels/FileChannelImpl.java (position): Fixed typo.

	* java/nio/charset/UnmappableCharacterException.java:
	(serialVersionUID): New field.
	* java/nio/charset/MalformedInputException.java:
	(serialVersionUID): New field.
	* java/nio/charset/CoderMalfunctionError.java:
	(serialVersionUID): New field.
	* java/nio/charset/CharacterCodingException.java:
	(serialVersionUID): New field.
	* java/nio/channels/UnsupportedAddressTypeException.java:
	(serialVersionUID): New field.
	* java/nio/channels/UnresolvedAddressException.java:
	(serialVersionUID): New field.
	* java/nio/channels/OverlappingFileLockException.java:
	(serialVersionUID): New field.
	* java/nio/channels/NotYetConnectedException.java:
	(serialVersionUID): New field.
	* java/nio/channels/NotYetBoundException.java
	(serialVersionUID): New field.
	* java/nio/channels/NonWritableChannelException.java
	(serialVersionUID): New field.
	* java/nio/channels/NonReadableChannelException.java
	(serialVersionUID): New field.
	* java/nio/channels/NoConnectionPendingException.java
	(serialVersionUID): New field.
	* java/nio/channels/IllegalSelectorException.java
	(serialVersionUID): New field.
	* java/nio/channels/IllegalBlockingModeException.java
	(serialVersionUID): New field.
	* java/nio/channels/FileLockInterruptionException.java
	(serialVersionUID): New field.
	* java/nio/channels/ConnectionPendingException.java
	(serialVersionUID): New field.
	* java/nio/channels/ClosedSelectorException.java (serialVersionUID):
	New field.
	* java/nio/channels/ClosedChannelException.java (serialVersionUID):
	New field.
	* java/nio/channels/ClosedByInterruptException.java
	(serialVersionUID): New field.
	* java/nio/channels/CancelledKeyException.java (serialVersionUID):
	New field.
	* java/nio/channels/AsynchronousCloseException.java
	(serialVersionUID): New field.
	* java/nio/channels/AlreadyConnectedException.java (serialVersionUID):
	New field.
	* java/nio/ReadOnlyBufferException.java (serialVersionUID): New field.
	* java/nio/InvalidMarkException.java (serialVersionUID): New field.
	* java/nio/BufferUnderflowException.java (serialVersionUID): New
	field.
	* java/nio/BufferOverflowException.java (serialVersionUID): New field.
	* java/nio/channels/spi/AbstractInterruptibleChannel.java (end):
	Javadoc fix.  Added import.
	* java/nio/channels/DatagramChannel.java (isConnected): Javadoc fix.
	(validOps): Likewise.
	* gnu/java/nio/charset/iconv/IconvProvider.java: Organized imports.
	* gnu/java/nio/charset/iconv/IconvEncoder.java: Organized imports.
	* gnu/java/nio/charset/iconv/IconvDecoder.java: Organized imports.
	* java/nio/channels/Channels.java: Added import.
	* java/nio/channels/FileChannel.java (lock): Typo fix.
	(tryLock): Likewise.

30 files changed, 58 insertions, 7 deletions

diff --git a/java/nio/BufferOverflowException.java b/java/nio/BufferOverflowException.java
index 588c03290..c72ae9238 100644
--- a/java/nio/BufferOverflowException.java
+++ b/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/java/nio/BufferUnderflowException.java b/java/nio/BufferUnderflowException.java
index 4b4161c64..a6d391e00 100644
--- a/java/nio/BufferUnderflowException.java
+++ b/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/java/nio/InvalidMarkException.java b/java/nio/InvalidMarkException.java
index 937d417ab..013f02f79 100644
--- a/java/nio/InvalidMarkException.java
+++ b/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/java/nio/ReadOnlyBufferException.java b/java/nio/ReadOnlyBufferException.java
index d710e1b26..22f8a6f73 100644
--- a/java/nio/ReadOnlyBufferException.java
+++ b/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/java/nio/channels/AlreadyConnectedException.java b/java/nio/channels/AlreadyConnectedException.java
index 133547ef3..979486f06 100644
--- a/java/nio/channels/AlreadyConnectedException.java
+++ b/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/java/nio/channels/AsynchronousCloseException.java b/java/nio/channels/AsynchronousCloseException.java
index f45fdd81a..31e41528b 100644
--- a/java/nio/channels/AsynchronousCloseException.java
+++ b/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/java/nio/channels/CancelledKeyException.java b/java/nio/channels/CancelledKeyException.java
index 02108f6c7..d94e65053 100644
--- a/java/nio/channels/CancelledKeyException.java
+++ b/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/java/nio/channels/Channels.java b/java/nio/channels/Channels.java
index cdb2e833e..cfd8605c3 100644
--- a/java/nio/channels/Channels.java
+++ b/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/java/nio/channels/ClosedByInterruptException.java b/java/nio/channels/ClosedByInterruptException.java
index 17858f613..ade7e2a27 100644
--- a/java/nio/channels/ClosedByInterruptException.java
+++ b/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/java/nio/channels/ClosedChannelException.java b/java/nio/channels/ClosedChannelException.java
index 0f8df9b26..ea896a0fd 100644
--- a/java/nio/channels/ClosedChannelException.java
+++ b/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/java/nio/channels/ClosedSelectorException.java b/java/nio/channels/ClosedSelectorException.java
index e1b7a8ce9..9dfbd7bf8 100644
--- a/java/nio/channels/ClosedSelectorException.java
+++ b/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/java/nio/channels/ConnectionPendingException.java b/java/nio/channels/ConnectionPendingException.java
index b0b71294f..2e54ed61a 100644
--- a/java/nio/channels/ConnectionPendingException.java
+++ b/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/java/nio/channels/DatagramChannel.java b/java/nio/channels/DatagramChannel.java
index d257ff338..b8815f47c 100644
--- a/java/nio/channels/DatagramChannel.java
+++ b/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/java/nio/channels/FileChannel.java b/java/nio/channels/FileChannel.java
index 944ec0b8f..0eefffbe9 100644
--- a/java/nio/channels/FileChannel.java
+++ b/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/java/nio/channels/FileLockInterruptionException.java b/java/nio/channels/FileLockInterruptionException.java
index 7d9e62046..f1024331e 100644
--- a/java/nio/channels/FileLockInterruptionException.java
+++ b/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/java/nio/channels/IllegalBlockingModeException.java b/java/nio/channels/IllegalBlockingModeException.java
index 7352b54f7..f34d76382 100644
--- a/java/nio/channels/IllegalBlockingModeException.java
+++ b/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/java/nio/channels/IllegalSelectorException.java b/java/nio/channels/IllegalSelectorException.java
index 049a8d594..01b22529c 100644
--- a/java/nio/channels/IllegalSelectorException.java
+++ b/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/java/nio/channels/NoConnectionPendingException.java b/java/nio/channels/NoConnectionPendingException.java
index afefebf98..8dcbdf695 100644
--- a/java/nio/channels/NoConnectionPendingException.java
+++ b/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/java/nio/channels/NonReadableChannelException.java b/java/nio/channels/NonReadableChannelException.java
index e6852a73d..bf4f4a433 100644
--- a/java/nio/channels/NonReadableChannelException.java
+++ b/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/java/nio/channels/NonWritableChannelException.java b/java/nio/channels/NonWritableChannelException.java
index 61d40bbc4..98c86eae2 100644
--- a/java/nio/channels/NonWritableChannelException.java
+++ b/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/java/nio/channels/NotYetBoundException.java b/java/nio/channels/NotYetBoundException.java
index 7d0c66388..74bf1ed7f 100644
--- a/java/nio/channels/NotYetBoundException.java
+++ b/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/java/nio/channels/NotYetConnectedException.java b/java/nio/channels/NotYetConnectedException.java
index 463e05934..083ff6c6d 100644
--- a/java/nio/channels/NotYetConnectedException.java
+++ b/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/java/nio/channels/OverlappingFileLockException.java b/java/nio/channels/OverlappingFileLockException.java
index ce0900c6a..aa2cedd9a 100644
--- a/java/nio/channels/OverlappingFileLockException.java
+++ b/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/java/nio/channels/UnresolvedAddressException.java b/java/nio/channels/UnresolvedAddressException.java
index 4db95a7ff..7a591709b 100644
--- a/java/nio/channels/UnresolvedAddressException.java
+++ b/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/java/nio/channels/UnsupportedAddressTypeException.java b/java/nio/channels/UnsupportedAddressTypeException.java
index 7c16c813f..759d0964c 100644
--- a/java/nio/channels/UnsupportedAddressTypeException.java
+++ b/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/java/nio/channels/spi/AbstractInterruptibleChannel.java b/java/nio/channels/spi/AbstractInterruptibleChannel.java
index 25e8785c0..8e5b7b0b1 100644
--- a/java/nio/channels/spi/AbstractInterruptibleChannel.java
+++ b/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/java/nio/charset/CharacterCodingException.java b/java/nio/charset/CharacterCodingException.java
index 6812ebb18..d0580c955 100644
--- a/java/nio/charset/CharacterCodingException.java
+++ b/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/java/nio/charset/CoderMalfunctionError.java b/java/nio/charset/CoderMalfunctionError.java
index 08294cafb..5770aded6 100644
--- a/java/nio/charset/CoderMalfunctionError.java
+++ b/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/java/nio/charset/MalformedInputException.java b/java/nio/charset/MalformedInputException.java
index 0beceb40c..463d36868 100644
--- a/java/nio/charset/MalformedInputException.java
+++ b/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/java/nio/charset/UnmappableCharacterException.java b/java/nio/charset/UnmappableCharacterException.java
index 719065108..d22a23807 100644
--- a/java/nio/charset/UnmappableCharacterException.java
+++ b/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;
   
   /**