OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

JToggleButton.java (ToggleButtonModel): Make public static inner class. 

* javax/swing/JToggleButton.java (ToggleButtonModel):
       Make public static inner class.
       * javax/swing/JTabbedPane.java (setComponentAt):
       Call Page.setComponent().
       (SCROLL_TAB_LAYOUT): Make public, value is 1.
       (WRAP_TAB_LAYOUT): Make public, value is 0.
       * javax/swing/plaf/basic/BasicTabbedPaneUI.java (ScrollingButton):
        Make private static inner class.

From-SVN: r80800
This commit is contained in:
Mark Wielaard 2004-04-17 22:31:17 +00:00 committed by Mark Wielaard
parent 0ff3e80574
commit afd7c0dc9e
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libjava/ChangeLog
View File

@ -1,3 +1,14 @@
2004-04-17 Mark Wielaard <mark@klomp.org>
* javax/swing/JToggleButton.java (ToggleButtonModel):
Make public static inner class.
* javax/swing/JTabbedPane.java (setComponentAt):
Call Page.setComponent().
(SCROLL_TAB_LAYOUT): Make public, value is 1.
(WRAP_TAB_LAYOUT): Make public, value is 0.
* javax/swing/plaf/basic/BasicTabbedPaneUI.java (ScrollingButton):
Make private static inner class.
2004-04-16 Bryce McKinlay <mckinlay@redhat.com>
* interpret.cc (_Jv_InterpMethod::run): Update _Jv_AllocObject

6
libjava/javax/swing/JTabbedPane.java
View File

@ -544,10 +544,10 @@ public class JTabbedPane extends JComponent implements Serializable,
protected SingleSelectionModel model;
/** Indicates that the TabbedPane is in scrolling mode. */
static int SCROLL_TAB_LAYOUT = 0;
public static int SCROLL_TAB_LAYOUT = 1;
/** Indicates that the TabbedPane is in wrap mode. */
static int WRAP_TAB_LAYOUT = 1;
public static int WRAP_TAB_LAYOUT = 0;
/** The current tabPlacement of the TabbedPane. */
protected int tabPlacement = SwingConstants.TOP;
@ -1338,7 +1338,7 @@ public class JTabbedPane extends JComponent implements Serializable,
public void setComponentAt(int index, Component component)
{
checkIndex(index, 0, tabs.size());
((Page) tabs.elementAt(index)).setEnabled(enabled);
((Page) tabs.elementAt(index)).setComponent(component);
}
/**

4
libjava/javax/swing/JToggleButton.java
View File

@ -1,5 +1,5 @@
/* JToggleButton.java --
Copyright (C) 2002 Free Software Foundation, Inc.
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -45,7 +45,7 @@ import javax.swing.plaf.ButtonUI;
public class JToggleButton extends AbstractButton implements Accessible
{
public class ToggleButtonModel extends DefaultButtonModel
public static class ToggleButtonModel extends DefaultButtonModel
{
public void setPressed(boolean b)
{

3
libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java
View File

@ -1191,7 +1191,8 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
* This is a helper class that implements UIResource so it is not added as a
* tab when an object of this class is added to the JTabbedPane.
*/
private class ScrollingButton extends BasicArrowButton implements UIResource
private static class ScrollingButton extends BasicArrowButton
implements UIResource
{
/**
* Creates a ScrollingButton given the direction.