From 7fc600fc4cf3b997e27afdf54949a8c9eb5a776b Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Fri, 27 Jun 2003 13:06:50 +0000 Subject: [PATCH] 2003-06-27 Michael Koch * javax/naming/CompositeName.java (serialVersionUID): New member variable. * javax/naming/CompoundName.java (serialVersionUID): New member variable. * javax/naming/InitialContext.java (InitialContext): Throws NamingException. (init): Likewise. * javax/naming/LinkRef.java (serialVersionUID): New member variable. (gteLinkName): Throws NamingException. * javax/naming/NamingException.java (serialVersionUID): New member variable. * javax/naming/NamingSecurityException.java (NamingSecurityException): Made abstract. (serialVersionUID): New member variable. * javax/naming/ReferralException.java (serialVersionUID): New member variable. * javax/naming/StringRefAddr.java (serialVersionUID): New member variable. * javax/naming/directory/BasicAttribute.java: Reworked imports. (serialVersionUID): New member variable. (get): Throws NamingException. (getAll): Throws NamingException. * javax/naming/directory/BasicAttributes.java: Reworked imports. (serialVersionUID): New member variable. * javax/naming/ldap/UnsolicitedNotificationEvent.java (serialVersionUID): New member variable. From-SVN: r68570 --- libjava/ChangeLog | 32 +++++++++++++++++++ libjava/javax/naming/CompositeName.java | 2 ++ libjava/javax/naming/CompoundName.java | 2 ++ libjava/javax/naming/InitialContext.java | 10 ++++-- libjava/javax/naming/LinkRef.java | 3 ++ libjava/javax/naming/NamingException.java | 1 + .../javax/naming/NamingSecurityException.java | 4 ++- libjava/javax/naming/ReferralException.java | 2 ++ libjava/javax/naming/StringRefAddr.java | 1 + .../naming/directory/BasicAttribute.java | 12 +++++-- .../naming/directory/BasicAttributes.java | 8 +++-- .../ldap/UnsolicitedNotificationEvent.java | 4 ++- 12 files changed, 72 insertions(+), 9 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 79cd6a3ae56..376b89193af 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,35 @@ +2003-06-27 Michael Koch + + * javax/naming/CompositeName.java + (serialVersionUID): New member variable. + * javax/naming/CompoundName.java + (serialVersionUID): New member variable. + * javax/naming/InitialContext.java + (InitialContext): Throws NamingException. + (init): Likewise. + * javax/naming/LinkRef.java + (serialVersionUID): New member variable. + (gteLinkName): Throws NamingException. + * javax/naming/NamingException.java + (serialVersionUID): New member variable. + * javax/naming/NamingSecurityException.java + (NamingSecurityException): Made abstract. + (serialVersionUID): New member variable. + * javax/naming/ReferralException.java + (serialVersionUID): New member variable. + * javax/naming/StringRefAddr.java + (serialVersionUID): New member variable. + * javax/naming/directory/BasicAttribute.java: + Reworked imports. + (serialVersionUID): New member variable. + (get): Throws NamingException. + (getAll): Throws NamingException. + * javax/naming/directory/BasicAttributes.java: + Reworked imports. + (serialVersionUID): New member variable. + * javax/naming/ldap/UnsolicitedNotificationEvent.java + (serialVersionUID): New member variable. + 2003-06-27 Michael Koch * Makefile.am diff --git a/libjava/javax/naming/CompositeName.java b/libjava/javax/naming/CompositeName.java index 71cdaaf7ba9..e3559a911cf 100644 --- a/libjava/javax/naming/CompositeName.java +++ b/libjava/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/libjava/javax/naming/CompoundName.java b/libjava/javax/naming/CompoundName.java index 686a3a3d348..20b6cc51cb3 100644 --- a/libjava/javax/naming/CompoundName.java +++ b/libjava/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/libjava/javax/naming/InitialContext.java b/libjava/javax/naming/InitialContext.java index 705e24ad1eb..62837ab9ee5 100644 --- a/libjava/javax/naming/InitialContext.java +++ b/libjava/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/libjava/javax/naming/LinkRef.java b/libjava/javax/naming/LinkRef.java index a8a22adca8f..51b0f1bf771 100644 --- a/libjava/javax/naming/LinkRef.java +++ b/libjava/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/libjava/javax/naming/NamingException.java b/libjava/javax/naming/NamingException.java index 6c0f0172dc1..0cb2d5547cd 100644 --- a/libjava/javax/naming/NamingException.java +++ b/libjava/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/libjava/javax/naming/NamingSecurityException.java b/libjava/javax/naming/NamingSecurityException.java index 71d538a0b0e..5972f56b052 100644 --- a/libjava/javax/naming/NamingSecurityException.java +++ b/libjava/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/libjava/javax/naming/ReferralException.java b/libjava/javax/naming/ReferralException.java index 5becc6b3162..1be6c6649e4 100644 --- a/libjava/javax/naming/ReferralException.java +++ b/libjava/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/libjava/javax/naming/StringRefAddr.java b/libjava/javax/naming/StringRefAddr.java index 3859ec300dc..fbb57cbfe67 100644 --- a/libjava/javax/naming/StringRefAddr.java +++ b/libjava/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/libjava/javax/naming/directory/BasicAttribute.java b/libjava/javax/naming/directory/BasicAttribute.java index 6bf77f1712e..8065ae970e1 100644 --- a/libjava/javax/naming/directory/BasicAttribute.java +++ b/libjava/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 @@ -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/libjava/javax/naming/directory/BasicAttributes.java b/libjava/javax/naming/directory/BasicAttributes.java index 331a3c2a3e7..e9b4d073377 100644 --- a/libjava/javax/naming/directory/BasicAttributes.java +++ b/libjava/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 @@ -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/libjava/javax/naming/ldap/UnsolicitedNotificationEvent.java b/libjava/javax/naming/ldap/UnsolicitedNotificationEvent.java index 93d9144232e..4d5161c3093 100644 --- a/libjava/javax/naming/ldap/UnsolicitedNotificationEvent.java +++ b/libjava/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 * @date June 5, 2001 */ - public class UnsolicitedNotificationEvent extends EventObject { + private static final long serialVersionUID = -2382603380799883705L; + // Serialized fields. private UnsolicitedNotification notice; -- 2.30.2