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

	* java/beans/beancontext/BeanContext.java,
	java/beans/beancontext/BeanContextChild.java,
	java/beans/beancontext/BeanContextChildComponentProxy.java,
	java/beans/beancontext/BeanContextChildSupport.java,
	java/beans/beancontext/BeanContextContainerProxy.java,
	java/beans/beancontext/BeanContextMembershipListener.java,
	java/beans/beancontext/BeanContextProxy.java,
	java/beans/beancontext/BeanContextServiceProvider.java,
	java/beans/beancontext/BeanContextServiceProviderBeanInfo.java,
	java/beans/beancontext/BeanContextServiceRevokedListener.java,
	java/beans/beancontext/BeanContextServices.java,
	java/beans/beancontext/BeanContextServicesListener.java:
	Removed redundant modifiers.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3be2c9c..a3b69e2 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,21 @@
 2003-10-11  Michael Koch  <konqueror@gmx.de>
 
+       * java/beans/beancontext/BeanContext.java,
+       java/beans/beancontext/BeanContextChild.java,
+       java/beans/beancontext/BeanContextChildComponentProxy.java,
+       java/beans/beancontext/BeanContextChildSupport.java,
+       java/beans/beancontext/BeanContextContainerProxy.java,
+       java/beans/beancontext/BeanContextMembershipListener.java,
+       java/beans/beancontext/BeanContextProxy.java,
+       java/beans/beancontext/BeanContextServiceProvider.java,
+       java/beans/beancontext/BeanContextServiceProviderBeanInfo.java,
+       java/beans/beancontext/BeanContextServiceRevokedListener.java,
+       java/beans/beancontext/BeanContextServices.java,
+       java/beans/beancontext/BeanContextServicesListener.java:
+       Removed redundant modifiers.
+
+2003-10-11  Michael Koch  <konqueror@gmx.de>
+
        * java/beans/AppletInitializer.java,
        java/beans/BeanInfo.java,
        java/beans/Customizer.java,

diff --git a/libjava/java/beans/beancontext/BeanContext.java b/libjava/java/beans/beancontext/BeanContext.java
index be71eb4..c996013 100644 (file)
--- a/libjava/java/beans/beancontext/BeanContext.java
+++ b/libjava/java/beans/beancontext/BeanContext.java
@@ -183,7 +183,7 @@ public interface BeanContext
         * </UL>
         * @fixme fill in the rest of the methods which use the global lock.
         */
-       public static final Object globalHierarchyLock = new Object();
+       Object globalHierarchyLock = new Object();
 
        /** 
         * Instantiate a Bean using this Bean's <code>ClassLoader</code>
@@ -204,7 +204,7 @@ public interface BeanContext
         * @exception ClassNotFoundException if a serialized Bean's class
         *            is not found.
         */
-       public Object instantiateChild(String beanName)
+       Object instantiateChild(String beanName)
                         throws IOException,
                                ClassNotFoundException;
 
@@ -230,7 +230,7 @@ public interface BeanContext
         * @param requestor a reference to the child requesting the resource.
         * @see java.lang.ClassLoader#getResource(java.lang.String)
         */
-       public URL getResource(String resourceName, BeanContextChild requestor);
+       URL getResource(String resourceName, BeanContextChild requestor);
 
        /**
         * Get a resource as a stream.  The <code>BeanContext</code> will
@@ -254,19 +254,19 @@ public interface BeanContext
         * @param requestor a reference to the child requesting the resource.
         * @see java.lang.ClassLoader#getResourceAsStream(java.lang.String)
         */
-       public InputStream getResourceAsStream(String resourceName, BeanContextChild requestor);
+       InputStream getResourceAsStream(String resourceName, BeanContextChild requestor);
 
        /**
         * Add a listener on changes to the membership of this
         * <code>BeanContext</code> object.
         * @param listener the listener to add.
         */
-       public void addBeanContextMembershipListener(BeanContextMembershipListener listener);
+       void addBeanContextMembershipListener(BeanContextMembershipListener listener);
 
        /**
         * Remove a listener on changes to the membership of this
         * <code>BeanContext</code> object.
         * @param listener the listener to remove.
         */
-       public void removeBeanContextMembershipListener(BeanContextMembershipListener listener);
+       void removeBeanContextMembershipListener(BeanContextMembershipListener listener);
 }

