This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[GUI] Patch: javax.swing - fixes for jikes
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Thu, 17 Jun 2004 22:39:19 +0200
- Subject: [GUI] Patch: javax.swing - fixes for jikes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I just commited the attached patch to fix two issues when compiling
libgcj with jikes. This was reported by Jim Huang. Thanks Jim.
Michael
2004-06-17 Michael Koch <konqueror@gmx.de>
* javax/swing/JToolBar.java
(name): Removed.
(JToolBar): Use Component.setName(String) instead of doing it all
alone.
* javax/swing/Timer.java
(queueEvent): Added missing modifier.
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFA0gF9WSOgCCdjSDsRAvOhAKCd7FMNRpXFkGT09YfxNDzSFXEiAwCggJoa
gave6X2AIK2OOzP7SLiQZVo=
=tDxW
-----END PGP SIGNATURE-----
Index: javax/swing/JToolBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JToolBar.java,v
retrieving revision 1.3.8.3
diff -u -b -B -r1.3.8.3 JToolBar.java
--- javax/swing/JToolBar.java 16 Jun 2004 20:12:43 -0000 1.3.8.3
+++ javax/swing/JToolBar.java 17 Jun 2004 20:35:45 -0000
@@ -236,9 +236,6 @@
*/
private int orientation = HORIZONTAL;
- /** Name that is assigned to the window of the undocked JToolBar */
- private transient String name;
-
// protected transient DefaultJToolBarLayout toolbarLayout;
/** Fired in a PropertyChangeEvent when the "orientation" property changes.
@@ -278,8 +275,7 @@
* @param orientation JToolBar orientation (HORIZONTAL or VERTICAL)
*/
public JToolBar(String name, int orientation) {
- nameExplicitlySet = (name != null);
- this.name = name;
+ setName(name);
if (orientation != HORIZONTAL && orientation != VERTICAL)
throw new IllegalArgumentException(orientation + " is not a legal orientation");
this.orientation = orientation;
Index: javax/swing/Timer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/Timer.java,v
retrieving revision 1.3.18.5
diff -u -b -B -r1.3.18.5 Timer.java
--- javax/swing/Timer.java 16 Jun 2004 19:05:55 -0000 1.3.18.5
+++ javax/swing/Timer.java 17 Jun 2004 20:35:45 -0000
@@ -66,7 +66,7 @@
{
queue++;
if (queue == 1)
- SwingUtilities.invokeLater(new Runnable() { void run() { drainEvents(); } });
+ SwingUtilities.invokeLater(new Runnable() { public void run() { drainEvents(); } });
}
}