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 b9a8680cadbc36f1814f954f83d287270aa5c14c..758b4593553b4f4fcc0dafda5b376564465f9b48 100644 (file)
--- 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 226d5496724fa94a8e092b84f9726cb60b127142..e96b13d4bb5a8bc23ec237037c3ced39ae0c6821 100644 (file)
--- 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();
   }
 
   /**