diff --git a/libjava/java/beans/beancontext/BeanContextChild.java b/libjava/java/beans/beancontext/BeanContextChild.java
index ef2b7b3..4421273 100644 (file)
--- a/libjava/java/beans/beancontext/BeanContextChild.java
+++ b/libjava/java/beans/beancontext/BeanContextChild.java
@@ -132,28 +132,28 @@ public interface BeanContextChild {
         *            <code>BeanContextChild</code> implementor does not
         *            wish to have its parent changed.
         */
-       public void setBeanContext(BeanContext parent)
+       void setBeanContext(BeanContext parent)
                throws PropertyVetoException;
 
        /**
         * Get the parent <code>BeanContext</code>.
         * @return the parent <code>BeanContext</code>.
         */
-       public BeanContext getBeanContext();
+       BeanContext getBeanContext();
 
        /**
         * Add a listener that will be notified when a specific property changes.
         * @param prop the name of the property to listen on
         * @param listener the listener to listen on the property.
         */
-       public void addPropertyChangeListener(String prop, PropertyChangeListener listener);
+       void addPropertyChangeListener(String prop, PropertyChangeListener listener);
 
        /**
         * Remove a listener to a certain property.
         * @param prop the name of the property being listened on
         * @param listener the listener listening on the property.
         */
-       public void removePropertyChangeListener(String prop, PropertyChangeListener listener);
+       void removePropertyChangeListener(String prop, PropertyChangeListener listener);
 
        /**
         * Add a listener that will be notified when a specific property
@@ -163,12 +163,12 @@ public interface BeanContextChild {
         * @param prop the name of the property to listen on
         * @param listener the listener to listen on the property.
         */
-       public void addVetoableChangeListener(String prop, VetoableChangeListener listener);
+       void addVetoableChangeListener(String prop, VetoableChangeListener listener);
 
        /**
         * Remove a listener to a certain property.
         * @param prop the name of the property being listened on
         * @param listener the listener listening on the property.
         */
-       public void removeVetoableChangeListener(String prop, VetoableChangeListener listener);
+       void removeVetoableChangeListener(String prop, VetoableChangeListener listener);
 }

diff --git a/libjava/java/beans/beancontext/BeanContextChildComponentProxy.java b/libjava/java/beans/beancontext/BeanContextChildComponentProxy.java
index b68ab13..27c8bac 100644 (file)
--- a/libjava/java/beans/beancontext/BeanContextChildComponentProxy.java
+++ b/libjava/java/beans/beancontext/BeanContextChildComponentProxy.java
@@ -56,5 +56,5 @@ public interface BeanContextChildComponentProxy {
         * @return the <code>Component</code> associated with this
         * <code>BeanContextChild</code>.
         */
-       public Component getComponent();
+       Component getComponent();
 }

diff --git a/libjava/java/beans/beancontext/BeanContextChildSupport.java b/libjava/java/beans/beancontext/BeanContextChildSupport.java
index ea48cf2..8cc1750 100644 (file)
--- a/libjava/java/beans/beancontext/BeanContextChildSupport.java
+++ b/libjava/java/beans/beancontext/BeanContextChildSupport.java
@@ -105,7 +105,7 @@ public class BeanContextChildSupport
        public BeanContextChildSupport()
   {
                this (null);
-       };
+       }
 
        /**
         * Create a new <code>BeanContextChildSupport</code> with the specified peer.

diff --git a/libjava/java/beans/beancontext/BeanContextContainerProxy.java b/libjava/java/beans/beancontext/BeanContextContainerProxy.java
index db8291f..b582e68 100644 (file)
--- a/libjava/java/beans/beancontext/BeanContextContainerProxy.java
+++ b/libjava/java/beans/beancontext/BeanContextContainerProxy.java
@@ -59,5 +59,5 @@ public interface BeanContextContainerProxy {
         * @return the <code>Container</code> associated with this
         * <code>BeanContext</code>.
         */
-       public Container getContainer();
+       Container getContainer();
 }

