This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: javax.naming
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Fri, 27 Jun 2003 15:11:23 +0200
- Subject: FYI: Patch: javax.naming
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I commited the attached patch to fix obvious things in javax.naming.
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE+/EJ7WSOgCCdjSDsRAkyjAKCMA7HY+nydG/1dDZ6ajuBaNCOPqACcD0DZ
oQ8bnb+SYOLyEU9P+CW1bgI=
=rVkh
-----END PGP SIGNATURE-----
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1998
diff -u -b -B -r1.1998 ChangeLog
--- ChangeLog 27 Jun 2003 12:48:39 -0000 1.1998
+++ ChangeLog 27 Jun 2003 13:02:21 -0000
@@ -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,
Index: javax/naming/CompositeName.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/naming/CompositeName.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 CompositeName.java
--- javax/naming/CompositeName.java 23 Nov 2002 21:50:39 -0000 1.2
+++ javax/naming/CompositeName.java 27 Jun 2003 13:02:21 -0000
@@ -52,6 +52,8 @@
*/
public class CompositeName implements Name, Cloneable, Serializable
{
+ private static final long serialVersionUID = 1667768148915813118L;
+
public CompositeName ()
{
elts = new Vector ();
Index: javax/naming/CompoundName.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/naming/CompoundName.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 CompoundName.java
--- javax/naming/CompoundName.java 23 Nov 2002 21:50:39 -0000 1.2
+++ javax/naming/CompoundName.java 27 Jun 2003 13:02:21 -0000
@@ -58,6 +58,8 @@
*/
public class CompoundName implements Name, Cloneable, Serializable
{
+ private static final long serialVersionUID = 3513100557083972036L;
+
private CompoundName (Properties syntax)
{
elts = new Vector ();
Index: javax/naming/InitialContext.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/naming/InitialContext.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 InitialContext.java
--- javax/naming/InitialContext.java 31 Dec 2002 22:50:10 -0000 1.7
+++ javax/naming/InitialContext.java 27 Jun 2003 13:02:21 -0000
@@ -38,6 +38,7 @@
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.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 @@
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 = {
Index: javax/naming/LinkRef.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/naming/LinkRef.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 LinkRef.java
--- javax/naming/LinkRef.java 23 Nov 2002 21:50:39 -0000 1.2
+++ javax/naming/LinkRef.java 27 Jun 2003 13:02:21 -0000
@@ -46,6 +46,8 @@
*/
public class LinkRef extends Reference
{
+ private static final long serialVersionUID = -5386290613498931298L;
+
public LinkRef (Name name)
{
this (name.toString ());
@@ -58,6 +60,7 @@
}
public String getLinkName ()
+ throws NamingException
{
StringRefAddr sra = (StringRefAddr) get (0);
return (String) sra.getContent ();
Index: javax/naming/NamingException.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/naming/NamingException.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 NamingException.java
--- javax/naming/NamingException.java 16 Sep 2002 09:46:37 -0000 1.5
+++ javax/naming/NamingException.java 27 Jun 2003 13:02:21 -0000
@@ -55,6 +55,7 @@
*/
public class NamingException extends Exception
{
+ private static final long serialVersionUID = -1299181962103167177L;
/**
* The root cause of this exception. Might be null. Set by calling
Index: javax/naming/NamingSecurityException.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/naming/NamingSecurityException.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 NamingSecurityException.java
--- javax/naming/NamingSecurityException.java 23 Nov 2002 21:50:39 -0000 1.2
+++ javax/naming/NamingSecurityException.java 27 Jun 2003 13:02:21 -0000
@@ -40,8 +40,10 @@
import java.lang.Exception;
-public class NamingSecurityException extends NamingException
+public abstract class NamingSecurityException extends NamingException
{
+ private static final long serialVersionUID = 5855287647294685775L;
+
public NamingSecurityException ()
{
super ();
Index: javax/naming/ReferralException.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/naming/ReferralException.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 ReferralException.java
--- javax/naming/ReferralException.java 23 Nov 2002 21:50:39 -0000 1.3
+++ javax/naming/ReferralException.java 27 Jun 2003 13:02:21 -0000
@@ -48,6 +48,8 @@
public abstract class ReferralException extends NamingException
{
+ private static final long serialVersionUID = -2881363844695698876L;
+
protected ReferralException ()
{
super ();
Index: javax/naming/StringRefAddr.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/naming/StringRefAddr.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 StringRefAddr.java
--- javax/naming/StringRefAddr.java 22 Jan 2002 22:40:42 -0000 1.3
+++ javax/naming/StringRefAddr.java 27 Jun 2003 13:02:21 -0000
@@ -48,6 +48,7 @@
*/
public class StringRefAddr extends RefAddr
{
+ private static final long serialVersionUID = -8913762495138505527L;
/**
* The possibly null content of this RefAddr.
Index: javax/naming/directory/BasicAttribute.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/naming/directory/BasicAttribute.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BasicAttribute.java
--- javax/naming/directory/BasicAttribute.java 23 Nov 2002 21:50:40 -0000 1.2
+++ javax/naming/directory/BasicAttribute.java 27 Jun 2003 13:02:21 -0000
@@ -38,8 +38,11 @@
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 @@
*/
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 Object get ()
+ throws NamingException
{
if (values.size () == 0)
throw new NoSuchElementException ("no values");
@@ -166,11 +172,13 @@
}
public Object get (int index)
+ throws NamingException
{
return values.get (index);
}
public NamingEnumeration getAll ()
+ throws NamingException
{
return new BasicAttributeEnumeration ();
}
Index: javax/naming/directory/BasicAttributes.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/naming/directory/BasicAttributes.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BasicAttributes.java
--- javax/naming/directory/BasicAttributes.java 23 Nov 2002 21:50:40 -0000 1.2
+++ javax/naming/directory/BasicAttributes.java 27 Jun 2003 13:02:21 -0000
@@ -38,8 +38,10 @@
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 @@
*/
public class BasicAttributes implements Attributes
{
+ private static final long serialVersionUID = 4980164073184639448L;
+
public BasicAttributes ()
{
this (false);
Index: javax/naming/ldap/UnsolicitedNotificationEvent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/naming/ldap/UnsolicitedNotificationEvent.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 UnsolicitedNotificationEvent.java
--- javax/naming/ldap/UnsolicitedNotificationEvent.java 23 Nov 2002 21:50:40 -0000 1.2
+++ javax/naming/ldap/UnsolicitedNotificationEvent.java 27 Jun 2003 13:02:21 -0000
@@ -43,9 +44,10 @@
* @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;