From dc9a73738104fdaf1b4dac2eff36464d60482bcb Mon Sep 17 00:00:00 2001 From: Jeroen Frijters Date: Tue, 12 Aug 2003 20:23:22 +0000 Subject: 2003-08-10 Jeroen Frijters * 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 --- libjava/java/awt/Container.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/awt/Container.java b/libjava/java/awt/Container.java index 226d549..e96b13d 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(); } /** -- cgit v1.1