2003-10-12 Michael Koch <konqueror@gmx.de>

	* javax/naming/Context.java,
	javax/naming/Name.java,
	javax/naming/NameParser.java,
	javax/naming/NamingEnumeration.java,
	javax/naming/Referenceable.java,
	javax/naming/directory/Attribute.java,
	javax/naming/directory/Attributes.java,
	javax/naming/directory/DirContext.java,
	javax/naming/event/EventContext.java,
	javax/naming/event/EventDirContext.java,
	javax/naming/event/NamespaceChangeListener.java,
	javax/naming/event/NamingListener.java,
	javax/naming/event/ObjectChangeListener.java,
	javax/naming/ldap/Control.java,
	javax/naming/ldap/ExtendedRequest.java,
	javax/naming/ldap/ExtendedResponse.java,
	javax/naming/ldap/HasControls.java,
	javax/naming/ldap/LdapContext.java,
	javax/naming/ldap/UnsolicitedNotification.java,
	javax/naming/ldap/UnsolicitedNotificationListener.java,
	javax/naming/spi/DirObjectFactory.java,
	javax/naming/spi/DirStateFactory.java,
	javax/naming/spi/InitialContextFactory.java,
	javax/naming/spi/InitialContextFactoryBuilder.java,
	javax/naming/spi/ObjectFactory.java,
	javax/naming/spi/ObjectFactoryBuilder.java,
	javax/naming/spi/Resolver.java,
	javax/naming/spi/StateFactory.java:
	Removed redundant modifiers.

28 files changed, 181 insertions, 176 deletions

