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/CheckboxGroup.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/CheckboxGroup.java')
| -rw-r--r-- | libjava/java/awt/CheckboxGroup.java | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libjava/java/awt/CheckboxGroup.java b/libjava/java/awt/CheckboxGroup.java index 64d0195..52af190 100644 --- a/libjava/java/awt/CheckboxGroup.java +++ b/libjava/java/awt/CheckboxGroup.java @@ -95,8 +95,8 @@ CheckboxGroup() public Checkbox getSelectedCheckbox() { - return(selectedCheckbox); -} + return getCurrent (); +} /*************************************************************************/ @@ -126,17 +126,7 @@ getCurrent() public void setSelectedCheckbox(Checkbox selectedCheckbox) { - if (this.selectedCheckbox != null) - { - if (this.selectedCheckbox.getCheckboxGroup() != this) - return; - - this.selectedCheckbox.setState(false); - } - - this.selectedCheckbox = selectedCheckbox; - if (selectedCheckbox != null) - selectedCheckbox.setState(true); + setCurrent (selectedCheckbox); } /*************************************************************************/ @@ -153,7 +143,17 @@ setSelectedCheckbox(Checkbox selectedCheckbox) public void setCurrent(Checkbox selectedCheckbox) { - setSelectedCheckbox(selectedCheckbox); + if (this.selectedCheckbox != null) + { + if (this.selectedCheckbox.getCheckboxGroup() != this) + return; + + this.selectedCheckbox.setState(false); + } + + this.selectedCheckbox = selectedCheckbox; + if (selectedCheckbox != null) + selectedCheckbox.setState(true); } /*************************************************************************/ |