2004-04-21 Dalibor Topic <robilad@kaffe.org>

	* javax/naming/AuthenticationException.java,
	javax/naming/AuthenticationNotSupportedException.java,
	javax/naming/CannotProceedException.java,
	javax/naming/CommunicationException.java,
	javax/naming/CompoundName.java,
	javax/naming/ConfigurationException.java,
	javax/naming/ContextNotEmptyException.java,
	javax/naming/InitialContext.java,
	javax/naming/InsufficientResourcesException.java,
	javax/naming/InterruptedNamingException.java,
	javax/naming/LimitExceededException.java,
	javax/naming/LinkException.java,
	javax/naming/LinkLoopException.java,
	javax/naming/LinkRef.java,
	javax/naming/MalformedLinkException.java,
	javax/naming/Name.java,
	javax/naming/NameAlreadyBoundException.java,
	javax/naming/NameNotFoundException.java,
	javax/naming/NamingSecurityException.java,
	javax/naming/NoInitialContextException.java,
	javax/naming/NoPermissionException.java,
	javax/naming/NotContextException.java,
	javax/naming/PartialResultException.java,
	javax/naming/ReferralException.java,
	javax/naming/ServiceUnavailableException.java,
	javax/naming/SizeLimitExceededException.java,
	javax/naming/TimeLimitExceededException.java,
	javax/naming/directory/Attribute.java,
	javax/naming/directory/Attributes.java,
	javax/naming/directory/SearchResult.java,
	javax/naming/event/NamingExceptionEvent.java,
	javax/naming/spi/ResolveResult.java:
	Cleaned up imports.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80947 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 24f3151..6a71bf8 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,39 @@
+2004-04-21  Dalibor Topic  <robilad@kaffe.org>
+
+       * javax/naming/AuthenticationException.java,
+       javax/naming/AuthenticationNotSupportedException.java,
+       javax/naming/CannotProceedException.java,
+       javax/naming/CommunicationException.java,
+       javax/naming/CompoundName.java,
+       javax/naming/ConfigurationException.java,
+       javax/naming/ContextNotEmptyException.java,
+       javax/naming/InitialContext.java,
+       javax/naming/InsufficientResourcesException.java,
+       javax/naming/InterruptedNamingException.java,
+       javax/naming/LimitExceededException.java,
+       javax/naming/LinkException.java,
+       javax/naming/LinkLoopException.java,
+       javax/naming/LinkRef.java,
+       javax/naming/MalformedLinkException.java,
+       javax/naming/Name.java,
+       javax/naming/NameAlreadyBoundException.java,
+       javax/naming/NameNotFoundException.java,
+       javax/naming/NamingSecurityException.java,
+       javax/naming/NoInitialContextException.java,
+       javax/naming/NoPermissionException.java,
+       javax/naming/NotContextException.java,
+       javax/naming/PartialResultException.java,
+       javax/naming/ReferralException.java,
+       javax/naming/ServiceUnavailableException.java,
+       javax/naming/SizeLimitExceededException.java,
+       javax/naming/TimeLimitExceededException.java,
+       javax/naming/directory/Attribute.java,
+       javax/naming/directory/Attributes.java,
+       javax/naming/directory/SearchResult.java,
+       javax/naming/event/NamingExceptionEvent.java,
+       javax/naming/spi/ResolveResult.java:
+       Cleaned up imports.
+
 2004-04-21  Mark Wielaard  <mark@klomp.org>
 
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c:

diff --git a/libjava/javax/naming/AuthenticationException.java b/libjava/javax/naming/AuthenticationException.java
index 112dd61..63bfb4b 100644 (file)
--- a/libjava/javax/naming/AuthenticationException.java
+++ b/libjava/javax/naming/AuthenticationException.java
@@ -1,5 +1,5 @@
 /* AuthenticationException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
  
 package javax.naming;
 
-import java.lang.Exception;
  
 public class AuthenticationException extends NamingSecurityException
 {

diff --git a/libjava/javax/naming/AuthenticationNotSupportedException.java b/libjava/javax/naming/AuthenticationNotSupportedException.java
index 6409e64..e14fed9 100644 (file)
--- a/libjava/javax/naming/AuthenticationNotSupportedException.java
+++ b/libjava/javax/naming/AuthenticationNotSupportedException.java
@@ -1,5 +1,5 @@
 /* AuthenticationNotSupportedException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
  
 package javax.naming;
 
-import java.lang.Exception;
  
 public class AuthenticationNotSupportedException
   extends NamingSecurityException

diff --git a/libjava/javax/naming/CannotProceedException.java b/libjava/javax/naming/CannotProceedException.java
index f985418..0fe382b 100644 (file)
--- a/libjava/javax/naming/CannotProceedException.java
+++ b/libjava/javax/naming/CannotProceedException.java
@@ -1,5 +1,5 @@
 /* CannotProceedException.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
  
 package javax.naming;
 
-import java.lang.Exception;
 import java.util.Hashtable;
  
 /**

diff --git a/libjava/javax/naming/CommunicationException.java b/libjava/javax/naming/CommunicationException.java
index 8731be1..4a22922 100644 (file)
--- a/libjava/javax/naming/CommunicationException.java
+++ b/libjava/javax/naming/CommunicationException.java
@@ -1,5 +1,5 @@
 /* CommunicationException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class CommunicationException extends NamingException
 {

diff --git a/libjava/javax/naming/CompoundName.java b/libjava/javax/naming/CompoundName.java
index 4df89e9..87d26fe 100644 (file)
--- a/libjava/javax/naming/CompoundName.java
+++ b/libjava/javax/naming/CompoundName.java
@@ -1,5 +1,5 @@
 /* CompoundName.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,8 +40,8 @@ package javax.naming;
 
 import java.io.Serializable;
 import java.util.Enumeration;
-import java.util.Properties;
 import java.util.NoSuchElementException;
+import java.util.Properties;
 import java.util.Vector;
 
 /**

diff --git a/libjava/javax/naming/ConfigurationException.java b/libjava/javax/naming/ConfigurationException.java
index 7df4603..f8dad94 100644 (file)
--- a/libjava/javax/naming/ConfigurationException.java
+++ b/libjava/javax/naming/ConfigurationException.java
@@ -1,5 +1,5 @@
 /* ConfigurationException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class ConfigurationException extends NamingException
 {

diff --git a/libjava/javax/naming/ContextNotEmptyException.java b/libjava/javax/naming/ContextNotEmptyException.java
index 74204db..b77080c 100644 (file)
--- a/libjava/javax/naming/ContextNotEmptyException.java
+++ b/libjava/javax/naming/ContextNotEmptyException.java
@@ -1,5 +1,5 @@
 /* ContextNotEmptyException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class ContextNotEmptyException extends NamingException
 {

diff --git a/libjava/javax/naming/InitialContext.java b/libjava/javax/naming/InitialContext.java
index e2a1ac6..889a79d 100644 (file)
--- a/libjava/javax/naming/InitialContext.java
+++ b/libjava/javax/naming/InitialContext.java
@@ -1,5 +1,5 @@
 /* InitialContext.java --
-   Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,14 +39,13 @@ exception statement from your version. */
 package javax.naming;
 
 import java.applet.Applet;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Properties;
+
 import javax.naming.spi.NamingManager;
 
 public class InitialContext implements Context

diff --git a/libjava/javax/naming/InsufficientResourcesException.java b/libjava/javax/naming/InsufficientResourcesException.java
index 120033d..d2cb27f 100644 (file)
--- a/libjava/javax/naming/InsufficientResourcesException.java
+++ b/libjava/javax/naming/InsufficientResourcesException.java
@@ -1,5 +1,5 @@
 /* InsufficientResourcesException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
  
 package javax.naming;
 
-import java.lang.Exception;
  
 public class InsufficientResourcesException extends NamingException
 {

diff --git a/libjava/javax/naming/InterruptedNamingException.java b/libjava/javax/naming/InterruptedNamingException.java
index e5ad1f8..d9e3d4c 100644 (file)
--- a/libjava/javax/naming/InterruptedNamingException.java
+++ b/libjava/javax/naming/InterruptedNamingException.java
@@ -1,5 +1,5 @@
 /* InterruptedNamingException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class InterruptedNamingException extends NamingException
 {

diff --git a/libjava/javax/naming/LimitExceededException.java b/libjava/javax/naming/LimitExceededException.java
index 4bbbb0f..4fff2af 100644 (file)
--- a/libjava/javax/naming/LimitExceededException.java
+++ b/libjava/javax/naming/LimitExceededException.java
@@ -1,5 +1,5 @@
 /* LimitExceededException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
  
 package javax.naming;
 
-import java.lang.Exception;
  
 public class LimitExceededException extends NamingException
 {

diff --git a/libjava/javax/naming/LinkException.java b/libjava/javax/naming/LinkException.java
index 46ea6bd..2b0524d 100644 (file)
--- a/libjava/javax/naming/LinkException.java
+++ b/libjava/javax/naming/LinkException.java
@@ -1,5 +1,5 @@
 /* LinkException.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
  
 package javax.naming;
 
-import java.lang.Exception;
  
 /**
  * @author Warren Levy <warrenl@redhat.com>

diff --git a/libjava/javax/naming/LinkLoopException.java b/libjava/javax/naming/LinkLoopException.java
index 0c2bddd..43fc0ce 100644 (file)
--- a/libjava/javax/naming/LinkLoopException.java
+++ b/libjava/javax/naming/LinkLoopException.java
@@ -1,5 +1,5 @@
 /* LinkLoopException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
  
 package javax.naming;
 
-import java.lang.Exception;
  
 public class LinkLoopException extends LinkException
 {

diff --git a/libjava/javax/naming/LinkRef.java b/libjava/javax/naming/LinkRef.java
index 51b0f1b..53597d3 100644 (file)
--- a/libjava/javax/naming/LinkRef.java
+++ b/libjava/javax/naming/LinkRef.java
@@ -1,5 +1,5 @@
 /* LinkRef.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.naming;
 
-import java.io.Serializable;
 
 /**
  * @author Tom Tromey <tromey@redhat.com>

diff --git a/libjava/javax/naming/MalformedLinkException.java b/libjava/javax/naming/MalformedLinkException.java
index 5233e77..56e13e0 100644 (file)
--- a/libjava/javax/naming/MalformedLinkException.java
+++ b/libjava/javax/naming/MalformedLinkException.java
@@ -1,5 +1,5 @@
 /* MalformedLinkException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class MalformedLinkException extends LinkException
 {

diff --git a/libjava/javax/naming/Name.java b/libjava/javax/naming/Name.java
index f2dc17f..0d4a2ed 100644 (file)
--- a/libjava/javax/naming/Name.java
+++ b/libjava/javax/naming/Name.java
@@ -1,5 +1,5 @@
 /* Name.java -- Name build up from different components
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,8 @@ exception statement from your version. */
 
 package javax.naming;
 