diff --git a/libjava/java/beans/beancontext/BeanContextMembershipListener.java b/libjava/java/beans/beancontext/BeanContextMembershipListener.java
index 06615de..39b1e07 100644 (file)
--- a/libjava/java/beans/beancontext/BeanContextMembershipListener.java
+++ b/libjava/java/beans/beancontext/BeanContextMembershipListener.java
@@ -57,7 +57,7 @@ public interface BeanContextMembershipListener extends EventListener {
         * @param event the event, including which children were added.
         * @see java.beans.beancontext.BeanContext#add(java.lang.Object)
         */
-       public void childrenAdded(BeanContextMembershipEvent event);
+       void childrenAdded(BeanContextMembershipEvent event);
 
        /**
         * When beans are removed from a <code>BeanContext</code>,
@@ -66,5 +66,5 @@ public interface BeanContextMembershipListener extends EventListener {
         * @param event the event, including which children were removed.
         * @see java.beans.beancontext.BeanContext#remove(java.lang.Object)
         */
-       public void childrenRemoved(BeanContextMembershipEvent event);
+       void childrenRemoved(BeanContextMembershipEvent event);
 }

diff --git a/libjava/java/beans/beancontext/BeanContextProxy.java b/libjava/java/beans/beancontext/BeanContextProxy.java
index 4771f80..78061f5 100644 (file)
--- a/libjava/java/beans/beancontext/BeanContextProxy.java
+++ b/libjava/java/beans/beancontext/BeanContextProxy.java
@@ -61,5 +61,5 @@ public interface BeanContextProxy {
         * @return the <code>BeanContextChild</code> associated with this
         * <code>Object</code>.
         */
-       public BeanContextChild getBeanContextProxy();
+       BeanContextChild getBeanContextProxy();
 }

diff --git a/libjava/java/beans/beancontext/BeanContextServiceProvider.java b/libjava/java/beans/beancontext/BeanContextServiceProvider.java
index ef2c944..de9c7de 100644 (file)
--- a/libjava/java/beans/beancontext/BeanContextServiceProvider.java
+++ b/libjava/java/beans/beancontext/BeanContextServiceProvider.java
@@ -89,7 +89,7 @@ public interface BeanContextServiceProvider {
         *        <code>null</code>.
         * @see java.beans.beancontext.BeanContextServices#getService(java.beans.beancontext.BeanContextChild,java.lang.Object,java.lang.Class,java.lang.Object,java.beans.beancontext.BeanContextServiceRevokedListener)
         */
-       public Object getService(BeanContextServices services, Object requestor, Class serviceClass, Object serviceSelector);
+       Object getService(BeanContextServices services, Object requestor, Class serviceClass, Object serviceSelector);
 
        /**
         * Release the service.
@@ -109,7 +109,7 @@ public interface BeanContextServiceProvider {
         * @param service the service to relinquish
         * @see java.beans.beancontext.BeanContextServices#releaseService(java.beans.beancontext.BeanContextChild,java.lang.Object,java.lang.Object)
         */
-       public void releaseService(BeanContextServices services, Object requestor, Object service);
+       void releaseService(BeanContextServices services, Object requestor, Object service);
 
        /**
         * Get a list of valid service selectors for the specified service class.
@@ -136,5 +136,5 @@ public interface BeanContextServiceProvider {
         *         class, or <code>null</code>.
         * @see java.beans.beancontext.BeanContextServices#getCurrentServiceSelectors(java.lang.Class)
         */
-       public Iterator getCurrentServiceSelectors(BeanContextServices services, Class serviceClass);
+       Iterator getCurrentServiceSelectors(BeanContextServices services, Class serviceClass);
 }

diff --git a/libjava/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java b/libjava/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java
index 50b6bac..2c5a2c4 100644 (file)
--- a/libjava/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java
+++ b/libjava/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java
@@ -56,5 +56,5 @@ public interface BeanContextServiceProviderBeanInfo extends BeanInfo {
         * Get <code>BeanInfo</code>s for all of the service classes of this <code>BeanInfoServiceProvider</code>.
         * @return <code>BeanInfo</code>s for all provided service classes.
         */
-       public BeanInfo[] getServicesBeanInfo();
+       BeanInfo[] getServicesBeanInfo();
 }

diff --git a/libjava/java/beans/beancontext/BeanContextServiceRevokedListener.java b/libjava/java/beans/beancontext/BeanContextServiceRevokedListener.java
index 166a1e1..c3fcb3e 100644 (file)
--- a/libjava/java/beans/beancontext/BeanContextServiceRevokedListener.java
+++ b/libjava/java/beans/beancontext/BeanContextServiceRevokedListener.java
@@ -58,5 +58,5 @@ public interface BeanContextServiceRevokedListener extends EventListener {
         * @param event the service revoked event.
         * @see java.beans.beancontext.BeanContextServices#revokeService(java.lang.Class,java.beans.beancontext.BeanContextServiceProvider,boolean)
         */
-       public void serviceRevoked(BeanContextServiceRevokedEvent event);
+       void serviceRevoked(BeanContextServiceRevokedEvent event);
 }

