1 files changed, 355 insertions, 0 deletions
diff --git a/javax/swing/JTable.java b/javax/swing/JTable.java
index 05c15bab4..b809149e4 100644
--- a/javax/swing/JTable.java
+++ b/javax/swing/JTable.java
@@ -56,6 +56,10 @@ import java.util.Vector;
 
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleExtendedTable;
+import javax.accessibility.AccessibleSelection;
+import javax.accessibility.AccessibleTable;
+import javax.accessibility.AccessibleTableModelChange;
 import javax.swing.event.CellEditorListener;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ListSelectionEvent;
@@ -80,6 +84,357 @@ public class JTable extends JComponent
   implements TableModelListener, Scrollable, TableColumnModelListener,
              ListSelectionListener, CellEditorListener, Accessible
 {
+  protected class AccessibleJTable extends AccessibleJComponent
+    implements AccessibleSelection, ListSelectionListener, TableModelListener,
+    TableColumnModelListener, CellEditorListener, PropertyChangeListener,
+    AccessibleExtendedTable
+  {
+
+    protected class AccessibleJTableModelChange
+      implements AccessibleTableModelChange
+    {
+      protected int type;
+      protected int firstRow;
+      protected int lastRow;
+      protected int firstColumn;
+      protected int lastColumn;
+
+      protected AccessibleJTableModelChange(int type, int firstRow,
+                                            int lastRow, int firstColumn,
+                                            int lastColumn)
+      {
+        this.type = type;
+        this.firstRow = firstRow;
+        this.lastRow = lastRow;
+        this.firstColumn = firstColumn;
+        this.lastColumn = lastColumn;
+      }
+
+      public int getType()
+      {
+        return type;
+      }
+
+      public int getFirstRow()
+      {
+        return firstRow;
+      }
+
+      public int getLastRow()
+      {
+        return lastRow;
+      }
+
+      public int getFirstColumn()
+      {
+        return firstColumn;
+      }
+
+      public int getLastColumn()
+      {
+        return lastColumn;
+      }
+    }
+
+    /**
+     * Creates a new <code>AccessibleJTable</code>.
+     *
+     * @since JDK1.5
+     */
+    protected AccessibleJTable()
+    {
+      getModel().addTableModelListener(this);
+      getSelectionModel().addListSelectionListener(this);
+      getColumnModel().addColumnModelListener(this);
+      getCellEditor().addCellEditorListener(this);
+    }
+
+    public int getAccessibleSelectionCount()
+    {
+      return getSelectedColumnCount();
+    }
+
+    public Accessible getAccessibleSelection(int i)
+    {
+      // TODO Auto-generated method stub
+      return null;
+    }
+
+    public boolean isAccessibleChildSelected(int i)
+    {
+      // TODO Auto-generated method stub
+      return false;
+    }
+
+    public void addAccessibleSelection(int i)
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public void removeAccessibleSelection(int i)
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public void clearAccessibleSelection()
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public void selectAllAccessibleSelection()
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public void valueChanged(ListSelectionEvent event)
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public void tableChanged(TableModelEvent event)
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public void columnAdded(TableColumnModelEvent event)
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public void columnMarginChanged(ChangeEvent event)
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public void columnMoved(TableColumnModelEvent event)
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public void columnRemoved(TableColumnModelEvent event)
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public void columnSelectionChanged(ListSelectionEvent event)
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public void editingCanceled(ChangeEvent event)
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public void editingStopped(ChangeEvent event)
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    /**
+     * Receives notification when any of the JTable's properties changes. This
+     * is used to replace the listeners on the table's model, selection model,
+     * column model and cell editor.
+     *
+     * @param e the property change event
+     */
+    public void propertyChange(PropertyChangeEvent e)
+    {
+      String propName = e.getPropertyName(); 
+      if (propName.equals("tableModel"))
+        {
+          TableModel oldModel = (TableModel) e.getOldValue();
+          oldModel.removeTableModelListener(this);
+          TableModel newModel = (TableModel) e.getNewValue();
+          newModel.addTableModelListener(this);
+        }
+      else if (propName.equals("columnModel"))
+        {
+          TableColumnModel oldModel = (TableColumnModel) e.getOldValue();
+          oldModel.removeColumnModelListener(this);
+          TableColumnModel newModel = (TableColumnModel) e.getNewValue();
+          newModel.addColumnModelListener(this);
+        }
+      else if (propName.equals("selectionModel"))
+        {
+          ListSelectionModel oldModel = (ListSelectionModel) e.getOldValue();
+          oldModel.removeListSelectionListener(this);
+          ListSelectionModel newModel = (ListSelectionModel) e.getNewValue();
+          newModel.addListSelectionListener(this);
+        }
+      else if (propName.equals("cellEditor"))
+        {
+          CellEditor oldEd = (CellEditor) e.getOldValue();
+          oldEd.removeCellEditorListener(this);
+          CellEditor newEd = (CellEditor) e.getNewValue();
+          newEd.addCellEditorListener(this);
+        }
+    }
+
+    public int getAccessibleRow(int index)
+    {
+      // TODO Auto-generated method stub
+      return 0;
+    }
+
+    public int getAccessibleColumn(int index)
+    {
+      // TODO Auto-generated method stub
+      return 0;
+    }
+
+    public int getAccessibleIndex(int r, int c)
+    {
+      // TODO Auto-generated method stub
+      return 0;
+    }
+
+    public Accessible getAccessibleCaption()
+    {
+      // TODO Auto-generated method stub
+      return null;
+    }
+
+    public void setAccessibleCaption(Accessible caption)
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public Accessible getAccessibleSummary()
+    {
+      // TODO Auto-generated method stub
+      return null;
+    }
+
+    public void setAccessibleSummary(Accessible summary)
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public int getAccessibleRowCount()
+    {
+      // TODO Auto-generated method stub
+      return 0;
+    }
+
+    public int getAccessibleColumnCount()
+    {
+      // TODO Auto-generated method stub
+      return 0;
+    }
+
+    public Accessible getAccessibleAt(int r, int c)
+    {
+      // TODO Auto-generated method stub
+      return null;
+    }
+
+    public int getAccessibleRowExtentAt(int r, int c)
+    {
+      // TODO Auto-generated method stub
+      return 0;
+    }
+
+    public int getAccessibleColumnExtentAt(int r, int c)
+    {
+      // TODO Auto-generated method stub
+      return 0;
+    }
+
+    public AccessibleTable getAccessibleRowHeader()
+    {
+      // TODO Auto-generated method stub
+      return null;
+    }
+
+    public void setAccessibleRowHeader(AccessibleTable header)
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public AccessibleTable getAccessibleColumnHeader()
+    {
+      // TODO Auto-generated method stub
+      return null;
+    }
+
+    public void setAccessibleColumnHeader(AccessibleTable header)
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public Accessible getAccessibleRowDescription(int r)
+    {
+      // TODO Auto-generated method stub
+      return null;
+    }
+
+    public void setAccessibleRowDescription(int r, Accessible description)
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public Accessible getAccessibleColumnDescription(int c)
+    {
+      // TODO Auto-generated method stub
+      return null;
+    }
+
+    public void setAccessibleColumnDescription(int c, Accessible description)
+    {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public boolean isAccessibleSelected(int r, int c)
+    {
+      // TODO Auto-generated method stub
+      return false;
+    }
+
+    public boolean isAccessibleRowSelected(int r)
+    {
+      // TODO Auto-generated method stub
+      return false;
+    }
+
+    public boolean isAccessibleColumnSelected(int c)
+    {
+      // TODO Auto-generated method stub
+      return false;
+    }
+
+    public int[] getSelectedAccessibleRows()
+    {
+      // TODO Auto-generated method stub
+      return null;
+    }
+
+    public int[] getSelectedAccessibleColumns()
+    {
+      // TODO Auto-generated method stub
+      return null;
+    }
+      
+  }
   /**
    * Handles property changes from the <code>TableColumn</code>s of this
    * <code>JTable</code>.