- basic nio apps now work

- removed old Accessible, now use new javax.Accessibility

24 files changed, 74 insertions, 25 deletions

diff --git a/javax/swing/Accessible.java b/javax/swing/Accessible.java
deleted file mode 100644
index 9ace0926b..000000000
--- a/javax/swing/Accessible.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package javax.swing;
-
-
-/**
- * Empty
- *
- * @author Ronald Veldema (rveldema@cs.vu.nl)
- */
-
-public abstract
-interface Accessible
-{
-  AccessibleContext getAccessibleContext();
-}
diff --git a/javax/swing/AccessibleContext.java b/javax/swing/AccessibleContext.java
deleted file mode 100644
index 7c0689cc6..000000000
--- a/javax/swing/AccessibleContext.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package javax.swing;
-
-
-public abstract 
-interface AccessibleContext
-{
-}
diff --git a/javax/swing/JApplet.java b/javax/swing/JApplet.java
index 55c59adf9..66bb1db8b 100644
--- a/javax/swing/JApplet.java
+++ b/javax/swing/JApplet.java
@@ -5,6 +5,11 @@ import java.awt.*;
 import java.awt.event.*;
 
 
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
+
 
 public class JApplet extends Applet
 {
@@ -86,7 +91,7 @@ public class JApplet extends Applet
     protected  void addImpl(Component comp, Object constraints, int index)
     {   super.addImpl(comp, constraints, index);    }
   
-    AccessibleContext getAccessibleContext()
+    public AccessibleContext getAccessibleContext()
     {    return null;  }
   
     int getDefaultCloseOperation()
diff --git a/javax/swing/JButton.java b/javax/swing/JButton.java
index 07e83b3af..6f47e45f5 100644
--- a/javax/swing/JButton.java
+++ b/javax/swing/JButton.java
@@ -3,7 +3,7 @@ package javax.swing;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.plaf.*;
-
+import javax.accessibility.*;
 
 /**
  * An instance of JButton can be added to a panel, frame etc
diff --git a/javax/swing/JCheckBox.java b/javax/swing/JCheckBox.java
index 4991770df..382f6b509 100644
--- a/javax/swing/JCheckBox.java
+++ b/javax/swing/JCheckBox.java
@@ -3,6 +3,7 @@ package javax.swing;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.plaf.*;
+import javax.accessibility.*;
 
 /**
  * An instance of JCheckbox can be added to a panel, frame etc
diff --git a/javax/swing/JComponent.java b/javax/swing/JComponent.java
index e78c0baff..ebea9431d 100644
--- a/javax/swing/JComponent.java
+++ b/javax/swing/JComponent.java
@@ -12,6 +12,12 @@ import javax.swing.plaf.*;
 import java.util.*;
 import java.beans.*;
 
+
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
+
 /**
  * Every component in swing inherits from this class (JLabel, JButton, etc).
  * It contains generic methods to manage events, properties and sizes.
diff --git a/javax/swing/JDialog.java b/javax/swing/JDialog.java
index ade31c644..e150fb540 100644
--- a/javax/swing/JDialog.java
+++ b/javax/swing/JDialog.java
@@ -3,6 +3,12 @@ package javax.swing;
 import java.awt.*;
 import java.awt.event.*;
 
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
+
 
 /**
  * Unlike JComponent derivatives, JDialog inherits from
diff --git a/javax/swing/JEditorPane.java b/javax/swing/JEditorPane.java
index 9ae84bf37..9d9fdae97 100644
--- a/javax/swing/JEditorPane.java
+++ b/javax/swing/JEditorPane.java
@@ -6,6 +6,7 @@ import javax.swing.text.*;
 import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
+import javax.accessibility.*;
 
 public class JEditorPane extends JTextComponent
 {
diff --git a/javax/swing/JFrame.java b/javax/swing/JFrame.java
index 964a2131d..cbb4c62b8 100644
--- a/javax/swing/JFrame.java
+++ b/javax/swing/JFrame.java
@@ -3,6 +3,11 @@ package javax.swing;
 import java.awt.*;
 import java.awt.event.*;
 
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
+
 /**
  * Unlike JComponent derivatives, JFrame inherits from
  * java.awt.Frame. But also lets a look-and-feel component to its work.
diff --git a/javax/swing/JLabel.java b/javax/swing/JLabel.java
index 711867856..01b6def97 100644
--- a/javax/swing/JLabel.java
+++ b/javax/swing/JLabel.java
@@ -4,6 +4,12 @@ import java.awt.*;
 import javax.swing.plaf.*;
 
 
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
+
+
 public class JLabel extends JComponent implements SwingConstants
 {
     String text;
diff --git a/javax/swing/JList.java b/javax/swing/JList.java
index d4c7482fd..5494fa6dc 100644
--- a/javax/swing/JList.java
+++ b/javax/swing/JList.java
@@ -7,6 +7,11 @@ import javax.swing.plaf.*;
 import java.util.*;
 
 
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
+
 public class JList extends JComponent implements Scrollable
 {
     Color select_back, select_fore;
diff --git a/javax/swing/JOptionPane.java b/javax/swing/JOptionPane.java
index d456991ca..8560d5696 100644
--- a/javax/swing/JOptionPane.java
+++ b/javax/swing/JOptionPane.java
@@ -2,6 +2,10 @@ package javax.swing;
 
 import java.awt.*;
 import javax.swing.plaf.*;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
 
 public class JOptionPane extends JComponent 
 {
diff --git a/javax/swing/JPanel.java b/javax/swing/JPanel.java
index 0d78c0481..a2d34a6ab 100644
--- a/javax/swing/JPanel.java
+++ b/javax/swing/JPanel.java
@@ -3,6 +3,12 @@ package javax.swing;
 import java.awt.*;
 import javax.swing.plaf.*;
 
+
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
+
 /**
  * An instance of JPanel can be added to a panel, frame etc
  *
diff --git a/javax/swing/JRadioButton.java b/javax/swing/JRadioButton.java
index 581d83f9d..736446960 100644
--- a/javax/swing/JRadioButton.java
+++ b/javax/swing/JRadioButton.java
@@ -3,6 +3,7 @@ package javax.swing;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.plaf.*;
+import javax.accessibility.*;
 
 public class JRadioButton extends JToggleButton
 {
diff --git a/javax/swing/JRootPane.java b/javax/swing/JRootPane.java
index 8037090b0..26085963f 100644
--- a/javax/swing/JRootPane.java
+++ b/javax/swing/JRootPane.java
@@ -3,6 +3,11 @@ package javax.swing;
 import java.awt.*;
 import java.awt.event.*;
 
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
+
 /**
  * This class is where JComponents are added to.
  * Unlike awt where you could just say frame.add(),
diff --git a/javax/swing/JTabbedPane.java b/javax/swing/JTabbedPane.java
index 72b754c86..fb1209fac 100644
--- a/javax/swing/JTabbedPane.java
+++ b/javax/swing/JTabbedPane.java
@@ -4,6 +4,12 @@ import java.util.*;
 import javax.swing.plaf.*;
 import java.awt.*;
 
+
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
+
 public class JTabbedPane extends JComponent
 {
     class Tab
diff --git a/javax/swing/JTextField.java b/javax/swing/JTextField.java
index 05446cfcb..036a348ff 100644
--- a/javax/swing/JTextField.java
+++ b/javax/swing/JTextField.java
@@ -3,6 +3,10 @@ package javax.swing;
 import java.awt.event.*;
 import java.util.*;
 
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
 
 public class JTextField extends JEditorPane
 {
diff --git a/javax/swing/JToggleButton.java b/javax/swing/JToggleButton.java
index 6b3bb6292..c7a0c59f0 100644
--- a/javax/swing/JToggleButton.java
+++ b/javax/swing/JToggleButton.java
@@ -3,6 +3,7 @@ package javax.swing;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.plaf.*;
+import javax.accessibility.*;
 
 public class JToggleButton extends AbstractButton
 {
diff --git a/javax/swing/JTree.java b/javax/swing/JTree.java
index e9d345c57..c8acc8eae 100644
--- a/javax/swing/JTree.java
+++ b/javax/swing/JTree.java
@@ -2,6 +2,7 @@ package javax.swing;
 
 import java.awt.*;
 import javax.swing.plaf.*;
+import javax.accessibility.*;
 
 public class JTree extends JComponent implements Scrollable, Accessible
 {
diff --git a/javax/swing/JWindow.java b/javax/swing/JWindow.java
index f68855a62..0e0b01121 100644
--- a/javax/swing/JWindow.java
+++ b/javax/swing/JWindow.java
@@ -2,7 +2,7 @@ package javax.swing;
 
 import java.awt.*;
 import java.awt.event.*;
-
+import javax.accessibility.*;
 
 
 /**
diff --git a/javax/swing/plaf/ComponentUI.java b/javax/swing/plaf/ComponentUI.java
index 9d76dde22..cdccbabbe 100644
--- a/javax/swing/plaf/ComponentUI.java
+++ b/javax/swing/plaf/ComponentUI.java
@@ -4,6 +4,7 @@ import java.awt.*;
 import javax.swing.border.*;
 import javax.swing.*;
 
+import javax.accessibility.*;
 
 public abstract class ComponentUI 
     implements UIResource // ??
diff --git a/javax/swing/plaf/OptionPaneUI.java b/javax/swing/plaf/OptionPaneUI.java
index 115b2d716..01a10d1f2 100644
--- a/javax/swing/plaf/OptionPaneUI.java
+++ b/javax/swing/plaf/OptionPaneUI.java
@@ -1,4 +1,5 @@
 package javax.swing.plaf;
+import javax.accessibility.*;
 
 public class OptionPaneUI extends ComponentUI
 {
diff --git a/javax/swing/plaf/basic/BasicOptionPaneUI.java b/javax/swing/plaf/basic/BasicOptionPaneUI.java
index 57d6f15e9..bfb6cbadf 100644
--- a/javax/swing/plaf/basic/BasicOptionPaneUI.java
+++ b/javax/swing/plaf/basic/BasicOptionPaneUI.java
@@ -4,7 +4,7 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.plaf.*;
-
+import javax.accessibility.*;
 
 public class BasicOptionPaneUI extends OptionPaneUI
 {
diff --git a/javax/swing/text/JTextComponent.java b/javax/swing/text/JTextComponent.java
index a148943b0..0e441b717 100644
--- a/javax/swing/text/JTextComponent.java
+++ b/javax/swing/text/JTextComponent.java
@@ -5,6 +5,11 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 
 
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
+
 public class JTextComponent extends JComponent
 {
     public class KeyBinding