This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: javax.swing - random improvements
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Sun, 12 Sep 2004 22:36:08 +0200
- Subject: Patch: javax.swing - random improvements
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I just commited the attached patch to submit random improvements all
over javax.swing.
Michael
2004-09-12 Michael Koch <konqueror@gmx.de>
* javax/swing/JMenu.java
(getMenuListeners): New method.
(fireMenuSelected): Simplified.
* javax/swing/JRootPane.java
(NONE): New static field.
(FRAME): Likewise.
(PLAIN_DIALOG): Likewise.
(INFORMATION_DIALOG): Likewise.
(ERROR_DIALOG): Likewise.
(COLOR_CHOOSER_DIALOG): Likewise.
(FILE_CHOOSER_DIALOG): Likewise.
(QUESTION_DIALOG): Likewise.
(WARNING_DIALOG): Likewise.
(defaultButton): New field.
(getDefaultButton): New method.
(setDefaultButton): Likewise.
* javax/swing/JScrollPane.java
(getUI): New method.
(setUI): Likewise.
* javax/swing/JTable.java
(getUI): Javadoc added.
(setUI): New method.
* javax/swing/JViewport.java
(getUI): New method.
(setUI): Likewise.
* javax/swing/UIDefaults.java
(removePropertyChangeListener): Made public.
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFBRLM8WSOgCCdjSDsRAqHdAJ9BSSwZW6IlSoggILVIG/XpROMcmgCdFEl3
QxzxZPEcsfyBHPDg+pZMT4c=
=4UIi
-----END PGP SIGNATURE-----
Index: javax/swing/JMenu.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JMenu.java,v
retrieving revision 1.3.8.12
diff -u -r1.3.8.12 JMenu.java
--- javax/swing/JMenu.java 3 Sep 2004 23:27:40 -0000 1.3.8.12
+++ javax/swing/JMenu.java 12 Sep 2004 19:58:04 -0000
@@ -645,16 +645,28 @@
}
/**
+ * Returns all registered <code>MenuListener</code> objects.
+ *
+ * @return an array of listeners
+ *
+ * @since 1.4
+ */
+ public MenuListener[] getMenuListeners()
+ {
+ return (MenuListener[]) listenerList.getListeners(MenuListener.class);
+ }
+
+ /**
* This method fires MenuEvents to all menu's MenuListeners. In this case
* menuSelected() method of MenuListeners is called to indicated that the menu
* was selected.
*/
protected void fireMenuSelected()
{
- EventListener[] ll = listenerList.getListeners(MenuListener.class);
+ MenuListener[] listeners = getMenuListeners();
- for (int i = 0; i < ll.length; i++)
- ((MenuListener) ll[i]).menuSelected(menuEvent);
+ for (int index = 0; index < listeners.length; ++index)
+ listeners[index].menuSelected(menuEvent);
}
/**
Index: javax/swing/JRootPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JRootPane.java,v
retrieving revision 1.4.2.10
diff -u -r1.4.2.10 JRootPane.java
--- javax/swing/JRootPane.java 20 Jul 2004 19:36:47 -0000 1.4.2.10
+++ javax/swing/JRootPane.java 12 Sep 2004 19:58:04 -0000
@@ -307,6 +307,16 @@
/** DOCUMENT ME! */
private static final long serialVersionUID = 8690748000348575668L;
+ public static final int NONE = 0;
+ public static final int FRAME = 1;
+ public static final int PLAIN_DIALOG = 2;
+ public static final int INFORMATION_DIALOG = 3;
+ public static final int ERROR_DIALOG = 4;
+ public static final int COLOR_CHOOSER_DIALOG = 5;
+ public static final int FILE_CHOOSER_DIALOG = 6;
+ public static final int QUESTION_DIALOG = 7;
+ public static final int WARNING_DIALOG = 8;
+
/** DOCUMENT ME! */
protected Component glassPane;
@@ -319,6 +329,8 @@
/** DOCUMENT ME! */
protected Container contentPane;
+ protected JButton defaultButton;
+
/**
* DOCUMENT ME!
*
@@ -539,4 +551,19 @@
{
return "RootPaneUI";
}
+
+ public JButton getDefaultButton()
+ {
+ return defaultButton;
+ }
+
+ public void setDefaultButton(JButton newButton)
+ {
+ if (defaultButton == newButton)
+ return;
+
+ JButton oldButton = defaultButton;
+ defaultButton = newButton;
+ firePropertyChange("defaultButton", oldButton, newButton);
+ }
}
Index: javax/swing/JScrollPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JScrollPane.java,v
retrieving revision 1.3.2.7
diff -u -r1.3.2.7 JScrollPane.java
--- javax/swing/JScrollPane.java 17 Aug 2004 23:26:10 -0000 1.3.2.7
+++ javax/swing/JScrollPane.java 12 Sep 2004 19:58:04 -0000
@@ -593,7 +593,6 @@
return new JViewport();
}
-
public String getUIClassID()
{
return "ScrollPaneUI";
@@ -605,6 +604,25 @@
setUI(b);
}
+ /**
+ * This method returns the scrollpane's UI delegate.
+ *
+ * @return The scrollpane's UI delegate.
+ */
+ public ScrollPaneUI getUI()
+ {
+ return (ScrollPaneUI) ui;
+ }
+
+ /**
+ * This method sets the scrollpane's UI delegate.
+ *
+ * @param ui The scrollpane's UI delegate.
+ */
+ public void setUI(ScrollPaneUI ui)
+ {
+ super.setUI(ui);
+ }
class ScrollBar
extends JScrollBar
Index: javax/swing/JTable.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTable.java,v
retrieving revision 1.4.18.5
diff -u -r1.4.18.5 JTable.java
--- javax/swing/JTable.java 17 Aug 2004 23:26:10 -0000 1.4.18.5
+++ javax/swing/JTable.java 12 Sep 2004 19:58:05 -0000
@@ -1540,17 +1540,31 @@
doLayout();
}
-
public String getUIClassID()
{
return "TableUI";
}
+ /**
+ * This method returns the table's UI delegate.
+ *
+ * @return The table's UI delegate.
+ */
public TableUI getUI()
{
return (TableUI) ui;
}
+ /**
+ * This method sets the table's UI delegate.
+ *
+ * @param ui The table's UI delegate.
+ */
+ public void setUI(TableUI ui)
+ {
+ super.setUI(ui);
+ }
+
public void updateUI()
{
setUI((TableUI) UIManager.getUI(this));
Index: javax/swing/JViewport.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JViewport.java,v
retrieving revision 1.3.2.8
diff -u -r1.3.2.8 JViewport.java
--- javax/swing/JViewport.java 17 Aug 2004 23:26:10 -0000 1.3.2.8
+++ javax/swing/JViewport.java 12 Sep 2004 19:58:05 -0000
@@ -305,23 +305,11 @@
return false;
}
- public ChangeListener[] getChangeListeners()
- {
- return (ChangeListener[]) getListeners(ChangeListener.class);
- }
-
public void paint(Graphics g)
{
paintComponent(g);
}
- void fireStateChanged()
- {
- ChangeListener[] listeners = getChangeListeners();
- for (int i = 0; i < listeners.length; ++i)
- listeners[i].stateChanged(changeEvent);
- }
-
public void addChangeListener(ChangeListener listener)
{
listenerList.add(ChangeListener.class, listener);
@@ -332,6 +320,18 @@
listenerList.remove(ChangeListener.class, listener);
}
+ public ChangeListener[] getChangeListeners()
+ {
+ return (ChangeListener[]) getListeners(ChangeListener.class);
+ }
+
+ protected void fireStateChanged()
+ {
+ ChangeListener[] listeners = getChangeListeners();
+ for (int i = 0; i < listeners.length; ++i)
+ listeners[i].stateChanged(changeEvent);
+ }
+
/**
* This method returns the String ID of the UI class of Separator.
*
@@ -349,4 +349,24 @@
{
setUI((ViewportUI) UIManager.getUI(this));
}
+
+ /**
+ * This method returns the viewport's UI delegate.
+ *
+ * @return The viewport's UI delegate.
+ */
+ public ViewportUI getUI()
+ {
+ return (ViewportUI) ui;
+ }
+
+ /**
+ * This method sets the viewport's UI delegate.
+ *
+ * @param ui The viewport's UI delegate.
+ */
+ public void setUI(ViewportUI ui)
+ {
+ super.setUI(ui);
+ }
}
Index: javax/swing/UIDefaults.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/UIDefaults.java,v
retrieving revision 1.7.2.5
diff -u -r1.7.2.5 UIDefaults.java
--- javax/swing/UIDefaults.java 29 Jun 2004 11:30:49 -0000 1.7.2.5
+++ javax/swing/UIDefaults.java 12 Sep 2004 19:58:05 -0000
@@ -477,7 +477,7 @@
propertyChangeSupport.addPropertyChangeListener(listener);
}
- void removePropertyChangeListener(PropertyChangeListener listener)
+ public void removePropertyChangeListener(PropertyChangeListener listener)
{
propertyChangeSupport.removePropertyChangeListener(listener);
}