5 files changed, 25 insertions, 20 deletions
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);
 }