This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: Removing redundant modifiers (Part 5)
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Sat, 11 Oct 2003 20:22:49 +0200
- Subject: FYI: Patch: Removing redundant modifiers (Part 5)
Hi list,
more modifiers.
Michael
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2239
diff -u -b -B -r1.2239 ChangeLog
--- ChangeLog 11 Oct 2003 18:16:31 -0000 1.2239
+++ ChangeLog 11 Oct 2003 18:17:45 -0000
@@ -1,5 +1,15 @@
2003-10-11 Michael Koch <konqueror@gmx.de>
+ * java/beans/AppletInitializer.java,
+ java/beans/BeanInfo.java,
+ java/beans/Customizer.java,
+ java/beans/DesignMode.java,
+ java/beans/PropertyEditor.java,
+ java/beans/Visibility.java:
+ Removed redundant modifiers.
+
+2003-10-11 Michael Koch <konqueror@gmx.de>
+
* java/awt/print/Pageable.java,
* java/awt/print/Printable.java,
java/awt/print/PrinterGraphics.java:
Index: java/beans/AppletInitializer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/beans/AppletInitializer.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 AppletInitializer.java
--- java/beans/AppletInitializer.java 22 Jan 2002 22:40:11 -0000 1.2
+++ java/beans/AppletInitializer.java 11 Oct 2003 18:17:45 -0000
@@ -51,11 +51,11 @@
public interface AppletInitializer
{
/** Activate the applet. */
- public void activate (Applet applet);
+ void activate (Applet applet);
/** This method will be called by <code>Beans.instantiate()</code>
* to associated the new Applet with its AppletContext, AppletStub,
* and Container.
*/
- public void initialize (Applet applet, BeanContext context);
+ void initialize (Applet applet, BeanContext context);
}
Index: java/beans/BeanInfo.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/beans/BeanInfo.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BeanInfo.java
--- java/beans/BeanInfo.java 7 Nov 2002 08:45:19 -0000 1.3
+++ java/beans/BeanInfo.java 11 Oct 2003 18:17:45 -0000
@@ -74,27 +74,27 @@
public interface BeanInfo {
/** Use this as a parameter for the getIcon() command to retrieve a certain type of icon. **/
- public static final int ICON_COLOR_16x16 = 1;
+ int ICON_COLOR_16x16 = 1;
/** Use this as a parameter for the getIcon() command to retrieve a certain type of icon. **/
- public static final int ICON_COLOR_32x32 = 2;
+ int ICON_COLOR_32x32 = 2;
/** Use this as a parameter for the getIcon() command to retrieve a certain type of icon. **/
- public static final int ICON_MONO_16x16 = 3;
+ int ICON_MONO_16x16 = 3;
/** Use this as a parameter for the getIcon() command to retrieve a certain type of icon. **/
- public static final int ICON_MONO_32x32 = 4;
+ int ICON_MONO_32x32 = 4;
/** Get the general description of this Bean type.
** @return the BeanDescriptor for the Bean, or null if
** the BeanDescriptor should be obtained by
** Introspection.
**/
- public abstract BeanDescriptor getBeanDescriptor();
+ BeanDescriptor getBeanDescriptor();
/** Get the events this Bean type fires.
** @return the EventDescriptors representing events this
** Bean fires. Returns <CODE>null</CODE> if the
** events are to be acquired by Introspection.
**/
- public abstract EventSetDescriptor[] getEventSetDescriptors();
+ EventSetDescriptor[] getEventSetDescriptors();
/** Get the "default" event, basically the one a RAD tool
** user is most likely to select.
@@ -102,7 +102,7 @@
** that the user is most likely to use. Returns
** <CODE>-1</CODE> if there is no default event.
**/
- public abstract int getDefaultEventIndex();
+ int getDefaultEventIndex();
/** Get the properties (get/set method pairs) this Bean
** type supports.
@@ -111,7 +111,7 @@
** Returns <CODE>null</CODE> if the properties
** are to be obtained by Introspection.
**/
- public abstract PropertyDescriptor[] getPropertyDescriptors();
+ PropertyDescriptor[] getPropertyDescriptors();
/** Get the "default" property, basically the one a RAD
** tool user is most likely to select.
@@ -119,7 +119,7 @@
** that the user is most likely to use. Returns
** <CODE>-1</CODE> if there is no default event.
**/
- public abstract int getDefaultPropertyIndex();
+ int getDefaultPropertyIndex();
/** Get the methods this Bean type supports.
** @return the MethodDescriptors representing the
@@ -127,7 +127,7 @@
** <CODE>null</CODE> if the methods are to be
** obtained by Introspection.
**/
- public abstract MethodDescriptor[] getMethodDescriptors();
+ MethodDescriptor[] getMethodDescriptors();
/** Get additional BeanInfos representing this Bean.
** In this version of JavaBeans, this method is used so
@@ -156,7 +156,7 @@
** <CODE>null</CODE> may be returned (see Spec
** Note, above).
**/
- public abstract BeanInfo[] getAdditionalBeanInfo();
+ BeanInfo[] getAdditionalBeanInfo();
/** Get a visual icon for this Bean.
** A Bean does not have to support icons, and if it does
@@ -177,5 +177,5 @@
** @return the icon, or null if that type of icon is
** unsupported by this Bean.
**/
- public abstract java.awt.Image getIcon(int iconType);
+ java.awt.Image getIcon(int iconType);
}
Index: java/beans/Customizer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/beans/Customizer.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 Customizer.java
--- java/beans/Customizer.java 22 Jan 2002 22:40:11 -0000 1.2
+++ java/beans/Customizer.java 11 Oct 2003 18:17:45 -0000
@@ -72,15 +72,15 @@
** Customizer.
** @param bean the Bean to customize.
**/
- public abstract void setObject(Object bean);
+ void setObject(Object bean);
/** Add a PropertyChangeListener.
** @param l the PropertyChangeListener to add.
**/
- public abstract void addPropertyChangeListener(PropertyChangeListener l);
+ void addPropertyChangeListener(PropertyChangeListener l);
/** Remove a PropertyChangeListener.
** @param l the PropertyChangeListener to remove.
**/
- public abstract void removePropertyChangeListener(PropertyChangeListener l);
+ void removePropertyChangeListener(PropertyChangeListener l);
}
Index: java/beans/DesignMode.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/beans/DesignMode.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DesignMode.java
--- java/beans/DesignMode.java 22 Jan 2002 22:40:11 -0000 1.2
+++ java/beans/DesignMode.java 11 Oct 2003 18:17:45 -0000
@@ -54,7 +54,7 @@
* Use this name when firing <code>PropertyChangeEvent</code>s from your Bean.
* @fixme Check whether PROPERTYNAME is set to same value as Sun.
*/
- public static final String PROPERTYNAME = "designTime";
+ String PROPERTYNAME = "designTime";
/**
* The environment will call this method on your
@@ -82,12 +82,12 @@
* @see java.beans.beancontext.BeanContext
* @see #PROPERTYNAME
*/
- public void setDesignTime(boolean designTime);
+ void setDesignTime(boolean designTime);
/**
* This method should tell whether it is design time or runtime.
* @return <code>true</code> if design time, <code>false</code> if
* runtime.
*/
- public boolean isDesignTime();
+ boolean isDesignTime();
}
Index: java/beans/PropertyEditor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/beans/PropertyEditor.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 PropertyEditor.java
--- java/beans/PropertyEditor.java 22 Jan 2002 22:40:11 -0000 1.2
+++ java/beans/PropertyEditor.java 11 Oct 2003 18:17:45 -0000
@@ -114,14 +114,14 @@
** wrapper type.
** @param value the value to set this property to.
**/
- public abstract void setValue(Object value);
+ void setValue(Object value);
/** Accessor method to get the current value the PropertyEditor is working with.
** If the property type is native, it will be wrapped in the appropriate
** wrapper type.
** @return the current value of the PropertyEditor.
**/
- public abstract Object getValue();
+ Object getValue();
/** Set the value of this property using a String.
@@ -130,7 +130,7 @@
** @param text the text to set it to.
** @exception IllegalArgumentException if the String is in the wrong format or setAsText() is not supported.
**/
- public abstract void setAsText(String text) throws IllegalArgumentException;
+ void setAsText(String text) throws IllegalArgumentException;
/** Get the value of this property in String format.
** Many times this can simply use Object.toString().<P>
@@ -139,7 +139,7 @@
** getAsText() should be able to go into setAsText().
** @return the value of this property in String format.
**/
- public abstract String getAsText();
+ String getAsText();
/** Get a list of possible Strings which this property type can have.
** The value of these will be used by the RAD tool to construct some sort
@@ -149,13 +149,13 @@
** must check the value in setAsText() anyway.
** @return the list of possible String values for this property type.
**/
- public abstract String[] getTags();
+ String[] getTags();
/** The RAD tool calls this to find out whether the PropertyEditor can paint itself.
** @return true if it can paint itself graphically, false if it cannot.
**/
- public abstract boolean isPaintable();
+ boolean isPaintable();
/** The RAD tool calls this to paint the actual value of the property.
** The Graphics context will have the same current font, color, etc. as the
@@ -165,13 +165,13 @@
** @param g the Graphics context to paint on
** @param bounds the rectangle you have reserved to work in
**/
- public abstract void paintValue(java.awt.Graphics g, java.awt.Rectangle bounds);
+ void paintValue(java.awt.Graphics g, java.awt.Rectangle bounds);
/** The RAD tool calls this to find out whether the PropertyEditor supports a custom component to edit and display itself.
** @return true if getCustomEditor() will return a component, false if not.
**/
- public abstract boolean supportsCustomEditor();
+ boolean supportsCustomEditor();
/** The RAD tool calls this to grab the component that can edit this type.
** The component may be painted anywhere the RAD tool wants to paint it--
@@ -180,18 +180,18 @@
** change to the value is made, fire a PropertyChangeEvent to the source.<P>
** @return the custom editor for this property type.
**/
- public abstract java.awt.Component getCustomEditor();
+ java.awt.Component getCustomEditor();
/** Adds a property change listener to this PropertyEditor.
** @param listener the listener to add
**/
- public abstract void addPropertyChangeListener(PropertyChangeListener listener);
+ void addPropertyChangeListener(PropertyChangeListener listener);
/** Removes a property change listener from this PropertyEditor.
** @param listener the listener to remove
**/
- public abstract void removePropertyChangeListener(PropertyChangeListener listener);
+ void removePropertyChangeListener(PropertyChangeListener listener);
/** Get a Java language-specific String which could be used to create an Object
** of the specified type. Every PropertyEditor must support this.<P>
@@ -205,5 +205,5 @@
** </OL>
** @return the initialization string for this object in Java.
**/
- public abstract String getJavaInitializationString();
+ String getJavaInitializationString();
}
Index: java/beans/Visibility.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/beans/Visibility.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 Visibility.java
--- java/beans/Visibility.java 22 Jan 2002 22:40:11 -0000 1.2
+++ java/beans/Visibility.java 11 Oct 2003 18:17:45 -0000
@@ -58,21 +58,21 @@
* Tells whether the Bean can run without a GUI or not.
* @return false if Bean can run without a GUI, else true.
*/
- public abstract boolean needsGui();
+ boolean needsGui();
/**
* Tells whether Bean is trying not to use the GUI.
* If needsGui() is true, this method should always return false.
* @return true if definitely not using GUI, otherwise false.
*/
- public abstract boolean avoidingGui();
+ boolean avoidingGui();
/**
* Tells the Bean not to use GUI methods.
* If needsGUI() is false, then after this method is called,
* avoidingGui() should return true.
*/
- public abstract void dontUseGui();
+ void dontUseGui();
/**
* Tells the Bean it may use the GUI.
@@ -81,5 +81,5 @@
* false, avoidingGui() may return true or false after this method
* is called.
*/
- public abstract void okToUseGui();
+ void okToUseGui();
}