This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[GUI] Patch: javax.swing - accessibility classes
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Tue, 8 Jun 2004 11:37:30 +0200
- Subject: [GUI] Patch: javax.swing - accessibility classes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I just commited the attached patch to fix most accessibility classes
in Swing.
Michael
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractButton.java,
javax/swing/CellRendererPane.java,
javax/swing/JCheckBoxMenuItem.java,
javax/swing/JColorChooser.java,
javax/swing/JComboBox.java,
javax/swing/JComponent.java,
javax/swing/JDesktopPane.java,
javax/swing/JFileChooser.java,
javax/swing/JMenu.java,
javax/swing/JMenuItem.java,
javax/swing/JOptionPane.java,
javax/swing/JPasswordField.java,
javax/swing/JPopupMenu.java,
javax/swing/JProgressBar.java,
javax/swing/JRadioButtonMenuItem.java,
javax/swing/JScrollBar.java,
javax/swing/JSeparator.java,
javax/swing/JSlider.java,
javax/swing/JSplitPane.java,
javax/swing/JTabbedPane.java,
javax/swing/JTextField.java,
javax/swing/JToolBar.java,
javax/swing/text/JTextComponent.java:
Fixed all constructors of accessibility classes.
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFAxYjbWSOgCCdjSDsRAqP4AJ9VvLqLglVu4WwRnkUyMPPPjcKZ6ACggVkg
rjPNJm3AcYn3a83DGJfJdQE=
=/PUR
-----END PGP SIGNATURE-----
Index: javax/swing/AbstractButton.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/AbstractButton.java,v
retrieving revision 1.5.2.3
diff -u -b -B -r1.5.2.3 AbstractButton.java
--- javax/swing/AbstractButton.java 7 Jun 2004 14:00:31 -0000 1.5.2.3
+++ javax/swing/AbstractButton.java 8 Jun 2004 09:21:33 -0000
@@ -296,9 +296,8 @@
{
private static final long serialVersionUID = -5673062525319836790L;
- protected AccessibleAbstractButton(JComponent c)
+ protected AccessibleAbstractButton()
{
- super(c);
}
public AccessibleStateSet getAccessibleStateSet()
Index: javax/swing/CellRendererPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/CellRendererPane.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 CellRendererPane.java
--- javax/swing/CellRendererPane.java 5 Feb 2004 18:48:53 -0000 1.3
+++ javax/swing/CellRendererPane.java 8 Jun 2004 09:21:33 -0000
@@ -56,50 +56,30 @@
{
private static final long serialVersionUID = -7642183829532984273L;
- //-------------------------------------------------------------
- // Classes ----------------------------------------------------
- //-------------------------------------------------------------
-
/**
* AccessibleCellRendererPane
*/
- protected class AccessibleCellRendererPane extends AccessibleAWTContainer {
-
- private static final long serialVersionUID = 7300340301783504481L;
-
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
+ protected class AccessibleCellRendererPane extends AccessibleAWTContainer
+ {
+ private static final long serialVersionUID = -8981090083147391074L;
/**
* Constructor AccessibleCellRendererPane
* @param component TODO
*/
- protected AccessibleCellRendererPane(CellRendererPane component) {
- super();
- // TODO
- } // AccessibleCellRendererPane()
-
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
+ protected AccessibleCellRendererPane()
+ {
+ }
/**
* getAccessibleRole
* @returns AccessibleRole
*/
- public AccessibleRole getAccessibleRole() {
+ public AccessibleRole getAccessibleRole()
+ {
return AccessibleRole.PANEL;
- } // getAccessibleRole()
-
-
- } // AccessibleCellRendererPane
-
-
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
+ }
+ }
/**
* accessibleContext
@@ -211,14 +191,13 @@
/**
* getAccessibleContext
- * @returns AccessibleContext
+ * @return AccessibleContext
*/
- public AccessibleContext getAccessibleContext() {
- if (accessibleContext == null) {
- accessibleContext = new AccessibleCellRendererPane(this);
- } // if
- return accessibleContext;
- } // getAccessibleContext()
+ public AccessibleContext getAccessibleContext()
+ {
+ if (accessibleContext == null)
+ accessibleContext = new AccessibleCellRendererPane();
-
-} // CellRendererPane
+ return accessibleContext;
+ }
+}
Index: javax/swing/JCheckBoxMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JCheckBoxMenuItem.java,v
retrieving revision 1.3.8.5
diff -u -b -B -r1.3.8.5 JCheckBoxMenuItem.java
--- javax/swing/JCheckBoxMenuItem.java 7 Jun 2004 12:41:08 -0000 1.3.8.5
+++ javax/swing/JCheckBoxMenuItem.java 8 Jun 2004 09:21:33 -0000
@@ -209,7 +209,7 @@
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
- accessibleContext = new AccessibleJCheckBoxMenuItem(this);
+ accessibleContext = new AccessibleJCheckBoxMenuItem();
return accessibleContext;
}
@@ -223,14 +223,9 @@
/**
* Creates a new AccessibleJCheckBoxMenuItem object.
- *
- * @param component DOCUMENT ME!
*/
- protected AccessibleJCheckBoxMenuItem(JCheckBoxMenuItem component)
+ protected AccessibleJCheckBoxMenuItem()
{
- super(component);
-
- // TODO
}
/**
Index: javax/swing/JColorChooser.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JColorChooser.java,v
retrieving revision 1.2.18.1
diff -u -b -B -r1.2.18.1 JColorChooser.java
--- javax/swing/JColorChooser.java 7 Jun 2004 12:41:08 -0000 1.2.18.1
+++ javax/swing/JColorChooser.java 8 Jun 2004 09:21:33 -0000
@@ -83,15 +83,9 @@
* Constructor AccessibleJColorChooser
* @param component TODO
*/
- protected AccessibleJColorChooser(JColorChooser component) {
- super(component);
- // TODO
- } // AccessibleJColorChooser()
-
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
+ protected AccessibleJColorChooser()
+ {
+ }
/**
* getAccessibleRole
@@ -361,14 +355,13 @@
/**
* getAccessibleContext
- * @returns AccessibleContext
+ * @return AccessibleContext
*/
- public AccessibleContext getAccessibleContext() {
- if (accessibleContext == null) {
- accessibleContext = new AccessibleJColorChooser(this);
- } // if
- return accessibleContext;
- } // getAccessibleContext()
+ public AccessibleContext getAccessibleContext()
+ {
+ if (accessibleContext == null)
+ accessibleContext = new AccessibleJColorChooser();
-
-} // JColorChooser
+ return accessibleContext;
+ }
+}
Index: javax/swing/JComboBox.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JComboBox.java,v
retrieving revision 1.5.2.1
diff -u -b -B -r1.5.2.1 JComboBox.java
--- javax/swing/JComboBox.java 7 Jun 2004 14:00:32 -0000 1.5.2.1
+++ javax/swing/JComboBox.java 8 Jun 2004 09:21:33 -0000
@@ -69,39 +69,21 @@
{
private static final long serialVersionUID = 5654585963292734470L;
-
- //-------------------------------------------------------------
- // Classes ----------------------------------------------------
- //-------------------------------------------------------------
-
/**
* AccessibleJComboBox
*/
protected class AccessibleJComboBox extends AccessibleJComponent
- implements AccessibleAction, AccessibleSelection {
-
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
-
-
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
+ implements AccessibleAction, AccessibleSelection
+ {
+ private static final long serialVersionUID = 8217828307256675666L;
/**
* Constructor AccessibleJComboBox
* @param component TODO
*/
- protected AccessibleJComboBox(JComboBox component) {
- super(component);
- // TODO
- } // AccessibleJComboBox()
-
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
+ protected AccessibleJComboBox()
+ {
+ }
/**
* getAccessibleChildrenCount
@@ -808,12 +790,14 @@
* getAccessibleContext
* @returns AccessibleContext
*/
- public AccessibleContext getAccessibleContext() {
- if (accessibleContext == null) {
- accessibleContext = new AccessibleJComboBox(this);
- } // if
+ public AccessibleContext getAccessibleContext()
+ {
+ if (accessibleContext == null)
+ accessibleContext = new AccessibleJComboBox();
+
return accessibleContext;
- } // getAccessibleContext()
+ }
+
/**
* addActionListener
* @param listener TODO
Index: javax/swing/JComponent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JComponent.java,v
retrieving revision 1.7.2.8
diff -u -b -B -r1.7.2.8 JComponent.java
--- javax/swing/JComponent.java 7 Jun 2004 14:00:32 -0000 1.7.2.8
+++ javax/swing/JComponent.java 8 Jun 2004 09:21:34 -0000
@@ -101,7 +101,7 @@
protected class AccessibleFocusHandler
implements FocusListener
{
- protected AccessibleFocusHandler(AccessibleJComponent component){}
+ protected AccessibleFocusHandler(){}
public void focusGained(FocusEvent event){}
public void focusLost(FocusEvent valevent){}
}
@@ -109,7 +109,7 @@
protected class AccessibleContainerHandler
implements ContainerListener
{
- protected AccessibleContainerHandler(AccessibleJComponent component) {}
+ protected AccessibleContainerHandler() {}
public void componentAdded(ContainerEvent event) {}
public void componentRemoved(ContainerEvent valevent) {}
}
@@ -119,7 +119,7 @@
protected ContainerListener accessibleContainerHandler;
protected FocusListener accessibleFocusHandler;
- protected AccessibleJComponent(JComponent component) {}
+ protected AccessibleJComponent() {}
public void addPropertyChangeListener(PropertyChangeListener listener) {}
public void removePropertyChangeListener(PropertyChangeListener listener) {}
public int getAccessibleChildrenCount() { return 0; }
Index: javax/swing/JDesktopPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JDesktopPane.java,v
retrieving revision 1.3.8.1
diff -u -b -B -r1.3.8.1 JDesktopPane.java
--- javax/swing/JDesktopPane.java 7 Jun 2004 12:41:08 -0000 1.3.8.1
+++ javax/swing/JDesktopPane.java 8 Jun 2004 09:21:34 -0000
@@ -53,49 +53,30 @@
{
private static final long serialVersionUID = 766333777224038726L;
-
- //-------------------------------------------------------------
- // Classes ----------------------------------------------------
- //-------------------------------------------------------------
-
/**
* AccessibleJDesktopPane
*/
- protected class AccessibleJDesktopPane extends AccessibleJComponent {
-
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
+ protected class AccessibleJDesktopPane extends AccessibleJComponent
+ {
+ private static final long serialVersionUID = 6079388927946077570L;
/**
* Constructor AccessibleJDesktopPane
* @param component TODO
*/
- protected AccessibleJDesktopPane(JDesktopPane component) {
- super(component);
- // TODO
- } // AccessibleJDesktopPane()
-
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
+ protected AccessibleJDesktopPane()
+ {
+ }
/**
* getAccessibleRole
* @returns AccessibleRole
*/
- public AccessibleRole getAccessibleRole() {
+ public AccessibleRole getAccessibleRole()
+ {
return AccessibleRole.DESKTOP_PANE;
- } // getAccessibleRole()
-
-
- } // AccessibleJDesktopPane
-
-
- //-------------------------------------------------------------
- // Constants --------------------------------------------------
- //-------------------------------------------------------------
+ }
+ }
/**
* LIVE_DRAG_MODE
@@ -278,12 +259,11 @@
* getAccessibleContext
* @returns AccessibleContext
*/
- public AccessibleContext getAccessibleContext() {
- if (accessibleContext == null) {
- accessibleContext = new AccessibleJDesktopPane(this);
- } // if
- return accessibleContext;
- } // getAccessibleContext()
+ public AccessibleContext getAccessibleContext()
+ {
+ if (accessibleContext == null)
+ accessibleContext = new AccessibleJDesktopPane();
-
-} // JDesktopPane
+ return accessibleContext;
+ }
+}
Index: javax/swing/JFileChooser.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JFileChooser.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 JFileChooser.java
--- javax/swing/JFileChooser.java 5 Feb 2004 18:48:53 -0000 1.3
+++ javax/swing/JFileChooser.java 8 Jun 2004 09:21:34 -0000
@@ -61,55 +61,30 @@
private static final long serialVersionUID = 3162921138695327837L;
- //-------------------------------------------------------------
- // Classes ----------------------------------------------------
- //-------------------------------------------------------------
-
/**
* AccessibleJFileChooser
*/
- protected class AccessibleJFileChooser extends AccessibleJComponent {
-
- private static final long serialVersionUID = 3318922050345221200L;
-
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
-
-
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
+ protected class AccessibleJFileChooser extends AccessibleJComponent
+ {
+ private static final long serialVersionUID = 8205148454060169244L;
/**
* Constructor AccessibleJFileChooser
* @param component TODO
*/
- protected AccessibleJFileChooser(JFileChooser component) {
- super(component);
- // TODO
- } // AccessibleJFileChooser()
-
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
+ protected AccessibleJFileChooser()
+ {
+ }
/**
* getAccessibleRole
- * @returns AccessibleRole
+ * @return AccessibleRole
*/
- public AccessibleRole getAccessibleRole() {
+ public AccessibleRole getAccessibleRole()
+ {
return AccessibleRole.FILE_CHOOSER;
- } // getAccessibleRole()
-
-
- } // AccessibleJFileChooser
-
-
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
+ }
+ }
/**
* uiClassID
@@ -973,12 +948,11 @@
* getAccessibleContext
* @returns AccessibleContext
*/
- public AccessibleContext getAccessibleContext() {
- if (accessibleContext == null) {
- accessibleContext = new AccessibleJFileChooser(this);
- } // if
- return accessibleContext;
- } // getAccessibleContext()
-
+ public AccessibleContext getAccessibleContext()
+ {
+ if (accessibleContext == null)
+ accessibleContext = new AccessibleJFileChooser();
-} // JFileChooser
+ return accessibleContext;
+ }
+}
Index: javax/swing/JMenu.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JMenu.java,v
retrieving revision 1.3.8.3
diff -u -b -B -r1.3.8.3 JMenu.java
--- javax/swing/JMenu.java 7 Jun 2004 12:41:08 -0000 1.3.8.3
+++ javax/swing/JMenu.java 8 Jun 2004 09:21:34 -0000
@@ -673,7 +673,7 @@
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
- accessibleContext = new AccessibleJMenu(this);
+ accessibleContext = new AccessibleJMenu();
return accessibleContext;
}
@@ -688,12 +688,9 @@
/**
* Creates a new AccessibleJMenu object.
- *
- * @param component DOCUMENT ME!
*/
- protected AccessibleJMenu(JMenu component)
+ protected AccessibleJMenu()
{
- super(component);
}
/**
@@ -820,7 +817,7 @@
* @param value0 DOCUMENT ME!
* @param value1 DOCUMENT ME!
*/
- public WinListener(JMenu value0, JPopupMenu value1)
+ public WinListener(JPopupMenu value1)
{
}
Index: javax/swing/JMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JMenuItem.java,v
retrieving revision 1.2.18.6
diff -u -b -B -r1.2.18.6 JMenuItem.java
--- javax/swing/JMenuItem.java 7 Jun 2004 12:41:09 -0000 1.2.18.6
+++ javax/swing/JMenuItem.java 8 Jun 2004 09:21:34 -0000
@@ -578,7 +578,7 @@
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
- accessibleContext = new AccessibleJMenuItem(this);
+ accessibleContext = new AccessibleJMenuItem();
return accessibleContext;
}
@@ -593,14 +593,9 @@
/**
* Creates a new AccessibleJMenuItem object.
- *
- * @param component DOCUMENT ME!
*/
- AccessibleJMenuItem(JMenuItem component)
+ AccessibleJMenuItem()
{
- super(component);
-
- // TODO
}
/**
Index: javax/swing/JOptionPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JOptionPane.java,v
retrieving revision 1.3.2.3
diff -u -b -B -r1.3.2.3 JOptionPane.java
--- javax/swing/JOptionPane.java 8 Jun 2004 08:42:53 -0000 1.3.2.3
+++ javax/swing/JOptionPane.java 8 Jun 2004 09:21:34 -0000
@@ -67,7 +67,6 @@
*/
protected AccessibleJOptionPane()
{
- super(JOptionPane.this);
}
/**
Index: javax/swing/JPasswordField.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JPasswordField.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 JPasswordField.java
--- javax/swing/JPasswordField.java 12 Feb 2004 00:17:23 -0000 1.4
+++ javax/swing/JPasswordField.java 8 Jun 2004 09:21:34 -0000
@@ -49,55 +49,31 @@
* @author Andrew Selkirk
* @version 1.0
*/
-public class JPasswordField extends JTextField {
-
- //-------------------------------------------------------------
- // Classes ----------------------------------------------------
- //-------------------------------------------------------------
-
+public class JPasswordField extends JTextField
+{
/**
* AccessibleJPasswordField
*/
- protected class AccessibleJPasswordField extends AccessibleJTextField {
-
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
-
-
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
+ protected class AccessibleJPasswordField extends AccessibleJTextField
+ {
+ private static final long serialVersionUID = -8477039424200681086L;
/**
* Constructor AccessibleJPasswordField
- * @param component TODO
*/
- protected AccessibleJPasswordField(JPasswordField component) {
- super(component);
- // TODO
- } // AccessibleJPasswordField()
-
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
+ protected AccessibleJPasswordField()
+ {
+ }
/**
* getAccessibleRole
- * @returns AccessibleRole
+ * @return AccessibleRole
*/
- public AccessibleRole getAccessibleRole() {
+ public AccessibleRole getAccessibleRole()
+ {
return AccessibleRole.PASSWORD_TEXT;
- } // getAccessibleRole()
-
-
- } // AccessibleJPasswordField
-
-
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
+ }
+ }
/**
* uiClassID
@@ -256,14 +232,13 @@
/**
* getAccessibleContext
- * @returns AccessibleContext
+ * @return AccessibleContext
*/
- public AccessibleContext getAccessibleContext() {
- if (accessibleContext == null) {
- accessibleContext = new AccessibleJPasswordField(this);
- } // if
- return accessibleContext;
- } // getAccessibleContext()
-
+ public AccessibleContext getAccessibleContext()
+ {
+ if (accessibleContext == null)
+ accessibleContext = new AccessibleJPasswordField();
-} // JPasswordField
+ return accessibleContext;
+ }
+}
Index: javax/swing/JPopupMenu.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JPopupMenu.java,v
retrieving revision 1.3.8.5
diff -u -b -B -r1.3.8.5 JPopupMenu.java
--- javax/swing/JPopupMenu.java 7 Jun 2004 12:41:10 -0000 1.3.8.5
+++ javax/swing/JPopupMenu.java 8 Jun 2004 09:21:35 -0000
@@ -798,7 +798,7 @@
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
- accessibleContext = new AccessibleJPopupMenu(this);
+ accessibleContext = new AccessibleJPopupMenu();
return accessibleContext;
}
@@ -984,9 +984,8 @@
*
* @param component DOCUMENT ME!
*/
- protected AccessibleJPopupMenu(JPopupMenu component)
+ protected AccessibleJPopupMenu()
{
- super(component);
}
/**
Index: javax/swing/JProgressBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JProgressBar.java,v
retrieving revision 1.3.8.6
diff -u -b -B -r1.3.8.6 JProgressBar.java
--- javax/swing/JProgressBar.java 7 Jun 2004 14:00:33 -0000 1.3.8.6
+++ javax/swing/JProgressBar.java 8 Jun 2004 09:21:35 -0000
@@ -92,9 +92,8 @@
*
* @param component TODO
*/
- protected AccessibleJProgressBar(JProgressBar component)
+ protected AccessibleJProgressBar()
{
- super(component);
}
/**
@@ -665,7 +664,8 @@
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
- accessibleContext = new AccessibleJProgressBar(this);
+ accessibleContext = new AccessibleJProgressBar();
+
return accessibleContext;
}
}
Index: javax/swing/JRadioButtonMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JRadioButtonMenuItem.java,v
retrieving revision 1.3.8.6
diff -u -b -B -r1.3.8.6 JRadioButtonMenuItem.java
--- javax/swing/JRadioButtonMenuItem.java 7 Jun 2004 12:41:11 -0000 1.3.8.6
+++ javax/swing/JRadioButtonMenuItem.java 8 Jun 2004 09:21:35 -0000
@@ -187,7 +187,7 @@
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
- accessibleContext = new AccessibleJRadioButtonMenuItem(this);
+ accessibleContext = new AccessibleJRadioButtonMenuItem();
return accessibleContext;
}
@@ -201,14 +201,9 @@
/**
* Creates a new AccessibleJRadioButtonMenuItem object.
- *
- * @param component DOCUMENT ME!
*/
- protected AccessibleJRadioButtonMenuItem(JRadioButtonMenuItem component)
+ protected AccessibleJRadioButtonMenuItem()
{
- super(component);
-
- // TODO
}
/**
Index: javax/swing/JScrollBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JScrollBar.java,v
retrieving revision 1.2.18.5
diff -u -b -B -r1.2.18.5 JScrollBar.java
--- javax/swing/JScrollBar.java 7 Jun 2004 14:00:34 -0000 1.2.18.5
+++ javax/swing/JScrollBar.java 8 Jun 2004 09:21:35 -0000
@@ -74,9 +74,9 @@
*
* @param value0 DOCUMENT ME!
*/
- protected AccessibleJScrollBar(JScrollBar value0)
+ protected AccessibleJScrollBar()
{
- super(value0);
+ super();
}
/**
@@ -729,7 +729,7 @@
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
- accessibleContext = new AccessibleJScrollBar(this);
+ accessibleContext = new AccessibleJScrollBar();
return accessibleContext;
}
}
Index: javax/swing/JSeparator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JSeparator.java,v
retrieving revision 1.3.8.4
diff -u -b -B -r1.3.8.4 JSeparator.java
--- javax/swing/JSeparator.java 7 Jun 2004 14:00:34 -0000 1.3.8.4
+++ javax/swing/JSeparator.java 8 Jun 2004 09:21:35 -0000
@@ -62,9 +62,8 @@
*
* @param component TODO
*/
- protected AccessibleJSeparator(JSeparator component)
+ protected AccessibleJSeparator()
{
- super(component);
}
/**
@@ -202,7 +201,8 @@
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
- accessibleContext = new AccessibleJSeparator(this);
+ accessibleContext = new AccessibleJSeparator();
+
return accessibleContext;
}
}
Index: javax/swing/JSlider.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JSlider.java,v
retrieving revision 1.3.18.9
diff -u -b -B -r1.3.18.9 JSlider.java
--- javax/swing/JSlider.java 7 Jun 2004 14:00:34 -0000 1.3.18.9
+++ javax/swing/JSlider.java 8 Jun 2004 09:21:35 -0000
@@ -129,9 +129,8 @@
*
* @param value0 DOCUMENT ME!
*/
- protected AccessibleJSlider(JSlider value0)
+ protected AccessibleJSlider()
{
- super(value0);
}
/**
@@ -935,7 +934,8 @@
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
- accessibleContext = new AccessibleJSlider(this);
+ accessibleContext = new AccessibleJSlider();
+
return accessibleContext;
}
}
Index: javax/swing/JSplitPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JSplitPane.java,v
retrieving revision 1.2.8.2
diff -u -b -B -r1.2.8.2 JSplitPane.java
--- javax/swing/JSplitPane.java 7 Jun 2004 12:41:11 -0000 1.2.8.2
+++ javax/swing/JSplitPane.java 8 Jun 2004 09:21:35 -0000
@@ -70,9 +70,8 @@
*
* @param value0 DOCUMENT ME!
*/
- protected AccessibleJSplitPane(JSplitPane value0)
+ protected AccessibleJSplitPane()
{
- super(value0);
}
/**
@@ -352,7 +351,8 @@
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
- accessibleContext = new AccessibleJSplitPane(this);
+ accessibleContext = new AccessibleJSplitPane();
+
return accessibleContext;
}
Index: javax/swing/JTabbedPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTabbedPane.java,v
retrieving revision 1.3.2.3
diff -u -b -B -r1.3.2.3 JTabbedPane.java
--- javax/swing/JTabbedPane.java 7 Jun 2004 14:00:35 -0000 1.3.2.3
+++ javax/swing/JTabbedPane.java 8 Jun 2004 09:21:36 -0000
@@ -86,9 +86,9 @@
*
* @param c DOCUMENT ME!
*/
- public AccessibleJTabbedPane(JTabbedPane c)
+ public AccessibleJTabbedPane()
{
- super(c);
+ super();
}
/**
@@ -1482,7 +1482,7 @@
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
- accessibleContext = new AccessibleJTabbedPane(this);
+ accessibleContext = new AccessibleJTabbedPane();
return accessibleContext;
}
}
Index: javax/swing/JTextField.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTextField.java,v
retrieving revision 1.2.18.1
diff -u -b -B -r1.2.18.1 JTextField.java
--- javax/swing/JTextField.java 7 Jun 2004 14:00:35 -0000 1.2.18.1
+++ javax/swing/JTextField.java 8 Jun 2004 09:21:36 -0000
@@ -45,8 +45,8 @@
import javax.swing.text.Document;
public class JTextField extends JEditorPane
+ implements SwingConstants
{
-
/**
* AccessibleJTextField
*/
@@ -50,37 +50,28 @@
/**
* AccessibleJTextField
*/
- protected class AccessibleJTextField extends AccessibleJTextComponent {
-
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
+ protected class AccessibleJTextField extends AccessibleJTextComponent
+ {
+ private static final long serialVersionUID = 8255147276740453036L;
/**
* Constructor AccessibleJTextField
- * @param component TODO
*/
- protected AccessibleJTextField(JTextField component) {
- super(component);
- // TODO
- } // AccessibleJTextField()
-
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
+ protected AccessibleJTextField()
+ {
+ }
/**
* getAccessibleStateSet
- * @returns AccessibleStateSet
+ * @return AccessibleStateSet
*/
- public AccessibleStateSet getAccessibleStateSet() {
- return null; // TODO
- } // getAccessibleStateSet()
-
-
- } // AccessibleJTextField
+ public AccessibleStateSet getAccessibleStateSet()
+ {
+ return null;
+ }
+ }
+ private static final long serialVersionUID = 353853209832607592L;
Vector actions = new Vector();
Index: javax/swing/JToolBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JToolBar.java,v
retrieving revision 1.3.8.1
diff -u -b -B -r1.3.8.1 JToolBar.java
--- javax/swing/JToolBar.java 7 Jun 2004 14:00:35 -0000 1.3.8.1
+++ javax/swing/JToolBar.java 8 Jun 2004 09:21:36 -0000
@@ -59,58 +59,46 @@
public class JToolBar extends JComponent
implements SwingConstants, Accessible
{
-
- //-------------------------------------------------------------
- // Classes ----------------------------------------------------
- //-------------------------------------------------------------
-
/**
* AccessibleJToolBar
*/
- protected class AccessibleJToolBar extends AccessibleJComponent {
-
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
+ protected class AccessibleJToolBar extends AccessibleJComponent
+ {
+ private static final long serialVersionUID = -5516888265903814215L;
/**
* Constructor AccessibleJToolBar
- * @param component TODO
*/
- protected AccessibleJToolBar(JToolBar component) {
- super(component);
- // TODO
- } // AccessibleJToolBar()
-
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
+ protected AccessibleJToolBar()
+ {
+ }
/**
* getAccessibleStateSet
- * @returns AccessibleStateSet
+ * @return AccessibleStateSet
*/
- public AccessibleStateSet getAccessibleStateSet() {
+ public AccessibleStateSet getAccessibleStateSet()
+ {
return null; // TODO
- } // getAccessibleStateSet()
+ }
/**
* getAccessibleRole
- * @returns AccessibleRole
+ * @return AccessibleRole
*/
- public AccessibleRole getAccessibleRole() {
+ public AccessibleRole getAccessibleRole()
+ {
return AccessibleRole.TOOL_BAR;
- } // getAccessibleRole()
-
-
- } // AccessibleJToolBar
+ }
+ }
/**
* Separator
*/
public static class Separator extends JSeparator {
+ private static final long serialVersionUID = -1656745644823105219L;
+
//-------------------------------------------------------------
// Variables --------------------------------------------------
//-------------------------------------------------------------
@@ -197,6 +185,8 @@
} // Separator
+ private static final long serialVersionUID = -1269915519555129643L;
+
//-------------------------------------------------------------
// Variables --------------------------------------------------
//-------------------------------------------------------------
@@ -461,14 +451,13 @@
/**
* getAccessibleContext
- * @returns AccessibleContext
+ * @return AccessibleContext
*/
- public AccessibleContext getAccessibleContext() {
- if (accessibleContext == null) {
- accessibleContext = new AccessibleJToolBar(this);
- } // if
- return accessibleContext;
- } // getAccessibleContext()
+ public AccessibleContext getAccessibleContext()
+ {
+ if (accessibleContext == null)
+ accessibleContext = new AccessibleJToolBar();
-
-} // JToolBar
+ return accessibleContext;
+ }
+}
Index: javax/swing/text/JTextComponent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/JTextComponent.java,v
retrieving revision 1.4.2.1
diff -u -b -B -r1.4.2.1 JTextComponent.java
--- javax/swing/text/JTextComponent.java 22 Mar 2004 23:38:20 -0000 1.4.2.1
+++ javax/swing/text/JTextComponent.java 8 Jun 2004 09:21:36 -0000
@@ -93,9 +93,7 @@
* Constructor AccessibleJTextComponent
* @param component TODO
*/
- public AccessibleJTextComponent(JTextComponent component) {
- super(component);
- // TODO
+ public AccessibleJTextComponent() {
} // AccessibleJTextComponent()