diff options
| author | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-12 20:23:22 +0000 |
|---|---|---|
| committer | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-12 20:23:22 +0000 |
| commit | 3b552f8117601c247b933a83423077efc1adf452 (patch) | |
| tree | f45ec39ae04e57825d3f38688210512542b500a7 /libjava/java | |
| parent | 7af7da2ff022ef3f25b6c7daf03619c36b84058f (diff) | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70386 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/awt/Container.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libjava/java/awt/Container.java b/libjava/java/awt/Container.java index 226d5496724..e96b13d4bb5 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(); } /** |