Index: javax/swing/AbstractButton.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/AbstractButton.java,v
retrieving revision 1.5.2.17
diff -u -r1.5.2.17 AbstractButton.java
--- javax/swing/AbstractButton.java 12 Sep 2004 17:55:38 -0000 1.5.2.17
+++ javax/swing/AbstractButton.java 22 Oct 2004 08:05:23 -0000
@@ -1131,6 +1131,8 @@
* "text" property.
*
* @param label The new "label" property
+ *
+ * @deprecated use setText(text)
*/
public void setLabel(String label)
{
@@ -1142,6 +1144,8 @@
* the "text" property.
*
* @return The current "label" property
+ *
+ * @deprecated use getText()
*/
public String getLabel()
{
Index: javax/swing/FocusManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/FocusManager.java,v
retrieving revision 1.2
diff -u -r1.2 FocusManager.java
--- javax/swing/FocusManager.java 11 Jun 2003 13:20:39 -0000 1.2
+++ javax/swing/FocusManager.java 22 Oct 2004 08:05:24 -0000
@@ -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: javax/swing/JComponent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JComponent.java,v
retrieving revision 1.7.2.20
diff -u -r1.7.2.20 JComponent.java
--- javax/swing/JComponent.java 13 Sep 2004 14:51:47 -0000 1.7.2.20
+++ javax/swing/JComponent.java 22 Oct 2004 08:05:24 -0000
@@ -1063,11 +1063,11 @@
/**
* Return the value of the address@hidden #nextFocusableComponent} property.
- *
- * @deprecated See address@hidden java.awt.FocusTraversalPolicy}
*
* @return The current value of the property, or null
* if none has been set.
+ *
+ * @deprecated See address@hidden java.awt.FocusTraversalPolicy}
*/
public Component getNextFocusableComponent()
{
@@ -1302,7 +1302,7 @@
* @return true if you want this component to manage its own
* focus, otherwise (by default) false
*
- * @deprecated Use address@hidden Component.setFocusTraversalKeys(int,Set)} and
+ * @deprecated 1.4 Use address@hidden Component.setFocusTraversalKeys(int,Set)} and
* address@hidden 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}, address@hidden #WHEN_FOCUSED}, or address@hidden
* #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 address@hidden #getActionMap()}
- *
* Get the ActionListener (typically an address@hidden 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 address@hidden #getActionMap()}
*/
public ActionListener getActionForKeyStroke(KeyStroke ks)
{
Index: javax/swing/JDesktopPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JDesktopPane.java,v
retrieving revision 1.3.8.4
diff -u -r1.3.8.4 JDesktopPane.java
--- javax/swing/JDesktopPane.java 23 Sep 2004 15:49:57 -0000 1.3.8.4
+++ javax/swing/JDesktopPane.java 22 Oct 2004 08:05:24 -0000
@@ -35,18 +35,19 @@
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 +64,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;
Index: javax/swing/JInternalFrame.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JInternalFrame.java,v
retrieving revision 1.2.18.3
diff -u -r1.2.18.3 JInternalFrame.java
--- javax/swing/JInternalFrame.java 23 Sep 2004 15:11:24 -0000 1.2.18.3
+++ javax/swing/JInternalFrame.java 22 Oct 2004 08:05:25 -0000
@@ -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: javax/swing/JViewport.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JViewport.java,v
retrieving revision 1.3.2.9
diff -u -r1.3.2.9 JViewport.java
--- javax/swing/JViewport.java 12 Sep 2004 20:27:43 -0000 1.3.2.9
+++ javax/swing/JViewport.java 22 Oct 2004 08:05:25 -0000
@@ -214,11 +214,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: javax/swing/plaf/basic/BasicDesktopPaneUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI.java,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 BasicDesktopPaneUI.java
--- javax/swing/plaf/basic/BasicDesktopPaneUI.java 9 Jun 2004 20:55:11 -0000 1.1.2.1
+++ javax/swing/plaf/basic/BasicDesktopPaneUI.java 22 Oct 2004 08:05:25 -0000
@@ -267,24 +267,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: javax/swing/plaf/basic/BasicInternalFrameUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.java,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 BasicInternalFrameUI.java
--- javax/swing/plaf/basic/BasicInternalFrameUI.java 30 Jul 2004 19:48:34 -0000 1.1.2.3
+++ javax/swing/plaf/basic/BasicInternalFrameUI.java 22 Oct 2004 08:05:25 -0000
@@ -1053,7 +1053,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: javax/swing/plaf/basic/BasicSplitPaneUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicSplitPaneUI.java,v
retrieving revision 1.1.26.4
diff -u -r1.1.26.4 BasicSplitPaneUI.java
--- javax/swing/plaf/basic/BasicSplitPaneUI.java 23 Sep 2004 15:49:58 -0000 1.1.26.4
+++ javax/swing/plaf/basic/BasicSplitPaneUI.java 22 Oct 2004 08:05:25 -0000
@@ -846,43 +846,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 +1043,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 +1055,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 +1067,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 +1079,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 +1091,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 +1489,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: javax/swing/plaf/basic/BasicTabbedPaneUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java,v
retrieving revision 1.3.16.11
diff -u -r1.3.16.11 BasicTabbedPaneUI.java
--- javax/swing/plaf/basic/BasicTabbedPaneUI.java 9 Sep 2004 02:40:43 -0000 1.3.16.11
+++ javax/swing/plaf/basic/BasicTabbedPaneUI.java 22 Oct 2004 08:05:26 -0000
@@ -1261,16 +1261,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. */