2003-06-27 Michael Koch <konqueror@gmx.de>

	* java/io/RandomAccessFile.java,
	java/nio/ByteBufferImpl.java,
	java/nio/CharBufferImpl.java,
	java/nio/DirectByteBufferImpl.java,
	java/nio/DoubleBufferImpl.java,
	java/nio/FloatBufferImpl.java,
	java/nio/IntBufferImpl.java,
	java/nio/LongBufferImpl.java,
	java/nio/MappedByteBufferImpl.java,
	java/nio/ShortBufferImpl.java,
	java/rmi/server/SkeletonNotFoundException.java,
	java/rmi/server/UnicastRemoteObject.java,
	java/security/Certificate.java,
	java/security/cert/PolicyQualifierInfo.java,
	java/text/Format.java,
	javax/naming/CompositeName.java,
	javax/naming/CompoundName.java,
	javax/naming/InitialContext.java,
	javax/naming/LinkRef.java,
	javax/naming/NamingException.java,
	javax/naming/NamingSecurityException.java,
	javax/naming/ReferralException.java,
	javax/naming/StringRefAddr.java,
	javax/naming/directory/BasicAttribute.java,
	javax/naming/directory/BasicAttributes.java,
	javax/naming/ldap/UnsolicitedNotificationEvent.java,
	javax/security/auth/x500/X500Principal.java:
	New versions from libgcj.

15 files changed, 19 insertions, 26 deletions

diff --git a/java/io/RandomAccessFile.java b/java/io/RandomAccessFile.java
index edd12a0b1..08fedb0e0 100644
--- a/java/io/RandomAccessFile.java
+++ b/java/io/RandomAccessFile.java
@@ -960,7 +960,7 @@ public class RandomAccessFile implements DataOutput, DataInput
    * A file channel must be created by first creating an instance of
    * Input/Output/RandomAccessFile and invoking the getChannel() method on it.
    */
