[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: Added deprecation tags in swing
Kaffe CVS
cvs-commits at kaffe.org
Sun Oct 24 03:48:51 PDT 2004
PatchSet 5349
Date: 2004/10/24 10:44:34
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: Added deprecation tags in swing
2004-10-24 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/javax/swing/AbstractButton.java,
libraries/javalib/javax/swing/FocusManager.java,
libraries/javalib/javax/swing/JComponent.java,
libraries/javalib/javax/swing/JDesktopPane.java,
libraries/javalib/javax/swing/JInternalFrame.java,
libraries/javalib/javax/swing/JViewport.java,
libraries/javalib/javax/swing/plaf/basic/BasicDesktopPaneUI.java,
libraries/javalib/javax/swing/plaf/basic/BasicInternalFrameUI.java,
libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneUI.java,
libraries/javalib/javax/swing/plaf/basic/BasicTabbedPaneUI.java:
Resynced with GNU Classpath.
2004-10-22 Michael Koch <konqueror at gmx.de>
* javax/swing/AbstractButton.java
(getLabel): Added @deprecated tag.
(setLabel): Likewise.
* javax/swing/FocusManager.java
(disableSwingFocusManager): Likewise.
(isFocusManagerEnabled): Likewise.
* javax/swing/JComponent.java
(isManagingFocus): Added version to @deprecated tag.
(getNextFocusableComponent): Moved @deprecated tag to bottom of
javadoc.
(getConditionForKeyStroke): Likewise.
(getActionForKeyStroke): Likewise.
* javax/swing/JDesktopPane.java
(LIVE_DRAG_MODE): Added @specnote tag.
(OUTLINE_DRAG_MODE): Likewise.
* javax/swing/JInternalFrame.java
(MENU_BAR_PROPERTY): Fixed value.
(getMenuBar): Added @deprecated tag.
(setMenuBar): Likewise.
* javax/swing/JViewport.java
(isBackingStoreEnabled): Likewise.
(setBackingStoreEnabled): Likewise.
* javax/swing/plaf/basic/BasicDesktopPaneUI.java
(closeKey): Likewise.
(maximizeKey): Likewise.
(minimizeKey): Likewise.
(navigateKey): Likewise.
(navigateKey2): Likewise.
* javax/swing/plaf/basic/BasicInternalFrameUI.java
(openMenuKey): Likewise.
* javax/swing/plaf/basic/BasicSplitPaneUI.java
(keyboardDownRightListener): Likewise.
(keyboardEndListener): Likewise.
(keyboardHomeListener): Likewise.
(keyboardResizeToggleListener): Likewise.
(keyboardUpLeftListener): Likewise.
(dividerResizeToggleKey): Likewise.
(downKey): Likewise.
(endKey): Likewise.
(homeKey): Likewise.
(leftKey): Likewise.
(rightKey): Likewise.
(upKey): Likewise.
(createKeyboardUpLeftListener): Likewise.
(createKeyboardDownRightListener): Likewise.
(createKeyboardHomeListener): Likewise.
(createKeyboardEndListener): Likewise.
(createKeyboardResizeToggleListener): Likewise.
(getDividerBorderSize): Likewise.
* javax/swing/plaf/basic/BasicTabbedPaneUI.java
(downKey): Likewise.
(leftKey): Likewise.
(rightKey): Likewise.
(upKey): Likewise.
Members:
ChangeLog:1.2901->1.2902
libraries/javalib/javax/swing/AbstractButton.java:1.7->1.8
libraries/javalib/javax/swing/FocusManager.java:1.1->1.2
libraries/javalib/javax/swing/JComponent.java:1.5->1.6
libraries/javalib/javax/swing/JDesktopPane.java:1.3->1.4
libraries/javalib/javax/swing/JInternalFrame.java:1.3->1.4
libraries/javalib/javax/swing/JViewport.java:1.4->1.5
libraries/javalib/javax/swing/plaf/basic/BasicDesktopPaneUI.java:1.1->1.2
libraries/javalib/javax/swing/plaf/basic/BasicInternalFrameUI.java:1.3->1.4
libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneUI.java:1.3->1.4
libraries/javalib/javax/swing/plaf/basic/BasicTabbedPaneUI.java:1.4->1.5
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2901 kaffe/ChangeLog:1.2902
--- kaffe/ChangeLog:1.2901 Sun Oct 24 00:47:54 2004
+++ kaffe/ChangeLog Sun Oct 24 10:44:34 2004
@@ -1,3 +1,74 @@
+2004-10-24 Dalibor Topic <robilad at kaffe.org>
+
+ * libraries/javalib/javax/swing/AbstractButton.java,
+ libraries/javalib/javax/swing/FocusManager.java,
+ libraries/javalib/javax/swing/JComponent.java,
+ libraries/javalib/javax/swing/JDesktopPane.java,
+ libraries/javalib/javax/swing/JInternalFrame.java,
+ libraries/javalib/javax/swing/JViewport.java,
+ libraries/javalib/javax/swing/plaf/basic/BasicDesktopPaneUI.java,
+ libraries/javalib/javax/swing/plaf/basic/BasicInternalFrameUI.java,
+ libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneUI.java,
+ libraries/javalib/javax/swing/plaf/basic/BasicTabbedPaneUI.java:
+ Resynced with GNU Classpath.
+
+ 2004-10-22 Michael Koch <konqueror at gmx.de>
+
+ * javax/swing/AbstractButton.java
+ (getLabel): Added @deprecated tag.
+ (setLabel): Likewise.
+ * javax/swing/FocusManager.java
+ (disableSwingFocusManager): Likewise.
+ (isFocusManagerEnabled): Likewise.
+ * javax/swing/JComponent.java
+ (isManagingFocus): Added version to @deprecated tag.
+ (getNextFocusableComponent): Moved @deprecated tag to bottom of
+ javadoc.
+ (getConditionForKeyStroke): Likewise.
+ (getActionForKeyStroke): Likewise.
+ * javax/swing/JDesktopPane.java
+ (LIVE_DRAG_MODE): Added @specnote tag.
+ (OUTLINE_DRAG_MODE): Likewise.
+ * javax/swing/JInternalFrame.java
+ (MENU_BAR_PROPERTY): Fixed value.
+ (getMenuBar): Added @deprecated tag.
+ (setMenuBar): Likewise.
+ * javax/swing/JViewport.java
+ (isBackingStoreEnabled): Likewise.
+ (setBackingStoreEnabled): Likewise.
+ * javax/swing/plaf/basic/BasicDesktopPaneUI.java
+ (closeKey): Likewise.
+ (maximizeKey): Likewise.
+ (minimizeKey): Likewise.
+ (navigateKey): Likewise.
+ (navigateKey2): Likewise.
+ * javax/swing/plaf/basic/BasicInternalFrameUI.java
+ (openMenuKey): Likewise.
+ * javax/swing/plaf/basic/BasicSplitPaneUI.java
+ (keyboardDownRightListener): Likewise.
+ (keyboardEndListener): Likewise.
+ (keyboardHomeListener): Likewise.
+ (keyboardResizeToggleListener): Likewise.
+ (keyboardUpLeftListener): Likewise.
+ (dividerResizeToggleKey): Likewise.
+ (downKey): Likewise.
+ (endKey): Likewise.
+ (homeKey): Likewise.
+ (leftKey): Likewise.
+ (rightKey): Likewise.
+ (upKey): Likewise.
+ (createKeyboardUpLeftListener): Likewise.
+ (createKeyboardDownRightListener): Likewise.
+ (createKeyboardHomeListener): Likewise.
+ (createKeyboardEndListener): Likewise.
+ (createKeyboardResizeToggleListener): Likewise.
+ (getDividerBorderSize): Likewise.
+ * javax/swing/plaf/basic/BasicTabbedPaneUI.java
+ (downKey): Likewise.
+ (leftKey): Likewise.
+ (rightKey): Likewise.
+ (upKey): Likewise.
+
2004-10-23 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/java/net/NetworkInterface.java:
Index: kaffe/libraries/javalib/javax/swing/AbstractButton.java
diff -u kaffe/libraries/javalib/javax/swing/AbstractButton.java:1.7 kaffe/libraries/javalib/javax/swing/AbstractButton.java:1.8
--- kaffe/libraries/javalib/javax/swing/AbstractButton.java:1.7 Mon Sep 27 17:41:09 2004
+++ kaffe/libraries/javalib/javax/swing/AbstractButton.java Sun Oct 24 10:44:36 2004
@@ -45,8 +45,6 @@
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.beans.PropertyChangeEvent;
@@ -1131,6 +1129,8 @@
* "text" property.
*
* @param label The new "label" property
+ *
+ * @deprecated use <code>setText(text)</code>
*/
public void setLabel(String label)
{
@@ -1142,6 +1142,8 @@
* the "text" property.
*
* @return The current "label" property
+ *
+ * @deprecated use <code>getText()</code>
*/
public String getLabel()
{
Index: kaffe/libraries/javalib/javax/swing/FocusManager.java
diff -u kaffe/libraries/javalib/javax/swing/FocusManager.java:1.1 kaffe/libraries/javalib/javax/swing/FocusManager.java:1.2
--- kaffe/libraries/javalib/javax/swing/FocusManager.java:1.1 Thu Jul 22 19:37:18 2004
+++ kaffe/libraries/javalib/javax/swing/FocusManager.java Sun Oct 24 10:44:36 2004
@@ -1,5 +1,5 @@
/* FocusManager.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -148,6 +148,7 @@
/**
* disableSwingFocusManager
+ * @deprecated 1.4
*/
public static void disableSwingFocusManager() {
// TODO
@@ -155,7 +156,8 @@
/**
* isFocusManagerEnabled
- * @returns boolean
+ * @return boolean
+ * @deprecated 1.4
*/
public static boolean isFocusManagerEnabled() {
return false; // TODO
Index: kaffe/libraries/javalib/javax/swing/JComponent.java
diff -u kaffe/libraries/javalib/javax/swing/JComponent.java:1.5 kaffe/libraries/javalib/javax/swing/JComponent.java:1.6
--- kaffe/libraries/javalib/javax/swing/JComponent.java:1.5 Mon Sep 27 17:41:10 2004
+++ kaffe/libraries/javalib/javax/swing/JComponent.java Sun Oct 24 10:44:36 2004
@@ -35,6 +35,7 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package javax.swing;
import java.awt.AWTEvent;
@@ -68,7 +69,7 @@
import java.util.EventListener;
import java.util.Hashtable;
import java.util.Locale;
-import java.util.Vector;
+
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
@@ -79,7 +80,6 @@
import javax.swing.event.SwingPropertyChangeSupport;
import javax.swing.plaf.ComponentUI;
-
/**
* Every component in swing inherits from this class (JLabel, JButton, etc).
* It contains generic methods to manage events, properties and sizes. Actual
@@ -1063,11 +1063,11 @@
/**
* Return the value of the {@link #nextFocusableComponent} property.
- *
- * @deprecated See {@link java.awt.FocusTraversalPolicy}
*
* @return The current value of the property, or <code>null</code>
* if none has been set.
+ *
+ * @deprecated See {@link java.awt.FocusTraversalPolicy}
*/
public Component getNextFocusableComponent()
{
@@ -1302,7 +1302,7 @@
* @return <code>true</code> if you want this component to manage its own
* focus, otherwise (by default) <code>false</code>
*
- * @deprecated Use {@link Component.setFocusTraversalKeys(int,Set)} and
+ * @deprecated 1.4 Use {@link Component.setFocusTraversalKeys(int,Set)} and
* {@link Container.setFocusCycleRoot(boolean)} instead
*/
public boolean isManagingFocus()
@@ -1686,9 +1686,6 @@
}
/**
- * @deprecated As of 1.3 KeyStrokes can be registered with multiple
- * simultaneous conditions.
- *
* Return the condition that determines whether a registered action
* occurs in response to the specified keystroke.
*
@@ -1698,6 +1695,9 @@
* #WHEN_ANCESTOR_OF_FOCUSED_COMPONENT}, {@link #WHEN_FOCUSED}, or {@link
* #WHEN_IN_FOCUSED_WINDOW}
*
+ * @deprecated As of 1.3 KeyStrokes can be registered with multiple
+ * simultaneous conditions.
+ *
* @see #registerKeyboardAction
* @see #unregisterKeyboardAction
* @see #resetKeyboardActiond
@@ -1718,14 +1718,14 @@
}
/**
- * @deprecated Use {@link #getActionMap()}
- *
* Get the ActionListener (typically an {@link Action} object) which is
* associated with a particular keystroke.
*
* @param aKeyStroke The keystroke to retrieve the action of
*
* @return The action associated with the specified keystroke
+ *
+ * @deprecated Use {@link #getActionMap()}
*/
public ActionListener getActionForKeyStroke(KeyStroke ks)
{
Index: kaffe/libraries/javalib/javax/swing/JDesktopPane.java
diff -u kaffe/libraries/javalib/javax/swing/JDesktopPane.java:1.3 kaffe/libraries/javalib/javax/swing/JDesktopPane.java:1.4
--- kaffe/libraries/javalib/javax/swing/JDesktopPane.java:1.3 Thu Sep 9 20:33:19 2004
+++ kaffe/libraries/javalib/javax/swing/JDesktopPane.java Sun Oct 24 10:44:37 2004
@@ -35,18 +35,17 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package javax.swing;
import java.awt.Component;
import java.beans.PropertyVetoException;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
+
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
import javax.swing.plaf.DesktopPaneUI;
-
/**
* JDesktopPane is a container (usually for JInternalFrames) that simulates a
* desktop. Typically, the user will create JInternalFrames and place thme in
@@ -63,12 +62,16 @@
/**
* This specifies that when dragged, a JInternalFrame should be completely
* visible.
+ *
+ * @specnote final since 1.5.0.
*/
public static final int LIVE_DRAG_MODE = 0;
/**
* This specifies that when dragged, a JInternalFrame should only be visible
* as an outline.
+ *
+ * @specnote final since 1.5.0.
*/
public static final int OUTLINE_DRAG_MODE = 1;
@@ -84,7 +87,7 @@
/**
* AccessibleJDesktopPane
*/
- protected class AccessibleJDesktopPane extends JComponent.AccessibleJComponent
+ protected class AccessibleJDesktopPane extends AccessibleJComponent
{
/** DOCUMENT ME! */
private static final long serialVersionUID = 6079388927946077570L;
Index: kaffe/libraries/javalib/javax/swing/JInternalFrame.java
diff -u kaffe/libraries/javalib/javax/swing/JInternalFrame.java:1.3 kaffe/libraries/javalib/javax/swing/JInternalFrame.java:1.4
--- kaffe/libraries/javalib/javax/swing/JInternalFrame.java:1.3 Tue Sep 21 11:36:35 2004
+++ kaffe/libraries/javalib/javax/swing/JInternalFrame.java Sun Oct 24 10:44:37 2004
@@ -35,9 +35,9 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package javax.swing;
-import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
import java.awt.Graphics;
@@ -45,6 +45,7 @@
import java.awt.LayoutManager;
import java.awt.Rectangle;
import java.beans.PropertyVetoException;
+
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
@@ -54,7 +55,6 @@
import javax.swing.plaf.DesktopIconUI;
import javax.swing.plaf.InternalFrameUI;
-
/**
* This class implements a Swing widget that looks and acts like a native
* frame. The frame can be dragged, resized, closed, etc. Typically,
@@ -389,7 +389,7 @@
* The property fired in a PropertyChangeEvent when the jMenuBar property
* changes.
*/
- public static final String MENU_BAR_PROPERTY = "jMenuBar";
+ public static final String MENU_BAR_PROPERTY = "JMenuBar";
/**
* The property fired in a PropertyChangeEvent when the rootPane property
@@ -879,6 +879,8 @@
* JInternalFrame.
*
* @return The JMenuBar for this JInternalFrame.
+ *
+ * @deprecated 1.0.3
*/
public JMenuBar getMenuBar()
{
@@ -1482,6 +1484,8 @@
* JInternalFrame.
*
* @param m The JMenuBar to use with this JInternalFrame.
+ *
+ * @deprecated 1.0.3
*/
public void setMenuBar(JMenuBar m)
{
Index: kaffe/libraries/javalib/javax/swing/JViewport.java
diff -u kaffe/libraries/javalib/javax/swing/JViewport.java:1.4 kaffe/libraries/javalib/javax/swing/JViewport.java:1.5
--- kaffe/libraries/javalib/javax/swing/JViewport.java:1.4 Tue Sep 28 22:45:30 2004
+++ kaffe/libraries/javalib/javax/swing/JViewport.java Sun Oct 24 10:44:37 2004
@@ -45,12 +45,10 @@
import java.awt.Point;
import java.awt.Rectangle;
-import javax.accessibility.Accessible;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.plaf.ViewportUI;
-
/**
*
* <pre>
@@ -214,11 +212,17 @@
getExtentSize());
}
+ /**
+ * @deprecated 1.4
+ */
public boolean isBackingStoreEnabled()
{
return scrollMode == BACKINGSTORE_SCROLL_MODE;
}
+ /**
+ * @deprecated 1.4
+ */
public void setBackingStoreEnabled(boolean b)
{
if (b && scrollMode != BACKINGSTORE_SCROLL_MODE)
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicDesktopPaneUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicDesktopPaneUI.java:1.1 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicDesktopPaneUI.java:1.2
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicDesktopPaneUI.java:1.1 Thu Jul 22 19:37:33 2004
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicDesktopPaneUI.java Sun Oct 24 10:44:37 2004
@@ -35,31 +35,25 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package javax.swing.plaf.basic;
import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Insets;
import java.awt.event.ActionEvent;
-import java.awt.event.MouseEvent;
import java.beans.PropertyVetoException;
+
import javax.swing.AbstractAction;
import javax.swing.DefaultDesktopManager;
import javax.swing.DesktopManager;
import javax.swing.JComponent;
import javax.swing.JDesktopPane;
import javax.swing.JInternalFrame;
-import javax.swing.JInternalFrame.JDesktopIcon;
import javax.swing.KeyStroke;
import javax.swing.UIDefaults;
import javax.swing.UIManager;
-import javax.swing.event.MouseInputAdapter;
-import javax.swing.event.MouseInputListener;
import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.DesktopIconUI;
import javax.swing.plaf.DesktopPaneUI;
-
/**
* This class is the UI delegate for JDesktopPane for the Basic look and feel.
*/
@@ -267,24 +261,35 @@
}
}
- /** The KeyStroke associated with closing JInternalFrames. */
+ /**
+ * The KeyStroke associated with closing JInternalFrames.
+ * @deprecated
+ */
protected KeyStroke closeKey;
- /** The KeyStroke associated with maximizing JInternalFrames. */
+ /**
+ * The KeyStroke associated with maximizing JInternalFrames.
+ * @deprecated
+ */
protected KeyStroke maximizeKey;
- /** The KeyStroke associated with minimizing JInternalFrames. */
+ /**
+ * The KeyStroke associated with minimizing JInternalFrames.
+ * @deprecated
+ */
protected KeyStroke minimizeKey;
/**
* The KeyStroke associated with navigating (forward?) through
* JInternalFrames.
+ * @deprecated
*/
protected KeyStroke navigateKey;
/**
* The KeyStroke associated with navigating (backward?) through
* JInternalFrames.
+ * @deprecated
*/
protected KeyStroke navigateKey2;
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicInternalFrameUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicInternalFrameUI.java:1.3 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicInternalFrameUI.java:1.4
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicInternalFrameUI.java:1.3 Sun Aug 8 19:46:06 2004
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicInternalFrameUI.java Sun Oct 24 10:44:37 2004
@@ -35,6 +35,7 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package javax.swing.plaf.basic;
import java.awt.AWTEvent;
@@ -42,29 +43,22 @@
import java.awt.Component;
import java.awt.Container;
import java.awt.Dimension;
-import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.Insets;
import java.awt.LayoutManager;
import java.awt.Point;
import java.awt.Rectangle;
-import java.awt.event.ActionEvent;
import java.awt.event.ComponentEvent;
import java.awt.event.ComponentListener;
-import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import javax.swing.AbstractAction;
-import javax.swing.Action;
+
import javax.swing.DefaultDesktopManager;
import javax.swing.DesktopManager;
-import javax.swing.Icon;
-import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JDesktopPane;
import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
import javax.swing.KeyStroke;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
@@ -77,7 +71,6 @@
import javax.swing.plaf.InternalFrameUI;
import javax.swing.plaf.UIResource;
-
/**
* This is the UI delegate for the Basic look and feel for JInternalFrames.
*/
@@ -1053,7 +1046,10 @@
/** The JComponent placed at the west region of the JInternalFrame. */
protected JComponent westPane;
- /** The Keystroke bound to open the menu. */
+ /**
+ * The Keystroke bound to open the menu.
+ * @deprecated
+ */
protected KeyStroke openMenuKey;
/** The TitlePane displayed at the top of the JInternalFrame. */
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneUI.java:1.3 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneUI.java:1.4
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneUI.java:1.3 Tue Aug 17 17:55:05 2004
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneUI.java Sun Oct 24 10:44:37 2004
@@ -1,4 +1,4 @@
-/* BasicSplitPaneUI.java
+/* BasicSplitPaneUI.java --
Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -35,6 +35,7 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package javax.swing.plaf.basic;
import java.awt.Canvas;
@@ -51,10 +52,9 @@
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
-import java.awt.event.MouseEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import javax.swing.JButton;
+
import javax.swing.JComponent;
import javax.swing.JSplitPane;
import javax.swing.KeyStroke;
@@ -63,7 +63,6 @@
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.SplitPaneUI;
-
/**
* This is the Basic Look and Feel implementation of the SplitPaneUI class.
*/
@@ -682,7 +681,7 @@
* This is a deprecated class. It is supposed to be used for handling down
* and right key presses.
*/
- protected class KeyboardDownRightHandler implements ActionListener
+ public class KeyboardDownRightHandler implements ActionListener
{
/**
* This method is called when the down or right keys are pressed.
@@ -699,7 +698,7 @@
* This is a deprecated class. It is supposed to be used for handling end
* key presses.
*/
- protected class KeyboardEndHandler implements ActionListener
+ public class KeyboardEndHandler implements ActionListener
{
/**
* This method is called when the end key is pressed.
@@ -716,7 +715,7 @@
* This is a deprecated class. It is supposed to be used for handling home
* key presses.
*/
- protected class KeyboardHomeHandler implements ActionListener
+ public class KeyboardHomeHandler implements ActionListener
{
/**
* This method is called when the home key is pressed.
@@ -733,7 +732,7 @@
* This is a deprecated class. It is supposed to be used for handling resize
* toggles.
*/
- protected class KeyboardResizeToggleHandler implements ActionListener
+ public class KeyboardResizeToggleHandler implements ActionListener
{
/**
* This method is called when a resize is toggled.
@@ -750,7 +749,7 @@
* This is a deprecated class. It is supposed to be used for handler up and
* left key presses.
*/
- protected class KeyboardUpLeftHandler implements ActionListener
+ public class KeyboardUpLeftHandler implements ActionListener
{
/**
* This method is called when the left or up keys are pressed.
@@ -767,7 +766,7 @@
* This helper class handles PropertyChangeEvents from the JSplitPane. When
* a property changes, this will update the UI accordingly.
*/
- protected class PropertyHandler implements PropertyChangeListener
+ public class PropertyHandler implements PropertyChangeListener
{
/**
* This method is called whenever one of the JSplitPane's properties
@@ -846,43 +845,43 @@
/** The JSplitPane's focus handler. */
protected FocusListener focusListener;
- /** Deprecated. The handler for down and right key presses. */
+ /** @deprecated The handler for down and right key presses. */
protected ActionListener keyboardDownRightListener;
- /** Deprecated. The handler for end key presses. */
+ /** @deprecated The handler for end key presses. */
protected ActionListener keyboardEndListener;
- /** Deprecated. The handler for home key presses. */
+ /** @deprecated The handler for home key presses. */
protected ActionListener keyboardHomeListener;
- /** Deprecated. The handler for toggling resizes. */
+ /** @deprecated The handler for toggling resizes. */
protected ActionListener keyboardResizeToggleListener;
- /** Deprecated. The handler for up and left key presses. */
+ /** @deprecated The handler for up and left key presses. */
protected ActionListener keyboardUpLeftListener;
/** The JSplitPane's current layout manager. */
protected BasicHorizontalLayoutManager layoutManager;
- /** Deprecated. The divider resize toggle key. */
+ /** @deprecated The divider resize toggle key. */
protected KeyStroke dividerResizeToggleKey;
- /** Deprecated. The down key. */
+ /** @deprecated The down key. */
protected KeyStroke downKey;
- /** Deprecated. The end key. */
+ /** @deprecated The end key. */
protected KeyStroke endKey;
- /** Deprecated. The home key. */
+ /** @deprecated The home key. */
protected KeyStroke homeKey;
- /** Deprecated. The left key. */
+ /** @deprecated The left key. */
protected KeyStroke leftKey;
- /** Deprecated. The right key. */
+ /** @deprecated The right key. */
protected KeyStroke rightKey;
- /** Deprecated. The up key. */
+ /** @deprecated The up key. */
protected KeyStroke upKey;
/** Set to true when dragging heavy weight components. */
@@ -1043,10 +1042,11 @@
}
/**
- * Deprecated. This method creates a new ActionListener for up and left key
- * presses.
+ * This method creates a new ActionListener for up and left key presses.
*
* @return A new ActionListener for up and left keys.
+ *
+ * @deprecated 1.3
*/
protected ActionListener createKeyboardUpLeftListener()
{
@@ -1054,10 +1054,11 @@
}
/**
- * Deprecated. This method creates a new ActionListener for down and right
- * key presses.
+ * This method creates a new ActionListener for down and right key presses.
*
* @return A new ActionListener for down and right keys.
+ *
+ * @deprecated 1.3
*/
protected ActionListener createKeyboardDownRightListener()
{
@@ -1065,10 +1066,11 @@
}
/**
- * Deprecated. This method creates a new ActionListener for home key
- * presses.
+ * This method creates a new ActionListener for home key presses.
*
* @return A new ActionListener for home keys.
+ *
+ * @deprecated
*/
protected ActionListener createKeyboardHomeListener()
{
@@ -1076,9 +1078,11 @@
}
/**
- * Deprecated. This method creates a new ActionListener for end key presses.
+ * This method creates a new ActionListener for end key presses.i
*
* @return A new ActionListener for end keys.
+ *
+ * @deprecated 1.3
*/
protected ActionListener createKeyboardEndListener()
{
@@ -1086,10 +1090,11 @@
}
/**
- * Depcreated. This method creates a new ActionListener for resize toggle
- * key events.
+ * This method creates a new ActionListener for resize toggle key events.
*
* @return A new ActionListener for resize toggle keys.
+ *
+ * @deprecated 1.3
*/
protected ActionListener createKeyboardResizeToggleListener()
{
@@ -1483,10 +1488,11 @@
}
/**
- * Deprecated. This method returns the width of one of the sides of the
- * divider's border.
+ * This method returns the width of one of the sides of the divider's border.
*
* @return The width of one side of the divider's border.
+ *
+ * @deprecated 1.3
*/
protected int getDividerBorderSize()
{
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTabbedPaneUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTabbedPaneUI.java:1.4 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTabbedPaneUI.java:1.5
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTabbedPaneUI.java:1.4 Mon Sep 27 17:41:12 2004
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTabbedPaneUI.java Sun Oct 24 10:44:37 2004
@@ -28,7 +28,7 @@
executable, regardless of the license terms of these independent
modules, and to copy and distribute the resulting executable under
terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of7 the license of that
+independent module, the terms and conditions of the license of that
module. An independent module is a module which is not derived from
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
@@ -56,6 +56,7 @@
import java.awt.event.MouseListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+
import javax.swing.Icon;
import javax.swing.JComponent;
import javax.swing.JPanel;
@@ -173,7 +174,7 @@
/**
* This class handles PropertyChangeEvents fired from the JTabbedPane.
*/
- protected class PropertyChangeHandler implements PropertyChangeListener
+ public class PropertyChangeHandler implements PropertyChangeListener
{
/**
* This method is called whenever one of the properties of the JTabbedPane
@@ -1101,7 +1102,7 @@
/**
* This class handles ChangeEvents from the JTabbedPane.
*/
- protected class TabSelectionHandler implements ChangeListener
+ public class TabSelectionHandler implements ChangeListener
{
/**
* This method is called whenever a ChangeEvent is fired from the
@@ -1261,16 +1262,32 @@
/** This array keeps track of which tabs are in which run. See above. */
protected int[] tabRuns;
- /** Deprecated. This is the keystroke for moving down. */
+ /**
+ * This is the keystroke for moving down.
+ *
+ * @deprecated 1.3
+ */
protected KeyStroke downKey;
- /** Deprecated. This is the keystroke for moving left. */
+ /**
+ * This is the keystroke for moving left.
+ *
+ * @deprecated 1.3
+ */
protected KeyStroke leftKey;
- /** Deprecated. This is the keystroke for moving right. */
+ /**
+ * This is the keystroke for moving right.
+ *
+ * @deprecated 1.3
+ */
protected KeyStroke rightKey;
- /** Deprecated. This is the keystroke for moving up. */
+ /**
+ * This is the keystroke for moving up.
+ *
+ * @deprecated 1.3
+ */
protected KeyStroke upKey;
/** The listener that listens for focus events. */
More information about the kaffe
mailing list