diff options
author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2004-02-03 17:10:56 +0000 |
---|---|---|
committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2004-02-03 17:10:56 +0000 |
commit | b6d3cb37ef676c2439fdf9498e4dbe8042fb3c6a (patch) | |
tree | 69b793f3808108f9a710a0f4875efb2e7eea8892 /libjava/java/awt/ScrollPane.java | |
parent | 5a98fa7bdb847dc92fdbeddf4dfcff51835aca48 (diff) | |
download | gcc-b6d3cb37ef676c2439fdf9498e4dbe8042fb3c6a.zip gcc-b6d3cb37ef676c2439fdf9498e4dbe8042fb3c6a.tar.gz gcc-b6d3cb37ef676c2439fdf9498e4dbe8042fb3c6a.tar.bz2 |
GtkListPeer.java, [...]: Fix handling of alias methods...
2004-02-03 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkListPeer.java,
java/awt/BorderLayout.java, java/awt/CardLayout.java,
java/awt/CheckboxGroup.java, java/awt/Choice.java,
java/awt/Component.java, java/awt/Container.java,
java/awt/FontMetrics.java, java/awt/GridBagLayout.java,
java/awt/LayoutManager2.java, java/awt/List.java,
java/awt/Menu.java, java/awt/MenuBar.java,
java/awt/MenuItem.java, java/awt/Polygon.java,
java/awt/Rectangle.java, java/awt/ScrollPane.java,
java/awt/Scrollbar.java, java/awt/TextArea.java,
java/awt/TextField.java,
java/awt/image/renderable/RenderContext.java,
javax/swing/JApplet.java: Fix handling of alias methods, where a
method has been deprecated in favour of a new one with the same
funtion but a different name. Put the method implementation in
the deprecated method and have the new method call the
deprecated one. Make all other code call the new method.
From-SVN: r77178
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. |