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/Scrollbar.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/Scrollbar.java')
| -rw-r--r-- | libjava/java/awt/Scrollbar.java | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/libjava/java/awt/Scrollbar.java b/libjava/java/awt/Scrollbar.java index 85ac117..79b2e43 100644 --- a/libjava/java/awt/Scrollbar.java +++ b/libjava/java/awt/Scrollbar.java @@ -333,7 +333,7 @@ setMinimum(int minimum) public int getVisibleAmount() { - return(visibleAmount); + return getVisible (); } /*************************************************************************/ @@ -350,7 +350,7 @@ getVisibleAmount() public int getVisible() { - return(getVisibleAmount()); + return visibleAmount; } /*************************************************************************/ @@ -438,7 +438,7 @@ setValues(int value, int visibleAmount, int minimum, int maximum) public int getUnitIncrement() { - return(lineIncrement); + return getLineIncrement (); } /*************************************************************************/ @@ -455,7 +455,7 @@ getUnitIncrement() public int getLineIncrement() { - return(lineIncrement); + return lineIncrement; } /*************************************************************************/ @@ -469,26 +469,7 @@ getLineIncrement() public synchronized void setUnitIncrement(int unitIncrement) { - if (unitIncrement < 0) - throw new IllegalArgumentException("Unit increment less than zero."); - - int range = maximum - minimum; - if (unitIncrement > range) - { - if (range == 0) - unitIncrement = 1; - else - unitIncrement = range; - } - - if (unitIncrement == lineIncrement) - return; - - lineIncrement = unitIncrement; - - ScrollbarPeer sp = (ScrollbarPeer)getPeer(); - if (sp != null) - sp.setLineIncrement(lineIncrement); + setLineIncrement (unitIncrement); } /*************************************************************************/ @@ -505,7 +486,26 @@ setUnitIncrement(int unitIncrement) public void setLineIncrement(int lineIncrement) { - setUnitIncrement(lineIncrement); + if (lineIncrement < 0) + throw new IllegalArgumentException ("Unit increment less than zero."); + + int range = maximum - minimum; + if (lineIncrement > range) + { + if (range == 0) + lineIncrement = 1; + else + lineIncrement = range; + } + + if (lineIncrement == this.lineIncrement) + return; + + this.lineIncrement = lineIncrement; + + ScrollbarPeer sp = (ScrollbarPeer) getPeer (); + if (sp != null) + sp.setLineIncrement (this.lineIncrement); } /*************************************************************************/ @@ -519,7 +519,7 @@ setLineIncrement(int lineIncrement) public int getBlockIncrement() { - return(pageIncrement); + return getPageIncrement (); } /*************************************************************************/ @@ -536,7 +536,7 @@ getBlockIncrement() public int getPageIncrement() { - return(pageIncrement); + return pageIncrement; } /*************************************************************************/ @@ -550,26 +550,7 @@ getPageIncrement() public synchronized void setBlockIncrement(int blockIncrement) { - if (blockIncrement < 0) - throw new IllegalArgumentException("Block increment less than zero."); - - int range = maximum - minimum; - if (blockIncrement > range) - { - if (range == 0) - blockIncrement = 1; - else - blockIncrement = range; - } - - if (blockIncrement == pageIncrement) - return; - - pageIncrement = blockIncrement; - - ScrollbarPeer sp = (ScrollbarPeer)getPeer(); - if (sp != null) - sp.setPageIncrement(pageIncrement); + setPageIncrement (blockIncrement); } /*************************************************************************/ @@ -586,7 +567,26 @@ setBlockIncrement(int blockIncrement) public void setPageIncrement(int pageIncrement) { - setBlockIncrement(pageIncrement); + if (pageIncrement < 0) + throw new IllegalArgumentException ("Block increment less than zero."); + + int range = maximum - minimum; + if (pageIncrement > range) + { + if (range == 0) + pageIncrement = 1; + else + pageIncrement = range; + } + + if (pageIncrement == this.pageIncrement) + return; + + this.pageIncrement = pageIncrement; + + ScrollbarPeer sp = (ScrollbarPeer) getPeer (); + if (sp != null) + sp.setPageIncrement (this.pageIncrement); } /*************************************************************************/ |