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
2003-08-12 20:23:22 +00:00
parent 358bfe3df3
commit dc9a737381
2 changed files with 18 additions and 10 deletions
@@ -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();
  }

  /**