diff --git a/javax/naming/Context.java b/javax/naming/Context.java
index 5720dc402..b1b621dce 100644
--- a/javax/naming/Context.java
+++ b/javax/naming/Context.java
@@ -43,118 +43,118 @@ import java.util.Hashtable;
 public interface Context
 {
   // Property with name of the inital context factory to use
-  public static final String INITIAL_CONTEXT_FACTORY 
+  String INITIAL_CONTEXT_FACTORY 
     = "java.naming.factory.initial";
 
   // Property with colon-separated list of object factories to use.
-  public static final String OBJECT_FACTORIES
+  String OBJECT_FACTORIES
     = "java.naming.factory.object";
 
   // Property with colon-separated list of state factories to use.
-  public static final String STATE_FACTORIES
+  String STATE_FACTORIES
     = "java.naming.factory.state";
 
   // Property with colon-separated list of package prefixes to use.
-  public static final String URL_PKG_PREFIXES
+  String URL_PKG_PREFIXES
     = "java.naming.factory.url.pkgs";
 
   // Property with URL specifying configuration for the service
   // provider to use.
-  public static final String PROVIDER_URL 
+  String PROVIDER_URL 
     = "java.naming.provider.url";
   
   // Property with the DNS host and domain names to use.
-  public static final String DNS_URL 
+  String DNS_URL 
     = "java.naming.dns.url";
   
   // Property with the authoritativeness of the service requested.
-  public static final String AUTHORITATIVE 
+  String AUTHORITATIVE 
     = "java.naming.authoritative";
   
   // Property with the batch size to use when returning data via the
   // service's protocol.
-  public static final String BATCHSIZE
+  String BATCHSIZE
     = "java.naming.batchsize";
   
   // Property defining how referrals encountered by the service
   // provider are to be processed.
-  public static final String REFERRAL
+  String REFERRAL
     = "java.naming.referral";
 
   // Property specifying the security protocol to use.
-  public static final String SECURITY_PROTOCOL
+  String SECURITY_PROTOCOL
     = "java.naming.security.protocol";
 
   // Property specifying the security level to use.
-  public static final String SECURITY_AUTHENTICATION
+  String SECURITY_AUTHENTICATION
     = "java.naming.security.authentication";
 
   // Property for the identity of the principal for authenticating
   // the caller to the service.
-  public static final String SECURITY_PRINCIPAL
+  String SECURITY_PRINCIPAL
     = "java.naming.security.principal";
 
   // Property specifying the credentials of the principal for
   // authenticating the caller to the service.
-  public static final String SECURITY_CREDENTIALS
+  String SECURITY_CREDENTIALS
     = "java.naming.security.credentials";
 
   // Property for specifying the preferred language to use with the
   // service.
-  public static final String LANGUAGE
+  String LANGUAGE
     = "java.naming.language";
 
   // Property for the initial context constructor to use when searching
   // for other properties.
-  public static final String APPLET
+  String APPLET
     = "java.naming.applet";
 
-  public void bind (Name name, Object obj) throws NamingException;
-  public void bind (String name, Object obj) throws NamingException;
+  void bind (Name name, Object obj) throws NamingException;
+  void bind (String name, Object obj) throws NamingException;
 
-  public Object lookup (Name name) throws NamingException;
-  public Object lookup (String name) throws NamingException;
+  Object lookup (Name name) throws NamingException;
+  Object lookup (String name) throws NamingException;
 
-  public void rebind (Name name, Object obj) throws NamingException;
-  public void rebind (String name, Object obj) throws NamingException;
+  void rebind (Name name, Object obj) throws NamingException;
+  void rebind (String name, Object obj) throws NamingException;
 
-  public void unbind (Name name) throws NamingException;
-  public void unbind (String name) throws NamingException;
+  void unbind (Name name) throws NamingException;
+  void unbind (String name) throws NamingException;
 
-  public void rename (Name oldName, Name newName) throws NamingException;
-  public void rename (String oldName, String newName) throws NamingException;
+  void rename (Name oldName, Name newName) throws NamingException;
+  void rename (String oldName, String newName) throws NamingException;
 
-  public NamingEnumeration list (Name name) throws NamingException;
-  public NamingEnumeration list (String name) throws NamingException;
+  NamingEnumeration list (Name name) throws NamingException;
+  NamingEnumeration list (String name) throws NamingException;
 
-  public NamingEnumeration listBindings (Name name) throws NamingException;
-  public NamingEnumeration listBindings (String name) throws NamingException;
+  NamingEnumeration listBindings (Name name) throws NamingException;
+  NamingEnumeration listBindings (String name) throws NamingException;
 
-  public void destroySubcontext (Name name) throws NamingException;
-  public void destroySubcontext (String name) throws NamingException;
+  void destroySubcontext (Name name) throws NamingException;
+  void destroySubcontext (String name) throws NamingException;
 
-  public Context createSubcontext (Name name) throws NamingException;
-  public Context createSubcontext (String name) throws NamingException;
+  Context createSubcontext (Name name) throws NamingException;
+  Context createSubcontext (String name) throws NamingException;
 
-  public Object lookupLink (Name name) throws NamingException;
-  public Object lookupLink (String name) throws NamingException;
+  Object lookupLink (Name name) throws NamingException;
+  Object lookupLink (String name) throws NamingException;
 
-  public NameParser getNameParser (Name name) throws NamingException;
-  public NameParser getNameParser (String name) throws NamingException;
+  NameParser getNameParser (Name name) throws NamingException;
+  NameParser getNameParser (String name) throws NamingException;
 
-  public Name composeName (Name name, Name prefix) throws NamingException;
-  public String composeName (String name, 
+  Name composeName (Name name, Name prefix) throws NamingException;
+  String composeName (String name, 
 			     String prefix) throws NamingException;
 
-  public Object addToEnvironment (String propName, 
+  Object addToEnvironment (String propName, 
 				  Object propVal) throws NamingException;
 
-  public Object removeFromEnvironment (String propName) throws NamingException;
+  Object removeFromEnvironment (String propName) throws NamingException;
 
-  public Hashtable getEnvironment () throws NamingException;
+  Hashtable getEnvironment () throws NamingException;
 
-  public void close () throws NamingException;
+  void close () throws NamingException;
 
-  public String getNameInNamespace () throws NamingException;
+  String getNameInNamespace () throws NamingException;
 }
 
diff --git a/javax/naming/Name.java b/javax/naming/Name.java
index 4a10f321f..f2dc17ffa 100644
--- a/javax/naming/Name.java
+++ b/javax/naming/Name.java
@@ -62,25 +62,25 @@ import java.io.Serializable;
  */
 public interface Name extends Cloneable, Serializable
 {
-  static final long serialVersionUID = -3617482732056931635L;
+  long serialVersionUID = -3617482732056931635L;
 
   /**
    * Returns the number of components of this <code>Name</code>.
    * The returned number can be zero.
    */
-  public int size();
+  int size();
 
   /**
    * Returns <code>true</code> if the number of components of this
    * <code>Name</code> is zero, <code>false</code> otherwise.
    */
-  public boolean isEmpty();
+  boolean isEmpty();
 
   /**
    * Returns a non-null (but possibly empty) <code>Enumeration</code> of the
    * components of the <code>Name</code> as <code>String</code>s.
    */
-  public Enumeration getAll();
+  Enumeration getAll();
 
   /**
    * Gets the component at the given index.
@@ -88,7 +88,7 @@ public interface Name extends Cloneable, Serializable
    * @exception ArrayIndexOutOfBoundsException if the given index is smaller
    *            then zero or greater then or equal to <code>size()</code>.
    */
-  public String get(int i);
+  String get(int i);
 
   /**
    * Returns the components till the given index as a <code>Name</code>.
@@ -98,7 +98,7 @@ public interface Name extends Cloneable, Serializable
    * @exception ArrayIndexOutOfBoundsException if the given index is smaller
    *            then zero or greater then or equal to <code>size()</code>.
    */
-  public Name getPrefix(int i);
+  Name getPrefix(int i);
 
   /**
    * Returns the components from the given index till the end as a
@@ -109,7 +109,7 @@ public interface Name extends Cloneable, Serializable
    * @exception ArrayIndexOutOfBoundsException if the given index is smaller
    *            then zero or greater then or equal to <code>size()</code>.
    */
-  public Name getSuffix(int i);
+  Name getSuffix(int i);
 
   /**
    * Adds the given <code>String</code> component to the end of this
@@ -119,7 +119,7 @@ public interface Name extends Cloneable, Serializable
    * @exception InvalidNameException if the given <code>String</code> is not a
    *            valid component for this <code>Name</code>.
    */
-  public Name add(String comp) throws InvalidNameException;
+  Name add(String comp) throws InvalidNameException;
 
   /**
    * Inserts the given <code>String</code> component to this <code>Name</code>
@@ -131,7 +131,7 @@ public interface Name extends Cloneable, Serializable
    * @exception InvalidNameException if the given <code>String</code> is not a
    *            valid component for this <code>Name</code>.
    */
-  public Name add(int posn, String comp) throws InvalidNameException;
+  Name add(int posn, String comp) throws InvalidNameException;
 
   /**
    * Adds all the components of the given <code>Name</code> to the end of this
@@ -141,7 +141,7 @@ public interface Name extends Cloneable, Serializable
    * @exception InvalidNameException if any of the given components is not a
    *            valid component for this <code>Name</code>.
    */
-  public Name addAll(Name suffix) throws InvalidNameException;
+  Name addAll(Name suffix) throws InvalidNameException;
 
   /**
    * Inserts all the components of the given <code>Name</code> to this
@@ -153,7 +153,7 @@ public interface Name extends Cloneable, Serializable
    * @exception InvalidNameException if any of the given components is not a
    *            valid component for this <code>Name</code>.
    */
-  public Name addAll(int posn, Name n) throws InvalidNameException;
+  Name addAll(int posn, Name n) throws InvalidNameException;
 
   /**
    * Removes the component at the given index from this <code>Name</code>.
@@ -162,19 +162,19 @@ public interface Name extends Cloneable, Serializable
    * @exception InvalidNameException if the given <code>String</code> is not a
    *            valid component for this <code>Name</code>.
    */
-  public Object remove(int posn) throws InvalidNameException;
+  Object remove(int posn) throws InvalidNameException;
 
   /**
    * Returns <code>true</code> if this <code>Name</code> starts with the
    * components of the given <code>Name</code>, <code>false</code> otherwise.
    */
-  public boolean startsWith(Name name);
+  boolean startsWith(Name name);
 
   /**
    * Returns <code>true</code> if this <code>Name</code> ends with the
    * components of the given <code>Name</code>, <code>false</code> otherwise.
    */
-  public boolean endsWith(Name name);
+  boolean endsWith(Name name);
 
   /**
    * Compares the given object to this <code>Name</code>.
@@ -187,12 +187,12 @@ public interface Name extends Cloneable, Serializable
    * be compared. The definition of smaller, bigger and equal is up to the
    * actual implementing class.
    */
-  public int compareTo(Object obj);
+  int compareTo(Object obj);
 
   /**
    * Returns a clone of this <code>Name</code>. It will be a deep copy of
    * all the components of the <code>Name</code> so that changes to components
    * of the components does not change the component in this <code>Name</code>.
    */
-  public Object clone();
+  Object clone();
 }
diff --git a/javax/naming/NameParser.java b/javax/naming/NameParser.java
index 0bd2a7a8a..802cd33db 100644
--- a/javax/naming/NameParser.java
+++ b/javax/naming/NameParser.java
@@ -40,7 +40,7 @@ package javax.naming;
 
 public interface NameParser
 {
-  public Name parse (String name) throws NamingException;
+  Name parse (String name) throws NamingException;
 }
 
 
diff --git a/javax/naming/NamingEnumeration.java b/javax/naming/NamingEnumeration.java
index 4340c1287..578662f25 100644
--- a/javax/naming/NamingEnumeration.java
+++ b/javax/naming/NamingEnumeration.java
@@ -42,7 +42,7 @@ import java.util.Enumeration;
 
 public interface NamingEnumeration extends Enumeration
 {
-  public void close() throws NamingException;
-  public boolean hasMore() throws NamingException;
-  public Object next() throws NamingException;
+  void close() throws NamingException;
+  boolean hasMore() throws NamingException;
+  Object next() throws NamingException;
 }
diff --git a/javax/naming/Referenceable.java b/javax/naming/Referenceable.java
index 50170b9ac..013127a49 100644
--- a/javax/naming/Referenceable.java
+++ b/javax/naming/Referenceable.java
@@ -40,5 +40,5 @@ package javax.naming;
 
 public interface Referenceable
 {
-  public Reference getReference() throws NamingException;
+  Reference getReference() throws NamingException;
 }
diff --git a/javax/naming/directory/Attribute.java b/javax/naming/directory/Attribute.java
index 8579d84a0..933839523 100644
--- a/javax/naming/directory/Attribute.java
+++ b/javax/naming/directory/Attribute.java
@@ -47,22 +47,22 @@ import java.io.Serializable;
  */
 public interface Attribute extends Cloneable, Serializable
 {
-  public static final long serialVersionUID = 8707690322213556804L;
+  long serialVersionUID = 8707690322213556804L;
 
-  public NamingEnumeration getAll() throws NamingException;
-  public Object get() throws NamingException;
-  public int size();
-  public String getID();
-  public boolean contains(Object attrVal);
-  public boolean add(Object attrVal);
-  public boolean remove(Object attrval);
-  public void clear();
-  public DirContext getAttributeSyntaxDefinition() throws NamingException;
-  public DirContext getAttributeDefinition() throws NamingException;
-  public Object clone();
-  public boolean isOrdered();
-  public Object get(int ix) throws NamingException;
-  public Object remove(int ix);
-  public void add(int ix, Object attrVal);
-  public Object set(int ix, Object attrVal);
+  NamingEnumeration getAll() throws NamingException;
+  Object get() throws NamingException;
+  int size();
+  String getID();
+  boolean contains(Object attrVal);
+  boolean add(Object attrVal);
+  boolean remove(Object attrval);
+  void clear();
+  DirContext getAttributeSyntaxDefinition() throws NamingException;
+  DirContext getAttributeDefinition() throws NamingException;
+  Object clone();
+  boolean isOrdered();
+  Object get(int ix) throws NamingException;
+  Object remove(int ix);
+  void add(int ix, Object attrVal);
+  Object set(int ix, Object attrVal);
 }
diff --git a/javax/naming/directory/Attributes.java b/javax/naming/directory/Attributes.java
index 7f5ac47c2..332da27f3 100644
--- a/javax/naming/directory/Attributes.java
+++ b/javax/naming/directory/Attributes.java
@@ -48,14 +48,14 @@ import java.io.Serializable;
 
 public interface Attributes extends Cloneable, Serializable
 {
-  public boolean isCaseIgnored();
-  public int size();
-  public Attribute get(String attrID);
-  public NamingEnumeration getAll();
-  public NamingEnumeration getIDs();
-  public Attribute put(String attrID, Object val);
-  public Attribute put(Attribute attr);
-  public Attribute remove(String attrID);
-  public Object clone();
+  boolean isCaseIgnored();
+  int size();
+  Attribute get(String attrID);
+  NamingEnumeration getAll();
+  NamingEnumeration getIDs();
+  Attribute put(String attrID, Object val);
+  Attribute put(Attribute attr);
+  Attribute remove(String attrID);
+  Object clone();
 }
 
diff --git a/javax/naming/directory/DirContext.java b/javax/naming/directory/DirContext.java
index aabad173e..93f89cc5e 100644
--- a/javax/naming/directory/DirContext.java
+++ b/javax/naming/directory/DirContext.java
@@ -47,34 +47,34 @@ import javax.naming.*;
 
 public interface DirContext extends Context
 {
-  public static final int ADD_ATTRIBUTE = 1;
-  public static final int REPLACE_ATTRIBUTE = 2;
-  public static final int REMOVE_ATTRIBUTE = 3;
+  int ADD_ATTRIBUTE = 1;
+  int REPLACE_ATTRIBUTE = 2;
+  int REMOVE_ATTRIBUTE = 3;
 
-  public Attributes getAttributes (String name) throws NamingException;
-  public Attributes getAttributes (String name, String[] attrIds) throws NamingException;
-  public Attributes getAttributes (Name name) throws NamingException;
-  public Attributes getAttributes(Name name, String[] attrIds) throws NamingException;
-  public void modifyAttributes(Name name, int mod_op, Attributes attrs) throws NamingException;
-  public void modifyAttributes(String name, int mod_op, Attributes attrs) throws NamingException;
-  public void modifyAttributes(Name name, ModificationItem[] mods) throws NamingException;
-  public void modifyAttributes(String name, ModificationItem[] mods) throws NamingException;
-  public void bind(Name name, Object obj, Attributes attrs) throws NamingException;
-  public void bind(String name, Object obj, Attributes attrs) throws NamingException;
-  public void rebind(Name name, Object obj, Attributes attrs) throws NamingException;
-  public void rebind(String name, Object obj, Attributes attrs) throws NamingException;
-  public DirContext createSubcontext(Name name, Attributes attrs) throws NamingException;
-  public DirContext createSubcontext(String name, Attributes attrs) throws NamingException;
-  public DirContext getSchema(Name name) throws NamingException;
-  public DirContext getSchema(String name) throws NamingException;
-  public DirContext getSchemaClassDefinition(Name name) throws NamingException;
-  public DirContext getSchemaClassDefinition(String name) throws NamingException;
-  public NamingEnumeration search(Name name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException;
-  public NamingEnumeration search(String name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException;
-  public NamingEnumeration search(Name name, Attributes matchingAttributes) throws NamingException;
-  public NamingEnumeration search(String name, Attributes matchingAttributes) throws NamingException;
-  public NamingEnumeration search(Name name, String filter, SearchControls cons) throws NamingException;
-  public NamingEnumeration search(String name, String filter, SearchControls cons) throws NamingException;
-  public NamingEnumeration search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException;
-  public NamingEnumeration search(String name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException;
+  Attributes getAttributes (String name) throws NamingException;
+  Attributes getAttributes (String name, String[] attrIds) throws NamingException;
+  Attributes getAttributes (Name name) throws NamingException;
+  Attributes getAttributes(Name name, String[] attrIds) throws NamingException;
+  void modifyAttributes(Name name, int mod_op, Attributes attrs) throws NamingException;
+  void modifyAttributes(String name, int mod_op, Attributes attrs) throws NamingException;
+  void modifyAttributes(Name name, ModificationItem[] mods) throws NamingException;
+  void modifyAttributes(String name, ModificationItem[] mods) throws NamingException;
+  void bind(Name name, Object obj, Attributes attrs) throws NamingException;
+  void bind(String name, Object obj, Attributes attrs) throws NamingException;
+  void rebind(Name name, Object obj, Attributes attrs) throws NamingException;
+  void rebind(String name, Object obj, Attributes attrs) throws NamingException;
+  DirContext createSubcontext(Name name, Attributes attrs) throws NamingException;
+  DirContext createSubcontext(String name, Attributes attrs) throws NamingException;
+  DirContext getSchema(Name name) throws NamingException;
+  DirContext getSchema(String name) throws NamingException;
+  DirContext getSchemaClassDefinition(Name name) throws NamingException;
+  DirContext getSchemaClassDefinition(String name) throws NamingException;
+  NamingEnumeration search(Name name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException;
+  NamingEnumeration search(String name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException;
+  NamingEnumeration search(Name name, Attributes matchingAttributes) throws NamingException;
+  NamingEnumeration search(String name, Attributes matchingAttributes) throws NamingException;
+  NamingEnumeration search(Name name, String filter, SearchControls cons) throws NamingException;
+  NamingEnumeration search(String name, String filter, SearchControls cons) throws NamingException;
+  NamingEnumeration search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException;
+  NamingEnumeration search(String name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException;
 }
diff --git a/javax/naming/event/EventContext.java b/javax/naming/event/EventContext.java
index c4936ab44..d816b1341 100644
--- a/javax/naming/event/EventContext.java
+++ b/javax/naming/event/EventContext.java
@@ -46,14 +46,17 @@ import javax.naming.*;
 
 public interface EventContext extends Context
 {
-  public static final int OBJECT_SCOPE = 0;
-  public static final int ONELEVEL_SCOPE = 1;
-  public static final int SUBTREE_SCOPE = 2;
+  int OBJECT_SCOPE = 0;
+  int ONELEVEL_SCOPE = 1;
+  int SUBTREE_SCOPE = 2;
 
-  public void addNamingListener(Name target, int scope, NamingListener l)
+  void addNamingListener (Name target, int scope, NamingListener l)
     throws NamingException;
-  public void addNamingListener(String target, int scope, NamingListener l)
+  
+  void addNamingListener (String target, int scope, NamingListener l)
     throws NamingException;
-  public void removeNamingListener(NamingListener l) throws NamingException;
-  public boolean targetMustExist() throws NamingException;
+  
+  void removeNamingListener (NamingListener l) throws NamingException;
+  
+  boolean targetMustExist() throws NamingException;
 }
diff --git a/javax/naming/event/EventDirContext.java b/javax/naming/event/EventDirContext.java
index 0c3a5d143..259610eb2 100644
--- a/javax/naming/event/EventDirContext.java
+++ b/javax/naming/event/EventDirContext.java
@@ -47,15 +47,17 @@ import javax.naming.directory.*;
 
 public interface EventDirContext extends EventContext, DirContext
 {
-  public void addNamingListener(Name target, String filter, SearchControls ctls,
-  				NamingListener l) throws NamingException;
-  public void addNamingListener(String target, String filter,
-  				SearchControls ctls, NamingListener l)
+  void addNamingListener (Name target, String filter, SearchControls ctls,
+                          NamingListener l) throws NamingException;
+  
+  void addNamingListeneri (String target, String filter, SearchControls ctls,
+		           NamingListener l) throws NamingException;
+  
+  void addNamingListener (Name target, String filter, Object[] filterArgs,
+                          SearchControls ctls, NamingListener l)
 				throws NamingException;
-  public void addNamingListener(Name target, String filter, Object[] filterArgs,
-  				SearchControls ctls, NamingListener l)
-				throws NamingException;
-  public void addNamingListener(String target, String filter,
+  
+  void addNamingListener(String target, String filter,
   				Object[] filterArgs, SearchControls ctls,
 				NamingListener l) throws NamingException;
 }
diff --git a/javax/naming/event/NamespaceChangeListener.java b/javax/naming/event/NamespaceChangeListener.java
index 9eeecd0ee..f9163b8fa 100644
--- a/javax/naming/event/NamespaceChangeListener.java
+++ b/javax/naming/event/NamespaceChangeListener.java
@@ -45,7 +45,7 @@ package javax.naming.event;
 
 public interface NamespaceChangeListener extends NamingListener
 {
-  public void objectAdded(NamingEvent evt);
-  public void objectRemoved(NamingEvent evt);
-  public void objectRenamed(NamingEvent evt);
+  void objectAdded(NamingEvent evt);
+  void objectRemoved(NamingEvent evt);
+  void objectRenamed(NamingEvent evt);
 }
diff --git a/javax/naming/event/NamingListener.java b/javax/naming/event/NamingListener.java
index 59ff4185a..4a11c9f89 100644
--- a/javax/naming/event/NamingListener.java
+++ b/javax/naming/event/NamingListener.java
@@ -46,5 +46,5 @@ import java.util.EventListener;
 
 public interface NamingListener extends EventListener
 {
-  public void namingExceptionThrown(NamingExceptionEvent evt);
+  void namingExceptionThrown(NamingExceptionEvent evt);
 }
diff --git a/javax/naming/event/ObjectChangeListener.java b/javax/naming/event/ObjectChangeListener.java
index 99426bbd8..cda1052a7 100644
--- a/javax/naming/event/ObjectChangeListener.java
+++ b/javax/naming/event/ObjectChangeListener.java
@@ -45,5 +45,5 @@ package javax.naming.event;
 
 public interface ObjectChangeListener extends NamingListener
 {
-  public void objectChanged(NamingEvent evt);
+  void objectChanged(NamingEvent evt);
 }
diff --git a/javax/naming/ldap/Control.java b/javax/naming/ldap/Control.java
index 7fed89418..ee29e586b 100644
--- a/javax/naming/ldap/Control.java
+++ b/javax/naming/ldap/Control.java
@@ -46,10 +46,10 @@ import java.io.Serializable;
 
 public interface Control extends Serializable
 {
-  public static final boolean CRITICAL = true;
-  public static final boolean NONCRITICAL = false;
+  boolean CRITICAL = true;
+  boolean NONCRITICAL = false;
 
-  public String getID();
-  public boolean isCritical();
-  public byte[] getEncodedValue();
+  String getID();
+  boolean isCritical();
+  byte[] getEncodedValue();
 }
diff --git a/javax/naming/ldap/ExtendedRequest.java b/javax/naming/ldap/ExtendedRequest.java
index dd6b538a6..21cb68951 100644
--- a/javax/naming/ldap/ExtendedRequest.java
+++ b/javax/naming/ldap/ExtendedRequest.java
@@ -47,9 +47,9 @@ import javax.naming.*;
 
 public interface ExtendedRequest extends Serializable
 {
-  public String getID();
-  public byte[] getEncodedValue();
-  public ExtendedResponse createExtendedResponse(String id,
+  String getID();
+  byte[] getEncodedValue();
+  ExtendedResponse createExtendedResponse(String id,
   						 byte[] berValue, int offset,
 						 int length)
 						 throws NamingException;
diff --git a/javax/naming/ldap/ExtendedResponse.java b/javax/naming/ldap/ExtendedResponse.java
index 3591e6ddb..d22e2274e 100644
--- a/javax/naming/ldap/ExtendedResponse.java
+++ b/javax/naming/ldap/ExtendedResponse.java
@@ -46,6 +46,6 @@ import java.io.Serializable;
 
 public interface ExtendedResponse extends Serializable
 {
-  public String getID();
-  public byte[] getEncodedValue();
+  String getID();
+  byte[] getEncodedValue();
 }
diff --git a/javax/naming/ldap/HasControls.java b/javax/naming/ldap/HasControls.java
index bf4b00184..b2fee3a45 100644
--- a/javax/naming/ldap/HasControls.java
+++ b/javax/naming/ldap/HasControls.java
@@ -46,5 +46,5 @@ import javax.naming.*;
 
 public interface HasControls
 {
-  public Control[] getControls() throws NamingException;
+  Control[] getControls() throws NamingException;
 }
diff --git a/javax/naming/ldap/LdapContext.java b/javax/naming/ldap/LdapContext.java
index c61639434..5eb34e272 100644
--- a/javax/naming/ldap/LdapContext.java
+++ b/javax/naming/ldap/LdapContext.java
@@ -47,16 +47,16 @@ import javax.naming.directory.*;
 
 public interface LdapContext extends DirContext
 {
-  public static final String CONTROL_FACTORIES = "java.naming.factory.control";
+  String CONTROL_FACTORIES = "java.naming.factory.control";
 
-  public ExtendedResponse extendedOperation(ExtendedRequest request)
+  ExtendedResponse extendedOperation(ExtendedRequest request)
     throws NamingException;
-  public LdapContext newInstance(Control[] requestControls)
+  LdapContext newInstance(Control[] requestControls)
     throws NamingException;
-  public void reconnect(Control[] connCtls) throws NamingException;
-  public Control[] getConnectControls() throws NamingException;
-  public void setRequestControls(Control[] requestControls)
+  void reconnect(Control[] connCtls) throws NamingException;
+  Control[] getConnectControls() throws NamingException;
+  void setRequestControls(Control[] requestControls)
     throws NamingException;
-  public Control[] getRequestControls() throws NamingException;
-  public Control[] getResponseControls() throws NamingException;
+  Control[] getRequestControls() throws NamingException;
+  Control[] getResponseControls() throws NamingException;
 }
diff --git a/javax/naming/ldap/UnsolicitedNotification.java b/javax/naming/ldap/UnsolicitedNotification.java
index b185d798a..15f89edcf 100644
--- a/javax/naming/ldap/UnsolicitedNotification.java
+++ b/javax/naming/ldap/UnsolicitedNotification.java
@@ -46,6 +46,6 @@ import javax.naming.*;
 
 public interface UnsolicitedNotification extends ExtendedResponse, HasControls
 {
-  public String[] getReferrals();
-  public NamingException getException();
+  String[] getReferrals();
+  NamingException getException();
 }
diff --git a/javax/naming/ldap/UnsolicitedNotificationListener.java b/javax/naming/ldap/UnsolicitedNotificationListener.java
index c01f54532..f5cd2eb1f 100644
--- a/javax/naming/ldap/UnsolicitedNotificationListener.java
+++ b/javax/naming/ldap/UnsolicitedNotificationListener.java
@@ -46,5 +46,5 @@ import javax.naming.event.*;
 
 public interface UnsolicitedNotificationListener extends NamingListener
 {
-  public void notificationReceived(UnsolicitedNotificationEvent evt);
+  void notificationReceived(UnsolicitedNotificationEvent evt);
 }
diff --git a/javax/naming/spi/DirObjectFactory.java b/javax/naming/spi/DirObjectFactory.java
index c80aeeb5c..3b7c76d70 100644
--- a/javax/naming/spi/DirObjectFactory.java
+++ b/javax/naming/spi/DirObjectFactory.java
@@ -48,7 +48,7 @@ import java.util.Hashtable;
 
 public interface DirObjectFactory extends ObjectFactory
 {
-  public Object getObjectInstance(Object obj, Name name, Context nameCtx,
+  Object getObjectInstance(Object obj, Name name, Context nameCtx,
   				  Hashtable environment, Attributes attrs)
 				  throws Exception;
 }
diff --git a/javax/naming/spi/DirStateFactory.java b/javax/naming/spi/DirStateFactory.java
index 03d6c8d1c..4ff39da5a 100644
--- a/javax/naming/spi/DirStateFactory.java
+++ b/javax/naming/spi/DirStateFactory.java
@@ -72,7 +72,7 @@ public interface DirStateFactory extends StateFactory
     }
   }
 
-  public DirStateFactory.Result getStateToBind(Object obj, Name name,
+  DirStateFactory.Result getStateToBind(Object obj, Name name,
   					       Context nameCtx,
 					       Hashtable environment,
 					       Attributes inAttrs)
diff --git a/javax/naming/spi/InitialContextFactory.java b/javax/naming/spi/InitialContextFactory.java
index 57a421ecf..299bfd672 100644
--- a/javax/naming/spi/InitialContextFactory.java
+++ b/javax/naming/spi/InitialContextFactory.java
@@ -44,5 +44,5 @@ import javax.naming.NamingException;
 
 public interface InitialContextFactory
 {
-  public Context getInitialContext (Hashtable environment) throws NamingException;
+  Context getInitialContext (Hashtable environment) throws NamingException;
 }
diff --git a/javax/naming/spi/InitialContextFactoryBuilder.java b/javax/naming/spi/InitialContextFactoryBuilder.java
index 39d7eeb0d..53a11aadb 100644
--- a/javax/naming/spi/InitialContextFactoryBuilder.java
+++ b/javax/naming/spi/InitialContextFactoryBuilder.java
@@ -43,5 +43,6 @@ import javax.naming.NamingException;
 
 public interface InitialContextFactoryBuilder
 {
-  public InitialContextFactory createInitialContextFactory (Hashtable environment) throws NamingException;
+  InitialContextFactory createInitialContextFactory (Hashtable environment)
+    throws NamingException;
 }
diff --git a/javax/naming/spi/ObjectFactory.java b/javax/naming/spi/ObjectFactory.java
index 5b291f04c..0861b4494 100644
--- a/javax/naming/spi/ObjectFactory.java
+++ b/javax/naming/spi/ObjectFactory.java
@@ -39,13 +39,12 @@ exception statement from your version. */
 package javax.naming.spi;
 
 import java.util.Hashtable;
-import javax.naming.*;
+import javax.naming.Context;
+import javax.naming.Name;
 
 public interface ObjectFactory
 {
-  public Object getObjectInstance (Object obj,
-				   Name name,
-				   Context nameCtx,
-				   Hashtable environment)
-       throws Exception;
+  Object getObjectInstance (Object obj, Name name, Context nameCtx,
+                            Hashtable environment)
+    throws Exception;
 }
diff --git a/javax/naming/spi/ObjectFactoryBuilder.java b/javax/naming/spi/ObjectFactoryBuilder.java
index 828f5c935..d6a5fc4e4 100644
--- a/javax/naming/spi/ObjectFactoryBuilder.java
+++ b/javax/naming/spi/ObjectFactoryBuilder.java
@@ -47,7 +47,7 @@ import java.util.Hashtable;
 
 public interface ObjectFactoryBuilder
 {
-  public ObjectFactory createObjectFactory(Object obj,
+  ObjectFactory createObjectFactory(Object obj,
   					   Hashtable environment)
 					   throws NamingException;
 }
diff --git a/javax/naming/spi/Resolver.java b/javax/naming/spi/Resolver.java
index 1cae847f1..3c66b18cd 100644
--- a/javax/naming/spi/Resolver.java
+++ b/javax/naming/spi/Resolver.java
@@ -46,8 +46,8 @@ import javax.naming.*;
 
 public interface Resolver
 {
-  public ResolveResult resolveToClass(Name name, Class contextType)
+  ResolveResult resolveToClass(Name name, Class contextType)
     throws NamingException;
-  public ResolveResult resolveToClass(String name, Class contextType)
+  ResolveResult resolveToClass(String name, Class contextType)
     throws NamingException;
 }
diff --git a/javax/naming/spi/StateFactory.java b/javax/naming/spi/StateFactory.java
index 3f41b551d..50ec77c08 100644
--- a/javax/naming/spi/StateFactory.java
+++ b/javax/naming/spi/StateFactory.java
@@ -47,6 +47,6 @@ import java.util.Hashtable;
 
 public interface StateFactory
 {
-  public Object getStateToBind(Object obj, Name name, Context nameCtx,
+  Object getStateToBind(Object obj, Name name, Context nameCtx,
   			       Hashtable environment) throws NamingException;
 }