diff options
Diffstat (limited to 'libjava/java/awt/ScrollPane.java')
| -rw-r--r-- | libjava/java/awt/ScrollPane.java | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/libjava/java/awt/ScrollPane.java b/libjava/java/awt/ScrollPane.java index 937568a..b772bee 100644 --- a/libjava/java/awt/ScrollPane.java +++ b/libjava/java/awt/ScrollPane.java @@ -446,10 +446,25 @@ removeNotify() public void doLayout() { - Component[] list = getComponents(); + layout (); +} + +/*************************************************************************/ + +/** + * Lays out this component. This consists of resizing the sole child + * component to its perferred size. + * + * @deprecated This method is deprecated in favor of + * <code>doLayout()</code>. + */ +public void +layout() +{ + Component[] list = getComponents (); if ((list != null) && (list.length > 0)) { - Dimension dim = list[0].getPreferredSize(); + Dimension dim = list[0].getPreferredSize (); Dimension vp = getViewportSize (); if (dim.width < vp.width) @@ -462,36 +477,21 @@ doLayout() if (peer != null) peer.childResized (dim.width, dim.height); - list[0].resize (dim); + list[0].setSize (dim); - Point p = getScrollPosition(); + Point p = getScrollPosition (); if (p.x > dim.width) p.x = dim.width; if (p.y > dim.height) p.y = dim.height; - setScrollPosition(p); + setScrollPosition (p); } } /*************************************************************************/ /** - * Lays out this component. This consists of resizing the sole child - * component to its perferred size. - * - * @deprecated This method is deprecated in favor of - * <code>doLayout()</code>. - */ -public void -layout() -{ - doLayout(); -} - -/*************************************************************************/ - -/** * This method overrides its superclass method to ensure no layout * manager is set for this container. <code>ScrollPane</code>'s do * not have layout managers. |