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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index bdca23728951661f3c69e20152c9cdb38722ec55..cb652bdf1118bf30b9cc8c5dd92dc7e40b0c09f6 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -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

diff --git a/libjava/javax/swing/JTabbedPane.java b/libjava/javax/swing/JTabbedPane.java
index c8af0729f441b0ef15a767312ca0c3c965e5f3c3..3c75461f01001a8de5acea2b16665a783f6afab4 100644 (file)
--- a/libjava/javax/swing/JTabbedPane.java
+++ b/libjava/javax/swing/JTabbedPane.java
@@ -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);
   }
 
   /**

diff --git a/libjava/javax/swing/JToggleButton.java b/libjava/javax/swing/JToggleButton.java
index 297bbc929feefb2a835b7c11f0931c745b6cf19f..0977b00c6fec18f56dcc5bb41a8dea77d4718204 100644 (file)
--- a/libjava/javax/swing/JToggleButton.java
+++ b/libjava/javax/swing/JToggleButton.java
@@ -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)  
     {

diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java
index 89e0ae8be208be009577d782a31fbb2c30c39c6f..563a8fef6daa4fe57ecaabb070adfc4f198e6983 100644 (file)
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java
@@ -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.