BasicAttribute.java, [...]: Import cleanup.

2004-10-21  Michael Koch  <konqueror@gmx.de>

	* javax/naming/directory/BasicAttribute.java,
	javax/naming/directory/BasicAttributes.java,
	javax/naming/directory/InitialDirContext.java,
	javax/naming/event/NamingEvent.java,
	javax/naming/ldap/ControlFactory.java,
	javax/naming/ldap/ExtendedRequest.java,
	javax/naming/ldap/InitialLdapContext.java,
	javax/naming/ldap/LdapReferralException.java,
	javax/naming/spi/DirObjectFactory.java,
	javax/naming/spi/DirStateFactory.java,
	javax/naming/spi/DirectoryManager.java,
	javax/naming/spi/InitialContextFactory.java,
	javax/naming/spi/InitialContextFactoryBuilder.java,
	javax/naming/spi/NamingManager.java,
	javax/naming/spi/ObjectFactory.java,
	javax/naming/spi/ObjectFactoryBuilder.java,
	javax/naming/spi/StateFactory.java:
	Import cleanup.

From-SVN: r89399

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 86dfe20f6cff46bcd24f50acaefc77a2346c9c5c..b0facb7dad8ed3f23e883dbc5551c677cd16bbdd 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,24 @@
+2004-10-21  Michael Koch  <konqueror@gmx.de>
+
+       * javax/naming/directory/BasicAttribute.java,
+       javax/naming/directory/BasicAttributes.java,
+       javax/naming/directory/InitialDirContext.java,
+       javax/naming/event/NamingEvent.java,
+       javax/naming/ldap/ControlFactory.java,
+       javax/naming/ldap/ExtendedRequest.java,
+       javax/naming/ldap/InitialLdapContext.java,
+       javax/naming/ldap/LdapReferralException.java,
+       javax/naming/spi/DirObjectFactory.java,
+       javax/naming/spi/DirStateFactory.java,
+       javax/naming/spi/DirectoryManager.java,
+       javax/naming/spi/InitialContextFactory.java,
+       javax/naming/spi/InitialContextFactoryBuilder.java,
+       javax/naming/spi/NamingManager.java,
+       javax/naming/spi/ObjectFactory.java,
+       javax/naming/spi/ObjectFactoryBuilder.java,
+       javax/naming/spi/StateFactory.java:
+       Import cleanup.
+
 2004-10-21  Michael Koch  <konqueror@gmx.de>
 
        * javax/crypto/Cipher.java,

diff --git a/libjava/javax/naming/directory/BasicAttribute.java b/libjava/javax/naming/directory/BasicAttribute.java
index 8065ae970e1d649ebf05177aab81fe4b2ddbf917..24c21e6b0479e79b81f95153ae404ea09ec01933 100644 (file)
--- a/libjava/javax/naming/directory/BasicAttribute.java
+++ b/libjava/javax/naming/directory/BasicAttribute.java
@@ -1,5 +1,5 @@
 /* BasicAttribute.java --
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,12 +40,13 @@ package javax.naming.directory;
 
 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>
+ * @author Tom Tromey (tromey@redhat.com)
  * @date June 20, 2001
  */
 public class BasicAttribute implements Attribute

diff --git a/libjava/javax/naming/directory/BasicAttributes.java b/libjava/javax/naming/directory/BasicAttributes.java
index e9b4d073377d7c82511e303e92c0fc292236cac7..eec1c88bbe71cd6d176f40786f304215d8f33fc8 100644 (file)
--- a/libjava/javax/naming/directory/BasicAttributes.java
+++ b/libjava/javax/naming/directory/BasicAttributes.java
@@ -1,5 +1,5 @@
 /* BasicAttributes.java --
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,11 +40,12 @@ package javax.naming.directory;
 
 import java.util.NoSuchElementException;
 import java.util.Vector;
+
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 
 /**
- * @author Tom Tromey <tromey@redhat.com>
+ * @author Tom Tromey (tromey@redhat.com)
  * @date June 22, 2001
  */
 public class BasicAttributes implements Attributes