-import java.util.Enumeration;
 import java.io.Serializable;
+import java.util.Enumeration;
 
 /**
  * Interface descriping a name build up from different components.

diff --git a/libjava/javax/naming/NameAlreadyBoundException.java b/libjava/javax/naming/NameAlreadyBoundException.java
index 2b57436..dbde071 100644 (file)
--- a/libjava/javax/naming/NameAlreadyBoundException.java
+++ b/libjava/javax/naming/NameAlreadyBoundException.java
@@ -1,5 +1,5 @@
 /* NameAlreadyBoundException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class NameAlreadyBoundException extends NamingException
 {

diff --git a/libjava/javax/naming/NameNotFoundException.java b/libjava/javax/naming/NameNotFoundException.java
index cb22ab3..d0d1fff 100644 (file)
--- a/libjava/javax/naming/NameNotFoundException.java
+++ b/libjava/javax/naming/NameNotFoundException.java
@@ -1,5 +1,5 @@
 /* NameNotFoundException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
  
 package javax.naming;
 
-import java.lang.Exception;
  
 public class NameNotFoundException extends NamingException
 {

diff --git a/libjava/javax/naming/NamingSecurityException.java b/libjava/javax/naming/NamingSecurityException.java
index 5972f56..1860a0e 100644 (file)
--- a/libjava/javax/naming/NamingSecurityException.java
+++ b/libjava/javax/naming/NamingSecurityException.java
@@ -1,5 +1,5 @@
 /* NamingSecurityException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public abstract class NamingSecurityException extends NamingException
 {

diff --git a/libjava/javax/naming/NoInitialContextException.java b/libjava/javax/naming/NoInitialContextException.java
index a1220df..7139fd2 100644 (file)
--- a/libjava/javax/naming/NoInitialContextException.java
+++ b/libjava/javax/naming/NoInitialContextException.java
@@ -1,5 +1,5 @@
 /* NoInitialContextException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class NoInitialContextException extends NamingException
 {

diff --git a/libjava/javax/naming/NoPermissionException.java b/libjava/javax/naming/NoPermissionException.java
index 261b7ff..9de1c7a 100644 (file)
--- a/libjava/javax/naming/NoPermissionException.java
+++ b/libjava/javax/naming/NoPermissionException.java
@@ -1,5 +1,5 @@
 /* NoPermissionException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class NoPermissionException extends NamingSecurityException
 {

diff --git a/libjava/javax/naming/NotContextException.java b/libjava/javax/naming/NotContextException.java
index 87edeb3..d480eed 100644 (file)
--- a/libjava/javax/naming/NotContextException.java
+++ b/libjava/javax/naming/NotContextException.java
@@ -1,5 +1,5 @@
 /* NotContextException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class NotContextException extends NamingException
 {

diff --git a/libjava/javax/naming/PartialResultException.java b/libjava/javax/naming/PartialResultException.java
index 6f323d5..2f5a064 100644 (file)
--- a/libjava/javax/naming/PartialResultException.java
+++ b/libjava/javax/naming/PartialResultException.java
@@ -1,5 +1,5 @@
 /* PartialResultException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class PartialResultException extends NamingException
 {

diff --git a/libjava/javax/naming/ReferralException.java b/libjava/javax/naming/ReferralException.java
index 1be6c66..63e8303 100644 (file)
--- a/libjava/javax/naming/ReferralException.java
+++ b/libjava/javax/naming/ReferralException.java
@@ -1,5 +1,5 @@
 /* ReferralException.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.naming;
 
-import java.lang.Exception;
 import java.util.Hashtable;
  
 /**

diff --git a/libjava/javax/naming/ServiceUnavailableException.java b/libjava/javax/naming/ServiceUnavailableException.java
index 43aee53..389197a 100644 (file)
--- a/libjava/javax/naming/ServiceUnavailableException.java
+++ b/libjava/javax/naming/ServiceUnavailableException.java
@@ -1,5 +1,5 @@
 /* ServiceUnavailableException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class ServiceUnavailableException extends NamingException
 {

diff --git a/libjava/javax/naming/SizeLimitExceededException.java b/libjava/javax/naming/SizeLimitExceededException.java
index 5d4414f..aad7903 100644 (file)
--- a/libjava/javax/naming/SizeLimitExceededException.java
+++ b/libjava/javax/naming/SizeLimitExceededException.java
@@ -1,5 +1,5 @@
 /* SizeLimitExceededException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class SizeLimitExceededException extends LimitExceededException
 {

diff --git a/libjava/javax/naming/TimeLimitExceededException.java b/libjava/javax/naming/TimeLimitExceededException.java
index dc8dadf..5baf5bf 100644 (file)
--- a/libjava/javax/naming/TimeLimitExceededException.java
+++ b/libjava/javax/naming/TimeLimitExceededException.java
@@ -1,5 +1,5 @@
 /* TimeLimitExceededException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class TimeLimitExceededException extends LimitExceededException
 {

diff --git a/libjava/javax/naming/directory/Attribute.java b/libjava/javax/naming/directory/Attribute.java
index 48118b0..f812f16 100644 (file)
--- a/libjava/javax/naming/directory/Attribute.java
+++ b/libjava/javax/naming/directory/Attribute.java
@@ -1,5 +1,5 @@
 /* Attribute.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,8 +39,7 @@ exception statement from your version. */
 package javax.naming.directory;
 
 import java.io.Serializable;