diff --git a/libjava/java/beans/beancontext/BeanContextServices.java b/libjava/java/beans/beancontext/BeanContextServices.java
index 89906aa..6e76b00 100644 (file)
--- a/libjava/java/beans/beancontext/BeanContextServices.java
+++ b/libjava/java/beans/beancontext/BeanContextServices.java
@@ -63,7 +63,7 @@ public interface BeanContextServices
    * @param provider the factory that will actually provide the service.
    * @return whether the service was added or not.
    */
-  public boolean addService (Class serviceClass,
+  boolean addService (Class serviceClass,
                              BeanContextServiceProvider provider);
 
   /**
@@ -83,7 +83,7 @@ public interface BeanContextServices
    * @param revokeNow whether to release all current references to
    *        the service.
    */
-  public void revokeService (Class serviceClass,
+  void revokeService (Class serviceClass,
                              BeanContextServiceProvider provider,
                              boolean revokeNow);
 
@@ -102,7 +102,7 @@ public interface BeanContextServices
    * @param service the service to relinquish
    * @see #getService(java.beans.beancontext.BeanContextChild,java.lang.Object,java.lang.Class,java.lang.Object,java.beans.beancontext.BeanContextServiceRevokedListener)
    */
-  public void releaseService (BeanContextChild requestorChild, Object requestor,
+  void releaseService (BeanContextChild requestorChild, Object requestor,
                               Object service);
 
   /**
@@ -152,7 +152,7 @@ public interface BeanContextServices
    *        <code>instanceof</code> serviceClass is true), or
    *        <code>null</code>.
    */
-  public Object getService (BeanContextChild requestorChild, Object requestor,
+  Object getService (BeanContextChild requestorChild, Object requestor,
                             Class serviceClass, Object serviceSelector,
                             BeanContextServiceRevokedListener listener)
     throws TooManyListenersException;
@@ -167,7 +167,7 @@ public interface BeanContextServices
    * @return a list of all service classes supported.
    * @see java.beans.beancontext.BeanContext#globalHierarchyLock
    */
-  public Iterator getCurrentServiceClasses ();
+  Iterator getCurrentServiceClasses ();
 
   /**
    * Get a list of valid service selectors for the specified service class.
@@ -187,7 +187,7 @@ public interface BeanContextServices
    * @return a list of valid service selectors for the service
    *         class, or <code>null</code>.
    */
-  public Iterator getCurrentServiceSelectors (Class serviceClass);
+  Iterator getCurrentServiceSelectors (Class serviceClass);
 
   /**
    * Tell whether the specified service class is available.
@@ -197,14 +197,13 @@ public interface BeanContextServices
    * @param serviceClass the service class to check on.
    * @return whether the specified service class is available.
    */
-  public boolean hasService (Class serviceClass);
+  boolean hasService (Class serviceClass);
 
   /**
    * Add a listener on all adds and removes of services.
    * @param listener the listener to add.
    */
-  public void
-  addBeanContextServicesListener (BeanContextServicesListener listener);
+  void addBeanContextServicesListener (BeanContextServicesListener listener);
 
   /**
    * Remove a listener on all adds and removes of services.
@@ -213,6 +212,5 @@ public interface BeanContextServices
    *           <code>getService()</code>.
    * @param listener the listener to add.
    */
-  public void
-  removeBeanContextServicesListener (BeanContextServicesListener listener);
+  void removeBeanContextServicesListener (BeanContextServicesListener listener);
 }

diff --git a/libjava/java/beans/beancontext/BeanContextServicesListener.java b/libjava/java/beans/beancontext/BeanContextServicesListener.java
index f274893..5fd27f7 100644 (file)
--- a/libjava/java/beans/beancontext/BeanContextServicesListener.java
+++ b/libjava/java/beans/beancontext/BeanContextServicesListener.java
@@ -52,5 +52,5 @@ public interface BeanContextServicesListener extends BeanContextServiceRevokedLi
         * @param event the service revoked event, with useful information
         *        about the new service.
         */
-       public void serviceAvailable(BeanContextServiceAvailableEvent event);
+       void serviceAvailable(BeanContextServiceAvailableEvent event);
 }