This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: fixes for java.awt.Container, from Classpath
- From: Thomas Fitzsimmons <fitzsim at redhat dot com>
- To: GCJ Patch List <java-patches at gcc dot gnu dot org>
- Date: 12 Aug 2003 16:22:13 -0400
- Subject: FYI: Patch: fixes for java.awt.Container, from Classpath
I'm checking this in on the trunk.
The patch merges Classpath java.awt.Container fixes into libgcj.
Tom
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2097
diff -u -b -B -r1.2097 ChangeLog
--- ChangeLog 11 Aug 2003 18:26:07 -0000 1.2097
+++ ChangeLog 12 Aug 2003 20:12:50 -0000
@@ -1,3 +1,11 @@
+2003-08-10 Jeroen Frijters <jeroen@frijters.net>
+
+ * java/awt/Container.java
+ (getPreferredSize): Call preferredSize.
+ (preferredSize): Moved body of getPreferredSize here.
+ (getMinimumSize): Call minimumSize.
+ (minimumSize): Moved body of getMinimumSize here.
+
2003-08-11 Tom Tromey <tromey@redhat.com>
* java/awt/EventQueue.java (currentEvent, lastWhen): New fields.
Index: java/awt/Container.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Container.java,v
retrieving revision 1.25
diff -u -b -B -r1.25 Container.java
--- java/awt/Container.java 25 Jul 2003 12:50:44 -0000 1.25
+++ java/awt/Container.java 12 Aug 2003 20:12:50 -0000
@@ -535,10 +535,7 @@
*/
public Dimension getPreferredSize()
{
- if (layoutMgr != null)
- return layoutMgr.preferredLayoutSize(this);
- else
- return super.getPreferredSize();
+ return preferredSize();
}
/**
@@ -550,7 +547,10 @@
*/
public Dimension preferredSize()
{
- return getPreferredSize();
+ if (layoutMgr != null)
+ return layoutMgr.preferredLayoutSize(this);
+ else
+ return super.preferredSize();
}
/**
@@ -560,10 +560,7 @@
*/
public Dimension getMinimumSize()
{
- if (layoutMgr != null)
- return layoutMgr.minimumLayoutSize(this);
- else
- return super.getMinimumSize();
+ return minimumSize();
}
/**
@@ -575,7 +572,10 @@
*/
public Dimension minimumSize()
{
- return getMinimumSize();
+ if (layoutMgr != null)
+ return layoutMgr.minimumLayoutSize(this);
+ else
+ return super.minimumSize();
}
/**