-import javax.naming.Context;
-import javax.naming.Name;
+
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 

diff --git a/libjava/javax/naming/directory/Attributes.java b/libjava/javax/naming/directory/Attributes.java
index f1c673a..b0ee5cd 100644 (file)
--- a/libjava/javax/naming/directory/Attributes.java
+++ b/libjava/javax/naming/directory/Attributes.java
@@ -1,5 +1,5 @@
 /* Attributes.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,8 +39,7 @@ exception statement from your version. */
 package javax.naming.directory;
 
 import java.io.Serializable;
-import javax.naming.Context;
-import javax.naming.Name;
+
 import javax.naming.NamingEnumeration;
 
 /**

diff --git a/libjava/javax/naming/directory/SearchResult.java b/libjava/javax/naming/directory/SearchResult.java
index 74c3887..eb4c182 100644 (file)
--- a/libjava/javax/naming/directory/SearchResult.java
+++ b/libjava/javax/naming/directory/SearchResult.java
@@ -1,5 +1,5 @@
 /* SearchResult.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.naming.directory;
 
-import java.io.Serializable;
 import javax.naming.Binding;
  
 /**

diff --git a/libjava/javax/naming/event/NamingExceptionEvent.java b/libjava/javax/naming/event/NamingExceptionEvent.java
index 3cbb19f..17b71d9 100644 (file)
--- a/libjava/javax/naming/event/NamingExceptionEvent.java
+++ b/libjava/javax/naming/event/NamingExceptionEvent.java
@@ -1,5 +1,5 @@
 /* NamingExceptionEvent.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,8 +39,7 @@ exception statement from your version. */
 package javax.naming.event;
 
 import java.util.EventObject;
-import javax.naming.Context;
-import javax.naming.Name;
+
 import javax.naming.NamingException;
  
 /**

diff --git a/libjava/javax/naming/spi/ResolveResult.java b/libjava/javax/naming/spi/ResolveResult.java
index c1e3ad9..25dd849 100644 (file)
--- a/libjava/javax/naming/spi/ResolveResult.java
+++ b/libjava/javax/naming/spi/ResolveResult.java
@@ -1,5 +1,5 @@
 /* ResolveResult.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,10 +39,10 @@ exception statement from your version. */
 package javax.naming.spi;
 
 import java.io.Serializable;
-import java.util.EventObject;
-import javax.naming.Name;
+
 import javax.naming.CompositeName;
 import javax.naming.InvalidNameException;
+import javax.naming.Name;
  
 /**
  * @author Warren Levy <warrenl@redhat.com>