diff --git a/libjava/javax/naming/directory/InitialDirContext.java b/libjava/javax/naming/directory/InitialDirContext.java
index a0a598b331668a9f8d62b8fa7291002cf98c618c..7d02b79496de8be3dcd981ad995a88f2be52c28d 100644 (file)
--- a/libjava/javax/naming/directory/InitialDirContext.java
+++ b/libjava/javax/naming/directory/InitialDirContext.java
@@ -1,5 +1,5 @@
 /* InitialDirContext.java --
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,6 +39,7 @@ exception statement from your version. */
 package javax.naming.directory;
 
 import java.util.Hashtable;
+
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.Name;
@@ -48,7 +49,7 @@ import javax.naming.NoInitialContextException;
 import javax.naming.NotContextException;
 
 /**
- * @author Tom Tromey <tromey@redhat.com>
+ * @author Tom Tromey (tromey@redhat.com)
  * @date June 25, 2001
  */
 public class InitialDirContext extends InitialContext implements DirContext

diff --git a/libjava/javax/naming/event/NamingEvent.java b/libjava/javax/naming/event/NamingEvent.java
index d5171882297c106cd1844ed38021a4cf473d59d5..6ac97623012fa1b10d8bdb89ccd9fa26009b5c7b 100644 (file)
--- a/libjava/javax/naming/event/NamingEvent.java
+++ b/libjava/javax/naming/event/NamingEvent.java
@@ -1,5 +1,5 @@
 /* NamingEvent.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,13 +39,13 @@ exception statement from your version. */
 package javax.naming.event;
 
 import java.util.EventObject;
+
 import javax.naming.Binding;
  
 /**
- * @author Warren Levy <warrenl@redhat.com>
+ * @author Warren Levy (warrenl@redhat.com)
  * @date June 5, 2001
  */
