Index: javax/swing/JTree.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JTree.java,v
retrieving revision 1.8
diff -u -r1.8 JTree.java
--- javax/swing/JTree.java	22 Jul 2004 19:45:39 -0000	1.8
+++ javax/swing/JTree.java	26 Sep 2004 15:14:52 -0000
@@ -50,10 +50,12 @@
 import javax.swing.event.TreeWillExpandListener;
 import javax.swing.plaf.TreeUI;
 import javax.swing.tree.ExpandVetoException;
+import javax.swing.tree.TreeCellEditor;
 import javax.swing.tree.TreeCellRenderer;
 import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
+import javax.swing.tree.TreeSelectionModel;
 
 
 public class JTree extends JComponent
@@ -61,11 +63,36 @@
 {
   private static final long serialVersionUID = 7559816092864483649L;
 
+  public static final String ANCHOR_SELECTION_PATH_PROPERTY = "anchorSelectionPath";
+  public static final String CELL_EDITOR_PROPERTY = "cellEditor";
+  public static final String CELL_RENDERER_PROPERTY = "cellRenderer";
+  public static final String EDITABLE_PROPERTY = "editable";
+  public static final String EXPANDS_SELECTED_PATHS_PROPERTY = "expandsSelectedPaths";
+  public static final String INVOKES_STOP_CELL_EDITING_PROPERTY = "invokesStopCellEditing";
+  public static final String LARGE_MODEL_PROPERTY = "largeModel";
+  public static final String LEAD_SELECTION_PATH_PROPERTY = "leadSelectionPath";
+  public static final String ROOT_VISIBLE_PROPERTY = "rootVisible";
+  public static final String ROW_HEIGHT_PROPERTY = "rowHeight";
+  public static final String SCROLLS_ON_EXPAND_PROPERTY = "scrollsOnExpand";
+  public static final String SELECTION_MODEL_PROPERTY = "selectionModel";
+  public static final String SHOWS_ROOT_HANDLES_PROPERTY = "showsRootHandles";
+  public static final String TOGGLE_CLICK_COUNT_PROPERTY = "toggleClickCount";
+  public static final String TREE_MODEL_PROPERTY = "model";
+  public static final String VISIBLE_ROW_COUNT_PROPERTY = "visibleRowCount";
+
+  protected TreeCellEditor cellEditor;
   protected TreeCellRenderer cellRenderer;
   protected boolean editable;
+  protected boolean invokesStopCellEditing;
+  protected boolean largeModel;
   protected boolean rootVisible;
+  protected int rowHeight;
+  protected boolean scrollsOnExpand;
+  protected TreeSelectionModel selectionModel;
   protected boolean showsRootHandles;
+  protected int toggleClickCount;
   protected TreeModel treeModel;
+  protected int visibleRowCount;
 
   /**
    * Creates a new <code>JTree</code> object.
@@ -456,11 +483,21 @@
     return showsRootHandles;
   }
 
-  public void setShowRootHandles(boolean flag)
+  public void setShowsRootHandles(boolean flag)
   {
     showsRootHandles = flag;
   }
 
+  public TreeCellEditor getCellEditor()
+  {
+    return cellEditor;
+  }
+
+  public void setCellEditor(TreeCellEditor editor)
+  {
+    cellEditor = editor;
+  }
+  
   public TreeCellRenderer getCellRenderer()
   {
     return cellRenderer;
@@ -470,4 +507,80 @@
   {
     cellRenderer = newRenderer;
   }
+
+  public TreeSelectionModel getSelectionModel()
+  {
+    return selectionModel;
+  }
+
+  public void setSelectionModel(TreeSelectionModel model)
+  {
+    selectionModel = model;
+  }
+
+  public int getVisibleRowCount()
+  {
+    return visibleRowCount;
+  }
+
+  public void setVisibleRowCount(int rows)
+  {
+    visibleRowCount = rows;
+  }
+
+  public boolean isLargeModel()
+  {
+    return largeModel;
+  }
+
+  public void setLargeModel(boolean large)
+  {
+    largeModel = large;
+  }
+
+  public int getRowHeight()
+  {
+    return rowHeight;
+  }
+
+  public void setRowHeight(int height)
+  {
+    rowHeight = height;
+  }
+
+  public boolean getInvokesStopCellEditing()
+  {
+    return invokesStopCellEditing;
+  }
+
+  public void setInvokesStopCellEditing(boolean invoke)
+  {
+    invokesStopCellEditing = invoke;
+  }
+
+  /**
+   * @since 1.3
+   */
+  public int getToggleClickCount()
+  {
+    return toggleClickCount;
+  }
+
+  /**
+   * @since 1.3
+   */
+  public void setToggleClickCount(int count)
+  {
+    toggleClickCount = count;
+  }
+
+  public boolean getScrollsOnExpand()
+  {
+    return scrollsOnExpand;
+  }
+
+  public void setScrollsOnExpand(boolean scroll)
+  {
+    scrollsOnExpand = scroll;
+  }
 }
