From 27dd18cf734dfdd6aba03fab66044a9aa911054a Mon Sep 17 00:00:00 2001 From: Dalibor Topic Date: Wed, 21 Apr 2004 07:18:04 +0000 Subject: [PATCH] AuthenticationException.java, [...]: Cleaned up imports. 2004-04-21 Dalibor Topic * 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. From-SVN: r80947 --- libjava/ChangeLog | 36 +++++++++++++++++++ .../javax/naming/AuthenticationException.java | 3 +- .../AuthenticationNotSupportedException.java | 3 +- .../javax/naming/CannotProceedException.java | 3 +- .../javax/naming/CommunicationException.java | 3 +- libjava/javax/naming/CompoundName.java | 4 +-- .../javax/naming/ConfigurationException.java | 3 +- .../naming/ContextNotEmptyException.java | 3 +- libjava/javax/naming/InitialContext.java | 5 ++- .../InsufficientResourcesException.java | 3 +- .../naming/InterruptedNamingException.java | 3 +- .../javax/naming/LimitExceededException.java | 3 +- libjava/javax/naming/LinkException.java | 3 +- libjava/javax/naming/LinkLoopException.java | 3 +- libjava/javax/naming/LinkRef.java | 3 +- .../javax/naming/MalformedLinkException.java | 3 +- libjava/javax/naming/Name.java | 4 +-- .../naming/NameAlreadyBoundException.java | 3 +- .../javax/naming/NameNotFoundException.java | 3 +- .../javax/naming/NamingSecurityException.java | 3 +- .../naming/NoInitialContextException.java | 3 +- .../javax/naming/NoPermissionException.java | 3 +- libjava/javax/naming/NotContextException.java | 3 +- .../javax/naming/PartialResultException.java | 3 +- libjava/javax/naming/ReferralException.java | 3 +- .../naming/ServiceUnavailableException.java | 3 +- .../naming/SizeLimitExceededException.java | 3 +- .../naming/TimeLimitExceededException.java | 3 +- libjava/javax/naming/directory/Attribute.java | 5 ++- .../javax/naming/directory/Attributes.java | 5 ++- .../javax/naming/directory/SearchResult.java | 3 +- .../naming/event/NamingExceptionEvent.java | 5 ++- libjava/javax/naming/spi/ResolveResult.java | 6 ++-- 33 files changed, 76 insertions(+), 69 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 24f315164ab3..6a71bf84d71b 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,39 @@ +2004-04-21 Dalibor Topic + + * 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 * 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 112dd612e6f4..63bfb4b8eaaf 100644 --- 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 6409e6490fa9..e14fed92e5cb 100644 --- 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 f98541876d90..0fe382b73aa4 100644 --- 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 8731be15acbd..4a22922f1a57 100644 --- 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 4df89e9af951..87d26feb43b0 100644 --- 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 7df4603c5a0e..f8dad9459ec4 100644 --- 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 74204db54ba7..b77080c8f333 100644 --- 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 e2a1ac6b63f8..889a79dde273 100644 --- 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 120033dd143c..d2cb27fee6c0 100644 --- 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 e5ad1f864aff..d9e3d4c588ff 100644 --- 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 4bbbb0f496a1..4fff2af2d0a5 100644 --- 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 46ea6bd0b141..2b0524d91eba 100644 --- 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 diff --git a/libjava/javax/naming/LinkLoopException.java b/libjava/javax/naming/LinkLoopException.java index 0c2bdddd876d..43fc0ce1a1de 100644 --- 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 51b0f1bf7717..53597d38fc79 100644 --- 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 diff --git a/libjava/javax/naming/MalformedLinkException.java b/libjava/javax/naming/MalformedLinkException.java index 5233e7723656..56e13e054c12 100644 --- 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 f2dc17ffaf43..0d4a2ed53f63 100644 --- 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 2b57436285ab..dbde071bd963 100644 --- 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 cb22ab371e2a..d0d1fff0094b 100644 --- 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 5972f56b052a..1860a0e0a2c3 100644 --- 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 a1220dfb8792..7139fd2b2cf2 100644 --- 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 261b7ff26141..9de1c7a69087 100644 --- 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 87edeb319679..d480eed20b54 100644 --- 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 6f323d59dcf8..2f5a0645f418 100644 --- 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 1be6c6649e4c..63e83030cd55 100644 --- 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 43aee5354f73..389197a15cd5 100644 --- 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 5d4414f7bf4c..aad7903e8636 100644 --- 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 dc8dadf1e334..5baf5bf9ec45 100644 --- 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 48118b012941..f812f1662844 100644 --- 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 f1c673a76ec8..b0ee5cdc45eb 100644 --- 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 74c38876f70e..eb4c182e21ae 100644 --- 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 3cbb19fa2eff..17b71d929636 100644 --- 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 c1e3ad9930b6..25dd8494e70a 100644 --- 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