aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2003-06-27 13:06:50 +0000
committerMichael Koch <konqueror@gmx.de>2003-06-27 13:06:50 +0000
commit199f8b71853a1d2451f7f55a459c4d26020388b5 (patch)
treeb67a60274eb1f911a9309d9b3190196ecc62216b
parent678164a9f46d325f378d4d31ec2b01e36522285b (diff)
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. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@68570 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libjava/ChangeLog32
-rw-r--r--libjava/javax/naming/CompositeName.java2
-rw-r--r--libjava/javax/naming/CompoundName.java2
-rw-r--r--libjava/javax/naming/InitialContext.java10
-rw-r--r--libjava/javax/naming/LinkRef.java3
-rw-r--r--libjava/javax/naming/NamingException.java1
-rw-r--r--libjava/javax/naming/NamingSecurityException.java4
-rw-r--r--libjava/javax/naming/ReferralException.java2
-rw-r--r--libjava/javax/naming/StringRefAddr.java1
-rw-r--r--libjava/javax/naming/directory/BasicAttribute.java12
-rw-r--r--libjava/javax/naming/directory/BasicAttributes.java8
-rw-r--r--libjava/javax/naming/ldap/UnsolicitedNotificationEvent.java4
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,5 +1,37 @@
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
(awt_java_source_files): Added new files:
javax/swing/Popup.java,
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 <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 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 <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 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 <warrenl@redhat.com>
* @date June 5, 2001
*/
-
public class UnsolicitedNotificationEvent extends EventObject
{
+ private static final long serialVersionUID = -2382603380799883705L;
+
// Serialized fields.
private UnsolicitedNotification notice;