Index: javax/swing/table/DefaultTableColumnModel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/table/DefaultTableColumnModel.java,v
retrieving revision 1.7
diff -u -r1.7 DefaultTableColumnModel.java
--- javax/swing/table/DefaultTableColumnModel.java	4 Sep 2004 21:14:06 -0000	1.7
+++ javax/swing/table/DefaultTableColumnModel.java	26 Sep 2004 15:14:53 -0000
@@ -288,7 +288,7 @@
 
   /**
    * addColumnModelListener
-   * @param value0 TODO
+   * @param listener the listener to add
    */
   public void addColumnModelListener(TableColumnModelListener listener)
   {
@@ -297,14 +297,23 @@
 
   /**
    * removeColumnModelListener
-   * @param value0 TODO
+   * @param listener the listener to remove
    */
-  public void removeColumnModelListener(TableColumnModelListener value0)
+  public void removeColumnModelListener(TableColumnModelListener listener)
   {
-    // TODO
+    listenerList.remove(TableColumnModelListener.class, listener);
   }
 
   /**
+   * @since 1.4
+   */
+  public TableColumnModelListener[] getColumnModelListeners()
+  {
+    return (TableColumnModelListener[])
+      listenerList.getListeners(TableColumnModelListener.class);
+  }      
+
+  /**
    * fireColumnAdded
    * @param value0 TODO
    */
Index: javax/swing/table/JTableHeader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/table/JTableHeader.java,v
retrieving revision 1.5
diff -u -r1.5 JTableHeader.java
--- javax/swing/table/JTableHeader.java	4 Sep 2004 21:14:06 -0000	1.5
+++ javax/swing/table/JTableHeader.java	26 Sep 2004 15:14:53 -0000
@@ -76,178 +76,222 @@
       {
         throw new Error("not implemented");
       }
+      
       public void addPropertyChangeListener(PropertyChangeListener l)
       {
         throw new Error("not implemented");
       }
+      
       public boolean contains(Point p)
       {
         throw new Error("not implemented");
       }
+      
       public AccessibleAction getAccessibleAction()
       {
         throw new Error("not implemented");
       }
+      
       public Accessible getAccessibleAt(Point p)
       {
         throw new Error("not implemented");
       }
+      
       public Accessible getAccessibleChild(int i)
       {
         throw new Error("not implemented");
       }
+      
       public int getAccessibleChildrenCount()
       {
         throw new Error("not implemented");
       }
+      
       public AccessibleComponent getAccessibleComponent()
       {
         throw new Error("not implemented");
       }
+      
       public AccessibleContext getAccessibleContext()
       {
         throw new Error("not implemented");
       }
+      
       public String getAccessibleDescription()
   {
         throw new Error("not implemented");
       }
+      
       public int getAccessibleIndexInParent()
       {
         throw new Error("not implemented");
       }
+      
       public String getAccessibleName()
     {
         throw new Error("not implemented");
     }
+      
       public AccessibleRole getAccessibleRole()
       {
         throw new Error("not implemented");
       }
+      
       public AccessibleSelection getAccessibleSelection()
       {
         throw new Error("not implemented");
       }
+      
       public AccessibleStateSet getAccessibleStateSet()
       {
         throw new Error("not implemented");
       }
+      
       public AccessibleText getAccessibleText()
       {
         throw new Error("not implemented");
       }
+      
       public AccessibleValue getAccessibleValue()
       {
         throw new Error("not implemented");
       }
+      
       public Color getBackground()
       {
         throw new Error("not implemented");
       }
+      
       public Rectangle getBounds()
       {
         throw new Error("not implemented");
       }
+      
       public Cursor getCursor()
       {
         throw new Error("not implemented");
       }
+      
       public Font getFont()
       {
         throw new Error("not implemented");
       }
+      
       public FontMetrics getFontMetrics(Font f)
       {
         throw new Error("not implemented");
       }
+      
       public Color getForeground()
       {
         throw new Error("not implemented");
       }
+      
       public Locale getLocale()
       {
         throw new Error("not implemented");
       }
+      
       public Point getLocation()
       {
         throw new Error("not implemented");
       }
+      
       public Point getLocationOnScreen()
       {
         throw new Error("not implemented");
       }
+      
       public Dimension getSize()
       {
         throw new Error("not implemented");
       }
+      
       public boolean isEnabled()
       {
         throw new Error("not implemented");
       }
+      
       public boolean isFocusTraversable()
       {
         throw new Error("not implemented");
       }
+      
       public boolean isShowing()
       {
         throw new Error("not implemented");
       }
+      
       public boolean isVisible()
       {
         throw new Error("not implemented");
       }
+      
       public void removeFocusListener(FocusListener l)
       {
         throw new Error("not implemented");
       }
+      
       public void removePropertyChangeListener(PropertyChangeListener l)
       {
         throw new Error("not implemented");
       }
+      
       public void requestFocus()
       {
         throw new Error("not implemented");
       }
+      
       public void setAccessibleDescription(String s)
       {
         throw new Error("not implemented");
       }
+      
       public void setAccessibleName(String s)
       {
         throw new Error("not implemented");
       }
+      
       public void setBackground(Color c)
       {
         throw new Error("not implemented");
       }
+      
       public void setBounds(Rectangle r)
       {
         throw new Error("not implemented");
       }
+      
       public void setCursor(Cursor c)
       {
         throw new Error("not implemented");
       }
+      
       public void setEnabled(boolean b)
       {
         throw new Error("not implemented");
       }
+      
       public void setFont(Font f)
       {
         throw new Error("not implemented");
       }
+      
       public void setForeground(Color c)
       {
         throw new Error("not implemented");
       }
+      
       public void setLocation(Point p)
       {
         throw new Error("not implemented");
       }
+      
       public void setSize(Dimension d)
       {
         throw new Error("not implemented");
       }
+      
       public void setVisible(boolean b)
       {
         throw new Error("not implemented");
@@ -265,17 +309,17 @@
   /**
    * The columnModel property.
    */
-  TableColumnModel columnModel;
+  protected TableColumnModel columnModel;
 
   /**
    * The draggedColumn property.
    */
-  TableColumn draggedColumn;
+  protected TableColumn draggedColumn;
 
   /**
    * The draggedDistance property.
    */
-  int draggedDistance;
+  protected int draggedDistance;
 
   /**
    * The opaque property.
@@ -285,27 +329,27 @@
   /**
    * The reorderingAllowed property.
    */
-  boolean reorderingAllowed;
+  protected boolean reorderingAllowed;
 
   /**
    * The resizingAllowed property.
    */
-  boolean resizingAllowed;
+  protected boolean resizingAllowed = true;
 
   /**
    * The resizingColumn property.
    */
-  TableColumn resizingColumn;
+  protected TableColumn resizingColumn;
 
   /**
    * The table property.
    */
-  JTable table;
+  protected JTable table;
 
   /**
    * The updateTableInRealTime property.
    */
-  boolean updateTableInRealTime;
+  protected boolean updateTableInRealTime;
 
   TableCellRenderer cellRenderer; 
 
@@ -317,7 +361,7 @@
   public JTableHeader(TableColumnModel cm)
   {
     accessibleContext = new AccessibleJTableHeader();
-    columnModel = cm == null ? createDefaultTableColumnModel() : cm; 
+    columnModel = cm == null ? createDefaultColumnModel() : cm; 
     draggedColumn = null;
     draggedDistance = 0;
     opaque = true;
@@ -330,12 +374,11 @@
     updateUI();
   }
 
-  protected TableColumnModel createDefaultTableColumnModel()
+  protected TableColumnModel createDefaultColumnModel()
   {
     return new DefaultTableColumnModel();
   }
 
-
   /**
    * Get the value of the address@hidden #accessibleContext} property.
    *
@@ -536,6 +579,11 @@
     return cellRenderer;
   }
 
+  public void setDefaultRenderer(TableCellRenderer cellRenderer)
+  {
+    this.cellRenderer = cellRenderer;
+  }
+
   public Rectangle getHeaderRect(int column)
   {
     Rectangle r = getTable().getCellRect(-1, column, true);
Index: javax/swing/table/TableColumn.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/table/TableColumn.java,v
retrieving revision 1.7
diff -u -r1.7 TableColumn.java
--- javax/swing/table/TableColumn.java	31 Jul 2004 23:47:30 -0000	1.7
+++ javax/swing/table/TableColumn.java	26 Sep 2004 15:14:53 -0000
@@ -1,5 +1,5 @@
 /* TableColumn.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -505,6 +505,14 @@
   }
 
   /**
+   * @since 1.4
+   */
+  public PropertyChangeListener[] getPropertyChangeListeners()
+  {
+    return changeSupport.getPropertyChangeListeners();
+  }
+
+  /**
    * createDefaultHeaderRenderer
    * @return TableCellRenderer
    */