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

	* 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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 79cd6a3ae56783d4923d88cbdf9b41c240352319..376b89193af519d2b9dfafeca57f7f492db273f5 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,35 @@
+2003-06-27  Michael Koch  <konqueror@gmx.de>
+
+       * 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  <konqueror@gmx.de>
 
        * Makefile.am

diff --git a/libjava/javax/naming/CompositeName.java b/libjava/javax/naming/CompositeName.java
index 71cdaaf7ba937703b9a78499bcd144de284a8654..e3559a911cf66b721e025d004e4b9c5a809099e4 100644 (file)
--- 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 686a3a3d348a2351b97502465d1f00d8ed2c0dcf..20b6cc51cb3dbf9c0c06bd5e2ab6436fa7baadec 100644 (file)
--- 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 705e24ad1ebb3e332a7ad86b9be82d37706b290c..62837ab9ee53c2d60231d802915beef83431e91e 100644 (file)
--- 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 a8a22adca8f8c0a73dca2b13ea30a3c553612dac..51b0f1bf77174130df9a47bbe880c39bcc4a9e91 100644 (file)
--- 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 6c0f0172dc14f98c983b5805559992b0a250f405..0cb2d5547cd243b6c949fed8327234ba2ef0a2d0 100644 (file)
--- 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 71d538a0b0e9584b2fb8287c9d4d98bea955ac1d..5972f56b052a3c3d9497790821e9e1fed366ca94 100644 (file)
--- 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 5becc6b31629d7a21c81f4c3e34ee74cb4b6c132..1be6c6649e4cb8288f3a8206abbcaa077234b48b 100644 (file)
--- 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 3859ec300dc8a423940a16fb8a30e0e8f94c9243..fbb57cbfe67e5903e494ee2a7dcf302c0e5e4344 100644 (file)
--- 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 6bf77f1712e139a1668bb8550073b8a0af708d42..8065ae970e1d649ebf05177aab81fe4b2ddbf917 100644 (file)
--- 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 <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/libjava/javax/naming/directory/BasicAttributes.java b/libjava/javax/naming/directory/BasicAttributes.java
index 331a3c2a3e785dcc322a2bd51cd166b3216ef5ec..e9b4d073377d7c82511e303e92c0fc292236cac7 100644 (file)
--- 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 <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/libjava/javax/naming/ldap/UnsolicitedNotificationEvent.java b/libjava/javax/naming/ldap/UnsolicitedNotificationEvent.java
index 93d9144232e75e4321c602437a6dd093fe6810a3..4d5161c3093cd8649cc113bf016f5645758e7af5 100644 (file)
--- 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 <warrenl@redhat.com>
  * @date June 5, 2001
  */
-
 public class UnsolicitedNotificationEvent extends EventObject
 {
+  private static final long serialVersionUID = -2382603380799883705L;
+  
   // Serialized fields.
   private UnsolicitedNotification notice;