From: Jeroen Frijters <jeroen@frijters.net>
Date: Tue, 12 Aug 2003 20:23:22 +0000 (+0000)
Subject: 2003-08-10  Jeroen Frijters  <jeroen@frijters.net>
X-Git-Tag: releases/gcc-3.4.0~4276
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc9a73738104fdaf1b4dac2eff36464d60482bcb;p=thirdparty%2Fgcc.git

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.

From-SVN: r70386
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b9a8680cadbc..758b4593553b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -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.
diff --git a/libjava/java/awt/Container.java b/libjava/java/awt/Container.java
index 226d5496724f..e96b13d4bb5a 100644
--- a/libjava/java/awt/Container.java
+++ b/libjava/java/awt/Container.java
@@ -535,10 +535,7 @@ public class Container extends Component
    */
   public Dimension getPreferredSize()
   {
-    if (layoutMgr != null)
-      return layoutMgr.preferredLayoutSize(this);
-    else
-      return super.getPreferredSize();
+      return preferredSize();
   }
 
   /**
@@ -550,7 +547,10 @@ public class Container extends Component
    */
   public Dimension preferredSize()
   {
-    return getPreferredSize();
+      if (layoutMgr != null)
+	  return layoutMgr.preferredLayoutSize(this);
+      else
+	  return super.preferredSize();
   }
 
   /**
@@ -560,10 +560,7 @@ public class Container extends Component
    */
   public Dimension getMinimumSize()
   {
-    if (layoutMgr != null)
-      return layoutMgr.minimumLayoutSize(this);
-    else
-      return super.getMinimumSize();
+      return minimumSize();
   }
 
   /**
@@ -575,7 +572,10 @@ public class Container extends Component
    */
   public Dimension minimumSize()
   {
-    return getMinimumSize();
+      if (layoutMgr != null)
+	  return layoutMgr.minimumLayoutSize(this);
+      else
+	  return super.minimumSize();
   }
 
   /**