-
 public class NamingEvent extends EventObject
 {
   public static final int OBJECT_ADDED = 0;

diff --git a/libjava/javax/naming/ldap/ControlFactory.java b/libjava/javax/naming/ldap/ControlFactory.java
index d62a31075646fbb1b5784e3f46ec380c94bf7f8a..3acf1c72805a2a679d537de35a3a7655f5901823 100644 (file)
--- a/libjava/javax/naming/ldap/ControlFactory.java
+++ b/libjava/javax/naming/ldap/ControlFactory.java
@@ -1,5 +1,5 @@
 /* ControlFactory.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,11 +40,12 @@ package javax.naming.ldap;
 
 import java.util.Hashtable;
 import java.util.StringTokenizer;
+
 import javax.naming.Context;
 import javax.naming.NamingException;
 
 /**
- * @author Tom Tromey <tromey@redhat.com>
+ * @author Tom Tromey (tromey@redhat.com)
  * @date June 22, 2001
  */
 public abstract class ControlFactory

diff --git a/libjava/javax/naming/ldap/ExtendedRequest.java b/libjava/javax/naming/ldap/ExtendedRequest.java
index 2f53268da601637182275905564a078ea6eeb954..35f4c5ee9d858d041b91b9d998fb09d336711392 100644 (file)
--- a/libjava/javax/naming/ldap/ExtendedRequest.java
+++ b/libjava/javax/naming/ldap/ExtendedRequest.java
@@ -1,5 +1,5 @@
 /* ExtendedRequest.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,13 +39,13 @@ exception statement from your version. */
 package javax.naming.ldap;
 
 import java.io.Serializable;
+
 import javax.naming.NamingException;
  
 /**
- * @author Warren Levy <warrenl@redhat.com>
+ * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
  */
-
 public interface ExtendedRequest extends Serializable
 {
   String getID();

diff --git a/libjava/javax/naming/ldap/InitialLdapContext.java b/libjava/javax/naming/ldap/InitialLdapContext.java
index b56ee3a41ca283a0a4406446a00b742636412e28..abba7a5bdd69c5d79b92de660801dcf02a2efa4f 100644 (file)
--- a/libjava/javax/naming/ldap/InitialLdapContext.java
+++ b/libjava/javax/naming/ldap/InitialLdapContext.java
@@ -1,5 +1,5 @@
 /* InitialLdapContext.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,6 +39,7 @@ exception statement from your version. */
 package javax.naming.ldap;
 
 import java.util.Hashtable;
+
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.naming.NoInitialContextException;
@@ -46,7 +47,7 @@ import javax.naming.NotContextException;
 import javax.naming.directory.InitialDirContext;
 
 /**
- * @author Tom Tromey <tromey@redhat.com>
+ * @author Tom Tromey (tromey@redhat.com)
  * @date June 21, 2001
  */
 public class InitialLdapContext

diff --git a/libjava/javax/naming/ldap/LdapReferralException.java b/libjava/javax/naming/ldap/LdapReferralException.java
index 2127321739e194be38e29476a31fa4ec0b1ebe97..fa40632463376f8281f43e2a33960b50c0be9e1c 100644 (file)
--- a/libjava/javax/naming/ldap/LdapReferralException.java
+++ b/libjava/javax/naming/ldap/LdapReferralException.java
@@ -1,5 +1,5 @@
 /* LdapReferralException.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,15 +39,15 @@ exception statement from your version. */
 package javax.naming.ldap;
 
 import java.util.Hashtable;
+
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.naming.ReferralException;
  
 /**
- * @author Warren Levy <warrenl@redhat.com>
+ * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
  */
-
 public abstract class LdapReferralException extends ReferralException
 {
   protected LdapReferralException()

diff --git a/libjava/javax/naming/spi/DirObjectFactory.java b/libjava/javax/naming/spi/DirObjectFactory.java
index deb560567094310b76156344e8c7e09a1b43508d..5f27c95b3ce930c89b35d6eb0505ec137b4ea874 100644 (file)
--- a/libjava/javax/naming/spi/DirObjectFactory.java
+++ b/libjava/javax/naming/spi/DirObjectFactory.java
@@ -1,5 +1,5 @@
 /* DirObjectFactory.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,15 +39,15 @@ exception statement from your version. */
 package javax.naming.spi;
 
 import java.util.Hashtable;
+
 import javax.naming.Context;
 import javax.naming.Name;
 import javax.naming.directory.Attributes;
  
 /**
- * @author Warren Levy <warrenl@redhat.com>
+ * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
  */
-
 public interface DirObjectFactory extends ObjectFactory
 {
   Object getObjectInstance(Object obj, Name name, Context nameCtx,

diff --git a/libjava/javax/naming/spi/DirStateFactory.java b/libjava/javax/naming/spi/DirStateFactory.java
index 67e790d47ad9be5f81f3561ae5f349c3fcd6b8b5..b846dc9d2888a31771225348c903d4ab021aa1fe 100644 (file)
--- a/libjava/javax/naming/spi/DirStateFactory.java
+++ b/libjava/javax/naming/spi/DirStateFactory.java
@@ -39,16 +39,16 @@ exception statement from your version. */
 package javax.naming.spi;
 
 import java.util.Hashtable;
+
 import javax.naming.Context;
 import javax.naming.Name;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
  
 /**
- * @author Warren Levy <warrenl@redhat.com>
+ * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
  */
-
 public interface DirStateFactory extends StateFactory
 {
   // Inner class

diff --git a/libjava/javax/naming/spi/DirectoryManager.java b/libjava/javax/naming/spi/DirectoryManager.java
index 67de21c22e4ac4c35c95cfbdb8fb57a2d2f1874f..c43a28d2dfe28ab8dd3ffc566cf7b5dd45ad5c9b 100644 (file)
--- a/libjava/javax/naming/spi/DirectoryManager.java
+++ b/libjava/javax/naming/spi/DirectoryManager.java
@@ -1,5 +1,5 @@
 /* DirectoryManager.java --
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,7 @@ package javax.naming.spi;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.StringTokenizer;
+
 import javax.naming.CannotProceedException;
 import javax.naming.Context;
 import javax.naming.Name;

diff --git a/libjava/javax/naming/spi/InitialContextFactory.java b/libjava/javax/naming/spi/InitialContextFactory.java
index 299bfd672a2f3b0f61d8e96f636fa2b16f34eebb..044269c6d3afe9c312ee0eb3bf33bdf931f305da 100644 (file)
--- a/libjava/javax/naming/spi/InitialContextFactory.java
+++ b/libjava/javax/naming/spi/InitialContextFactory.java
@@ -1,5 +1,5 @@
 /* InitialContextFactory.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,6 +39,7 @@ exception statement from your version. */
 package javax.naming.spi;
 
 import java.util.Hashtable;
+
 import javax.naming.Context;
 import javax.naming.NamingException;
 

diff --git a/libjava/javax/naming/spi/InitialContextFactoryBuilder.java b/libjava/javax/naming/spi/InitialContextFactoryBuilder.java
index 53a11aadbde5a0d1e66a698d6e8e183d6656c4d2..6144a31a45a800735e3dc4f72724296591f938e3 100644 (file)
--- a/libjava/javax/naming/spi/InitialContextFactoryBuilder.java
+++ b/libjava/javax/naming/spi/InitialContextFactoryBuilder.java
@@ -1,5 +1,5 @@
 /* InitialContextFactoryBuilder.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,6 +39,7 @@ exception statement from your version. */
 package javax.naming.spi;
 
 import java.util.Hashtable;
+
 import javax.naming.NamingException;
 
 public interface InitialContextFactoryBuilder

diff --git a/libjava/javax/naming/spi/NamingManager.java b/libjava/javax/naming/spi/NamingManager.java
index 6c75e72e070a10962b1da702d9733c72348ae3c8..543831cf9d5919cea4a33072c104e05df234ea23 100644 (file)
--- a/libjava/javax/naming/spi/NamingManager.java
+++ b/libjava/javax/naming/spi/NamingManager.java
@@ -1,5 +1,5 @@
 /* NamingManager.java --
-   Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,7 @@ package javax.naming.spi;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.StringTokenizer;
+
 import javax.naming.CannotProceedException;
 import javax.naming.Context;
 import javax.naming.Name;

diff --git a/libjava/javax/naming/spi/ObjectFactory.java b/libjava/javax/naming/spi/ObjectFactory.java
index 0861b44948657c460dd9012dcd2c264085e51480..2415a85329d72f4a07cb85747cedb203551710b3 100644 (file)
--- a/libjava/javax/naming/spi/ObjectFactory.java
+++ b/libjava/javax/naming/spi/ObjectFactory.java
@@ -1,5 +1,5 @@
 /* ObjectFactory.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,6 +39,7 @@ exception statement from your version. */
 package javax.naming.spi;
 
 import java.util.Hashtable;
+
 import javax.naming.Context;
 import javax.naming.Name;
 

diff --git a/libjava/javax/naming/spi/ObjectFactoryBuilder.java b/libjava/javax/naming/spi/ObjectFactoryBuilder.java
index 1d0808c6742ec7c252985be12c087b9a2b121e84..35a80959d64b9b88acd787b7c862c856a4059813 100644 (file)
--- a/libjava/javax/naming/spi/ObjectFactoryBuilder.java
+++ b/libjava/javax/naming/spi/ObjectFactoryBuilder.java
@@ -1,5 +1,5 @@
 /* ObjectFactoryBuilder.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,13 +39,13 @@ exception statement from your version. */
 package javax.naming.spi;
 
 import java.util.Hashtable;
+
 import javax.naming.NamingException;
  
 /**
- * @author Warren Levy <warrenl@redhat.com>
+ * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
  */
-
 public interface ObjectFactoryBuilder
 {
   ObjectFactory createObjectFactory(Object obj,

diff --git a/libjava/javax/naming/spi/StateFactory.java b/libjava/javax/naming/spi/StateFactory.java
index 6316f28db4c06988c23d634c3cb2cd3891d94a96..14b91ea111569986f5fca0b2a35972b36c80c8de 100644 (file)
--- a/libjava/javax/naming/spi/StateFactory.java
+++ b/libjava/javax/naming/spi/StateFactory.java
@@ -1,5 +1,5 @@
 /* StateFactory.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,15 +39,15 @@ exception statement from your version. */
 package javax.naming.spi;
 
 import java.util.Hashtable;
+
 import javax.naming.Context;
 import javax.naming.Name;
 import javax.naming.NamingException;
  
 /**
- * @author Warren Levy <warrenl@redhat.com>
+ * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
  */
-
 public interface StateFactory
 {
   Object getStateToBind(Object obj, Name name, Context nameCtx,