-  public synchronized FileChannel getChannel ()
+  public final synchronized FileChannel getChannel ()
   {
     if (ch == null)
       ch = new FileChannelImpl (fd, true, this);
diff --git a/java/nio/ByteBufferImpl.java b/java/nio/ByteBufferImpl.java
index 4642288e7..37db881fa 100644
--- a/java/nio/ByteBufferImpl.java
+++ b/java/nio/ByteBufferImpl.java
@@ -41,7 +41,7 @@ package java.nio;
 /**
  * This is a Heap memory implementation
  */
-public final class ByteBufferImpl extends ByteBuffer
+final class ByteBufferImpl extends ByteBuffer
 {
   private boolean readOnly;
 
diff --git a/java/nio/CharBufferImpl.java b/java/nio/CharBufferImpl.java
index 708ab403f..d22b4d1b2 100644
--- a/java/nio/CharBufferImpl.java
+++ b/java/nio/CharBufferImpl.java
@@ -41,7 +41,7 @@ package java.nio;
 /**
  * This is a Heap memory implementation
  */
-public final class CharBufferImpl extends CharBuffer
+final class CharBufferImpl extends CharBuffer
 {
   private boolean readOnly;
 
diff --git a/java/nio/DirectByteBufferImpl.java b/java/nio/DirectByteBufferImpl.java
index aae16e3a3..80c9f0c24 100644
--- a/java/nio/DirectByteBufferImpl.java
+++ b/java/nio/DirectByteBufferImpl.java
@@ -40,7 +40,7 @@ package java.nio;
 
 import gnu.classpath.RawData;
 
-public class DirectByteBufferImpl extends ByteBuffer
+class DirectByteBufferImpl extends ByteBuffer
 {
   RawData address;
   private int offset;
diff --git a/java/nio/DoubleBufferImpl.java b/java/nio/DoubleBufferImpl.java
index dbc63bbad..8dacec9be 100644
--- a/java/nio/DoubleBufferImpl.java
+++ b/java/nio/DoubleBufferImpl.java
@@ -41,7 +41,7 @@ package java.nio;
 /**
  * This is a Heap memory implementation
  */
-public final class DoubleBufferImpl extends DoubleBuffer
+final class DoubleBufferImpl extends DoubleBuffer
 {
   private boolean readOnly;
 
diff --git a/java/nio/FloatBufferImpl.java b/java/nio/FloatBufferImpl.java
index 93dd1d0b3..db0f52bb4 100644
--- a/java/nio/FloatBufferImpl.java
+++ b/java/nio/FloatBufferImpl.java
@@ -41,7 +41,7 @@ package java.nio;
 /**
  * This is a Heap memory implementation
  */
-public final class FloatBufferImpl extends FloatBuffer
+final class FloatBufferImpl extends FloatBuffer
 {
   private boolean readOnly;
 
diff --git a/java/nio/IntBufferImpl.java b/java/nio/IntBufferImpl.java
index ebf33ecbc..ec444c014 100644
--- a/java/nio/IntBufferImpl.java
+++ b/java/nio/IntBufferImpl.java
@@ -41,7 +41,7 @@ package java.nio;
 /**
  * This is a Heap memory implementation
  */
-public final class IntBufferImpl extends IntBuffer
+final class IntBufferImpl extends IntBuffer
 {
   private boolean readOnly;
 
diff --git a/java/nio/LongBufferImpl.java b/java/nio/LongBufferImpl.java
index 08d4ac548..b4fb3de5f 100644
--- a/java/nio/LongBufferImpl.java
+++ b/java/nio/LongBufferImpl.java
@@ -41,7 +41,7 @@ package java.nio;
 /**
  * This is a Heap memory implementation
  */
-public final class LongBufferImpl extends LongBuffer
+final class LongBufferImpl extends LongBuffer
 {
   private boolean readOnly;
 
diff --git a/java/nio/MappedByteBufferImpl.java b/java/nio/MappedByteBufferImpl.java
index bb3e5ee63..7ebc66c3d 100644
--- a/java/nio/MappedByteBufferImpl.java
+++ b/java/nio/MappedByteBufferImpl.java
@@ -40,12 +40,11 @@ package java.nio;
 
 import gnu.java.nio.FileChannelImpl;
 import java.io.IOException;
-import gnu.classpath.RawData;
 
 public class MappedByteBufferImpl extends MappedByteBuffer
 {
   boolean readOnly;
-  RawData map_address;
+  long map_address;
   public FileChannelImpl ch;
   
   public MappedByteBufferImpl (FileChannelImpl ch) throws IOException
@@ -64,13 +63,13 @@ public class MappedByteBufferImpl extends MappedByteBuffer
   }
   
   public static byte getImpl (FileChannelImpl ch, int index,
-			      int limit, RawData map_address)
+			      int limit, long map_address)
   {
     throw new Error ("Not implemented");
   }
   
   public static void putImpl (FileChannelImpl ch, int index,
-			      int limit, byte value, RawData map_address)
+			      int limit, byte value, long map_address)
   {
     throw new Error ("Not implemented");
   }
diff --git a/java/nio/ShortBufferImpl.java b/java/nio/ShortBufferImpl.java
index fcfbee64f..5f6c60137 100644
--- a/java/nio/ShortBufferImpl.java
+++ b/java/nio/ShortBufferImpl.java
@@ -41,7 +41,7 @@ package java.nio;
 /**
  * This is a Heap memory implementation
  */
-public final class ShortBufferImpl extends ShortBuffer
+final class ShortBufferImpl extends ShortBuffer
 {
   private boolean readOnly;
 
diff --git a/java/rmi/server/SkeletonNotFoundException.java b/java/rmi/server/SkeletonNotFoundException.java
index 41819d938..93ad1ecf1 100644
--- a/java/rmi/server/SkeletonNotFoundException.java
+++ b/java/rmi/server/SkeletonNotFoundException.java
@@ -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.rmi.server;
 
 import java.rmi.RemoteException;
@@ -59,7 +60,6 @@ public class SkeletonNotFoundException extends RemoteException
    * Create an exception with the specified message.
    *
    * @param s the message
-   * @deprecated no longer needed
    */
   public SkeletonNotFoundException(String s)
   {
@@ -71,7 +71,6 @@ public class SkeletonNotFoundException extends RemoteException
    *
    * @param s the message
    * @param e the cause
-   * @deprecated no longer needed
    */
   public SkeletonNotFoundException(String s, Exception e)
   {
diff --git a/java/rmi/server/UnicastRemoteObject.java b/java/rmi/server/UnicastRemoteObject.java
index 4e2f06ae6..8e010e7e5 100644
--- a/java/rmi/server/UnicastRemoteObject.java
+++ b/java/rmi/server/UnicastRemoteObject.java
@@ -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.rmi.server;
 
 import java.rmi.RemoteException;
@@ -89,7 +90,7 @@ public static RemoteStub exportObject(Remote obj) throws RemoteException {
     return exportObject(obj, port, null);
   }
   
-  protected static Remote exportObject(Remote obj, int port, RMIServerSocketFactory ssf) 
+  static Remote exportObject(Remote obj, int port, RMIServerSocketFactory ssf) 
     throws RemoteException 
   {
     UnicastServerRef sref = null;
@@ -103,7 +104,7 @@ public static RemoteStub exportObject(Remote obj) throws RemoteException {
   }
 
   /**
-   * FIX ME
+   * FIXME
    */
   public static Remote exportObject(Remote obj, int port, RMIClientSocketFactory csf, 
 				    RMIServerSocketFactory ssf) 
diff --git a/java/security/Certificate.java b/java/security/Certificate.java
index f37d919a7..5b0f9ae8d 100644
--- a/java/security/Certificate.java
+++ b/java/security/Certificate.java
@@ -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.security;
 
 import java.io.InputStream;
@@ -62,7 +63,6 @@ public interface Certificate
    * this certificate.
    *
    * @return the <code>Principal</code> guaranteeing the certificate
-   * @deprecated this entire interface is deprecated
    */
   Principal getGuarantor();
 
@@ -71,7 +71,6 @@ public interface Certificate
    * this certificate.
    *
    * @return the <code>Principal</code> guaranteed by this certificate
-   * @deprecated this entire interface is deprecated
    */
   Principal getPrincipal();
 
@@ -80,7 +79,6 @@ public interface Certificate
    * is being guaranteed.
    *
    * @return the <code>PublicKey</code> of the Principal being guaranteed
-   * @deprecated this entire interface is deprecated
    */
   PublicKey getPublicKey();
 
@@ -93,7 +91,6 @@ public interface Certificate
    * @throws IOException if an error occurs writing to the stream
    * @see #decode(InputStream)
    * @see #getFormat()
-   * @deprecated this entire interface is deprecated
    */
   void encode(OutputStream out) throws KeyException, IOException;
 
@@ -105,7 +102,6 @@ public interface Certificate
    * @throws IOException if an error occurs reading from the stream
    * @see #encode(OutputStream)
    * @see #getFormat()
-   * @deprecated this entire interface is deprecated
    */
   void decode(InputStream in) throws KeyException, IOException;
 
@@ -115,7 +111,6 @@ public interface Certificate
    * <code>decode</code> methods.
    *
    * @return the encoding format being used
-   * @deprecated this entire interface is deprecated
    */
   String getFormat();
 
@@ -125,7 +120,6 @@ public interface Certificate
    *
    * @param detail true to provided more detailed information
    * @return the string representation
-   * @deprecated this entire interface is deprecated
    */
   String toString(boolean detail);
 } // interface Certificate
diff --git a/java/security/cert/PolicyQualifierInfo.java b/java/security/cert/PolicyQualifierInfo.java
index a46b6ba89..8dede47fc 100644
--- a/java/security/cert/PolicyQualifierInfo.java
+++ b/java/security/cert/PolicyQualifierInfo.java
@@ -65,7 +65,7 @@ import gnu.java.security.der.DERWriter;
  *
  * @since JDK 1.4
  */
-public class PolicyQualifierInfo
+public final class PolicyQualifierInfo
 {
 
   // Fields.
diff --git a/java/text/Format.java b/java/text/Format.java
index 804ef43ff..ab61f28ae 100644
--- a/java/text/Format.java
+++ b/java/text/Format.java
@@ -59,7 +59,7 @@ import java.io.Serializable;
  */
 public abstract class Format implements Serializable, Cloneable
 {
-  static final long serialVersionUID = -299282585814624189L;
+  static final long serialVersionUID = 4479235611355683992L;
 
   /**
    * This method initializes a new instance of <code>Format</code>.