This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: Removing redundant modifiers (Part 6)
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Sat, 11 Oct 2003 20:24:10 +0200
- Subject: FYI: Patch: Removing redundant modifiers (Part 6)
Hi list,
more modifiers.
Michael
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2240
diff -u -b -B -r1.2240 ChangeLog
--- ChangeLog 11 Oct 2003 18:18:22 -0000 1.2240
+++ ChangeLog 11 Oct 2003 18:19:26 -0000
@@ -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,
Index: java/beans/beancontext/BeanContext.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/beans/beancontext/BeanContext.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BeanContext.java
--- java/beans/beancontext/BeanContext.java 22 Jan 2002 22:40:12 -0000 1.2
+++ java/beans/beancontext/BeanContext.java 11 Oct 2003 18:19:26 -0000
@@ -183,7 +183,7 @@
* </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 @@
* @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 @@
* @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 @@
* @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);
}
Index: java/beans/beancontext/BeanContextChild.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/beans/beancontext/BeanContextChild.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BeanContextChild.java
--- java/beans/beancontext/BeanContextChild.java 17 Mar 2003 15:21:45 -0000 1.3
+++ java/beans/beancontext/BeanContextChild.java 11 Oct 2003 18:19:26 -0000
@@ -132,28 +132,28 @@
* <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 @@
* @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);
}
Index: java/beans/beancontext/BeanContextChildComponentProxy.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/beans/beancontext/BeanContextChildComponentProxy.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BeanContextChildComponentProxy.java
--- java/beans/beancontext/BeanContextChildComponentProxy.java 22 Jan 2002 22:40:12 -0000 1.2
+++ java/beans/beancontext/BeanContextChildComponentProxy.java 11 Oct 2003 18:19:26 -0000
@@ -56,5 +56,5 @@
* @return the <code>Component</code> associated with this
* <code>BeanContextChild</code>.
*/
- public Component getComponent();
+ Component getComponent();
}
Index: java/beans/beancontext/BeanContextChildSupport.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/beans/beancontext/BeanContextChildSupport.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 BeanContextChildSupport.java
--- java/beans/beancontext/BeanContextChildSupport.java 17 Mar 2003 15:21:45 -0000 1.4
+++ java/beans/beancontext/BeanContextChildSupport.java 11 Oct 2003 18:19:26 -0000
@@ -105,7 +105,7 @@
public BeanContextChildSupport()
{
this (null);
- };
+ }
/**
* Create a new <code>BeanContextChildSupport</code> with the specified peer.
Index: java/beans/beancontext/BeanContextContainerProxy.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/beans/beancontext/BeanContextContainerProxy.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BeanContextContainerProxy.java
--- java/beans/beancontext/BeanContextContainerProxy.java 22 Jan 2002 22:40:12 -0000 1.2
+++ java/beans/beancontext/BeanContextContainerProxy.java 11 Oct 2003 18:19:26 -0000
@@ -59,5 +59,5 @@
* @return the <code>Container</code> associated with this
* <code>BeanContext</code>.
*/
- public Container getContainer();
+ Container getContainer();
}
Index: java/beans/beancontext/BeanContextMembershipListener.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/beans/beancontext/BeanContextMembershipListener.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BeanContextMembershipListener.java
--- java/beans/beancontext/BeanContextMembershipListener.java 22 Jan 2002 22:40:12 -0000 1.2
+++ java/beans/beancontext/BeanContextMembershipListener.java 11 Oct 2003 18:19:26 -0000
@@ -57,7 +57,7 @@
* @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 @@
* @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);
}
Index: java/beans/beancontext/BeanContextProxy.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/beans/beancontext/BeanContextProxy.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BeanContextProxy.java
--- java/beans/beancontext/BeanContextProxy.java 22 Jan 2002 22:40:12 -0000 1.2
+++ java/beans/beancontext/BeanContextProxy.java 11 Oct 2003 18:19:26 -0000
@@ -61,5 +61,5 @@
* @return the <code>BeanContextChild</code> associated with this
* <code>Object</code>.
*/
- public BeanContextChild getBeanContextProxy();
+ BeanContextChild getBeanContextProxy();
}
Index: java/beans/beancontext/BeanContextServiceProvider.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/beans/beancontext/BeanContextServiceProvider.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BeanContextServiceProvider.java
--- java/beans/beancontext/BeanContextServiceProvider.java 22 Jan 2002 22:40:12 -0000 1.2
+++ java/beans/beancontext/BeanContextServiceProvider.java 11 Oct 2003 18:19:26 -0000
@@ -89,7 +89,7 @@
* <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 @@
* @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 @@
* 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);
}
Index: java/beans/beancontext/BeanContextServiceProviderBeanInfo.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BeanContextServiceProviderBeanInfo.java
--- java/beans/beancontext/BeanContextServiceProviderBeanInfo.java 22 Jan 2002 22:40:12 -0000 1.2
+++ java/beans/beancontext/BeanContextServiceProviderBeanInfo.java 11 Oct 2003 18:19:26 -0000
@@ -56,5 +56,5 @@
* 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();
}
Index: java/beans/beancontext/BeanContextServiceRevokedListener.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/beans/beancontext/BeanContextServiceRevokedListener.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BeanContextServiceRevokedListener.java
--- java/beans/beancontext/BeanContextServiceRevokedListener.java 22 Jan 2002 22:40:12 -0000 1.2
+++ java/beans/beancontext/BeanContextServiceRevokedListener.java 11 Oct 2003 18:19:26 -0000
@@ -58,5 +58,5 @@
* @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);
}
Index: java/beans/beancontext/BeanContextServices.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/beans/beancontext/BeanContextServices.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BeanContextServices.java
--- java/beans/beancontext/BeanContextServices.java 18 Mar 2003 18:16:54 -0000 1.3
+++ java/beans/beancontext/BeanContextServices.java 11 Oct 2003 18:19:26 -0000
@@ -63,7 +63,7 @@
* @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 @@
* @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 @@
* @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 @@
* <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 @@
* @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 @@
* @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 @@
* @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 @@
* <code>getService()</code>.
* @param listener the listener to add.
*/
- public void
- removeBeanContextServicesListener (BeanContextServicesListener listener);
+ void removeBeanContextServicesListener (BeanContextServicesListener listener);
}
Index: java/beans/beancontext/BeanContextServicesListener.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/beans/beancontext/BeanContextServicesListener.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BeanContextServicesListener.java
--- java/beans/beancontext/BeanContextServicesListener.java 22 Jan 2002 22:40:12 -0000 1.2
+++ java/beans/beancontext/BeanContextServicesListener.java 11 Oct 2003 18:19:26 -0000
@@ -52,5 +52,5 @@
* @param event the service revoked event, with useful information
* about the new service.
*/
- public void serviceAvailable(BeanContextServiceAvailableEvent event);
+ void serviceAvailable(BeanContextServiceAvailableEvent event);
}