diff options
| author | Jeroen Frijters <jeroen@frijters.net> | 2003-08-12 20:23:22 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2003-08-12 20:23:22 +0000 |
| commit | dc9a73738104fdaf1b4dac2eff36464d60482bcb (patch) | |
| tree | f45ec39ae04e57825d3f38688210512542b500a7 /libjava | |
| parent | 358bfe3df36f35af6cc89bccd464e56930e1773a (diff) | |
| download | gcc-dc9a73738104fdaf1b4dac2eff36464d60482bcb.zip gcc-dc9a73738104fdaf1b4dac2eff36464d60482bcb.tar.gz gcc-dc9a73738104fdaf1b4dac2eff36464d60482bcb.tar.bz2 | |
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/java/awt/Container.java | 20 |
2 files changed, 18 insertions, 10 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b9a8680..758b459 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 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(); } /** |