diff options
28 files changed, 91 insertions, 35 deletions
@@ -1,3 +1,34 @@ +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. + 2003-06-26 Michael Koch <konqueror@gmx.de> * gnu/java/nio/FileChannelImpl.java 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>. diff --git a/javax/naming/CompositeName.java b/javax/naming/CompositeName.java index 71cdaaf7b..e3559a911 100644 --- a/javax/naming/CompositeName.java +++ b/javax/naming/CompositeName.java @@ -52,6 +52,8 @@ import java.util.Vector; */ public class CompositeName implements Name, Cloneable, Serializable { + private static final long serialVersionUID = 1667768148915813118L; + public CompositeName () { elts = new Vector (); diff --git a/javax/naming/CompoundName.java b/javax/naming/CompoundName.java index 686a3a3d3..20b6cc51c 100644 --- a/javax/naming/CompoundName.java +++ b/javax/naming/CompoundName.java @@ -58,6 +58,8 @@ import java.util.Vector; */ public class CompoundName implements Name, Cloneable, Serializable { + private static final long serialVersionUID = 3513100557083972036L; + private CompoundName (Properties syntax) { elts = new Vector (); diff --git a/javax/naming/InitialContext.java b/javax/naming/InitialContext.java index 705e24ad1..62837ab9e 100644 --- a/javax/naming/InitialContext.java +++ b/javax/naming/InitialContext.java @@ -38,6 +38,7 @@ exception statement from your version. */ package javax.naming; +import java.applet.Applet; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -46,8 +47,6 @@ import java.net.URL; import java.util.Enumeration; import java.util.Hashtable; import java.util.Properties; -import java.applet.Applet; -import java.util.Hashtable; import javax.naming.spi.NamingManager; public class InitialContext implements Context @@ -57,22 +56,27 @@ public class InitialContext implements Context protected Hashtable myProps; public InitialContext (Hashtable environment) + throws NamingException { init (environment); } protected InitialContext (boolean lazy) + throws NamingException { if (! lazy) init (null); } public InitialContext () + throws NamingException { init (null); } - + + /** @since 1.3 */ protected void init (Hashtable environment) + throws NamingException { // FIXME: Is this enough? final String[] properties = { diff --git a/javax/naming/LinkRef.java b/javax/naming/LinkRef.java index a8a22adca..51b0f1bf7 100644 --- a/javax/naming/LinkRef.java +++ b/javax/naming/LinkRef.java @@ -46,6 +46,8 @@ import java.io.Serializable; */ public class LinkRef extends Reference { + private static final long serialVersionUID = -5386290613498931298L; + public LinkRef (Name name) { this (name.toString ()); @@ -58,6 +60,7 @@ public class LinkRef extends Reference } public String getLinkName () + throws NamingException { StringRefAddr sra = (StringRefAddr) get (0); return (String) sra.getContent (); diff --git a/javax/naming/NamingException.java b/javax/naming/NamingException.java index 6c0f0172d..0cb2d5547 100644 --- a/javax/naming/NamingException.java +++ b/javax/naming/NamingException.java @@ -55,6 +55,7 @@ import java.io.PrintWriter; */ public class NamingException extends Exception { + private static final long serialVersionUID = -1299181962103167177L; /** * The root cause of this exception. Might be null. Set by calling diff --git a/javax/naming/NamingSecurityException.java b/javax/naming/NamingSecurityException.java index 71d538a0b..5972f56b0 100644 --- a/javax/naming/NamingSecurityException.java +++ b/javax/naming/NamingSecurityException.java @@ -40,8 +40,10 @@ package javax.naming; import java.lang.Exception; -public class NamingSecurityException extends NamingException +public abstract class NamingSecurityException extends NamingException { + private static final long serialVersionUID = 5855287647294685775L; + public NamingSecurityException () { super (); diff --git a/javax/naming/ReferralException.java b/javax/naming/ReferralException.java index 5becc6b31..1be6c6649 100644 --- a/javax/naming/ReferralException.java +++ b/javax/naming/ReferralException.java @@ -48,6 +48,8 @@ import java.util.Hashtable; public abstract class ReferralException extends NamingException { + private static final long serialVersionUID = -2881363844695698876L; + protected ReferralException () { super (); diff --git a/javax/naming/StringRefAddr.java b/javax/naming/StringRefAddr.java index 3859ec300..fbb57cbfe 100644 --- a/javax/naming/StringRefAddr.java +++ b/javax/naming/StringRefAddr.java @@ -48,6 +48,7 @@ package javax.naming; */ public class StringRefAddr extends RefAddr { + private static final long serialVersionUID = -8913762495138505527L; /** * The possibly null content of this RefAddr. diff --git a/javax/naming/directory/BasicAttribute.java b/javax/naming/directory/BasicAttribute.java index 6bf77f171..8065ae970 100644 --- a/javax/naming/directory/BasicAttribute.java +++ b/javax/naming/directory/BasicAttribute.java @@ -38,8 +38,11 @@ exception statement from your version. */ package javax.naming.directory; -import javax.naming.*; -import java.util.*; +import java.util.NoSuchElementException; +import java.util.Vector; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.OperationNotSupportedException; /** * @author Tom Tromey <tromey@redhat.com> @@ -47,6 +50,8 @@ import java.util.*; */ public class BasicAttribute implements Attribute { + private static final long serialVersionUID = 6743528196119291326L; + /** The ID of this attribute. */ protected String attrID; /** True if this attribute's values are ordered. */ @@ -159,6 +164,7 @@ public class BasicAttribute implements Attribute } public Object get () + throws NamingException { if (values.size () == 0) throw new NoSuchElementException ("no values"); @@ -166,11 +172,13 @@ public class BasicAttribute implements Attribute } public Object get (int index) + throws NamingException { return values.get (index); } public NamingEnumeration getAll () + throws NamingException { return new BasicAttributeEnumeration (); } diff --git a/javax/naming/directory/BasicAttributes.java b/javax/naming/directory/BasicAttributes.java index 331a3c2a3..e9b4d0733 100644 --- a/javax/naming/directory/BasicAttributes.java +++ b/javax/naming/directory/BasicAttributes.java @@ -38,8 +38,10 @@ exception statement from your version. */ package javax.naming.directory; -import javax.naming.*; -import java.util.*; +import java.util.NoSuchElementException; +import java.util.Vector; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; /** * @author Tom Tromey <tromey@redhat.com> @@ -47,6 +49,8 @@ import java.util.*; */ public class BasicAttributes implements Attributes { + private static final long serialVersionUID = 4980164073184639448L; + public BasicAttributes () { this (false); diff --git a/javax/naming/ldap/UnsolicitedNotificationEvent.java b/javax/naming/ldap/UnsolicitedNotificationEvent.java index 93d914423..4d5161c30 100644 --- a/javax/naming/ldap/UnsolicitedNotificationEvent.java +++ b/javax/naming/ldap/UnsolicitedNotificationEvent.java @@ -37,15 +37,17 @@ exception statement from your version. */ package javax.naming.ldap; + import java.util.EventObject; /** * @author Warren Levy <warrenl@redhat.com> * @date June 5, 2001 */ - public class UnsolicitedNotificationEvent extends EventObject { + private static final long serialVersionUID = -2382603380799883705L; + // Serialized fields. private UnsolicitedNotification notice; diff --git a/javax/security/auth/x500/X500Principal.java b/javax/security/auth/x500/X500Principal.java index fc72e7b26..036cab7f9 100644 --- a/javax/security/auth/x500/X500Principal.java +++ b/javax/security/auth/x500/X500Principal.java @@ -55,6 +55,7 @@ import gnu.java.security.x509.X500DistinguishedName; public final class X500Principal implements Principal, Serializable { + private static final long serialVersionUID = -500463348111345721L; // Constants and fields. // ------------------------------------------------------------------------ |