[cp-patches] FYI: javax.swing.table merge with libgcj gui branch

[Mark Wielaard]

Hi,

This merges the changes from Micheal on the gui branch for
javax.swing.table into GNU Classpath.

2004-07-31  Michael Koch  <address@hidden>

        * javax/swing/table/DefaultTableColumnModel.java
        (serialVersionUID): Made private.
        (listenerList): Initialize.
        (changeEvent): Initialize.
        * javax/swing/table/JTableHeader.java
        (JTableHeader): New constructors.
        (createDefaultColumnModel): New method.
        * javax/swing/table/TableColumn.java
        (setHeaderRenderer): Simplified code.
        (setCellRenderer): Likewise.
        (setWidth): Likewise.

Committed.

Index: javax/swing/table/DefaultTableColumnModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/table/DefaultTableColumnModel.java,v
retrieving revision 1.3.18.1
diff -u -b -B -r1.3.18.1 DefaultTableColumnModel.java
--- javax/swing/table/DefaultTableColumnModel.java      10 Jul 2004 09:44:06 
-0000      1.3.18.1
+++ javax/swing/table/DefaultTableColumnModel.java      21 Jul 2004 07:18:20 
-0000
@@ -1,5 +1,5 @@
 /* DefaultTableColumnModel.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -61,7 +61,7 @@
   implements TableColumnModel, PropertyChangeListener, ListSelectionListener,
              Serializable
 {
-  static final long serialVersionUID = 6580012493508960512L;
+  private static final long serialVersionUID = 6580012493508960512L;
 
   /**
    * tableColumns
@@ -81,12 +81,12 @@
   /**
    * listenerList
    */
-  protected EventListenerList listenerList;
+  protected EventListenerList listenerList = new EventListenerList();
 
   /**
    * changeEvent
    */
-  protected transient ChangeEvent changeEvent;
+  protected transient ChangeEvent changeEvent = new ChangeEvent(this);
 
   /**
    * columnSelectionAllowed
@@ -211,11 +211,16 @@
 
   /**
    * setSelectionModel
-   * @param value0 TODO
+   * @param model TODO
+   * @exception IllegalArgumentException if model is null
    */
-  public void setSelectionModel(ListSelectionModel value0)
+  public void setSelectionModel(ListSelectionModel model)
   {
-    // TODO
+    if (model == null)
+      throw new IllegalArgumentException();
+    
+    selectionModel = model;
+    selectionModel.addListSelectionListener(this);
   }
 
   /**
@@ -224,7 +229,7 @@
    */
   public ListSelectionModel getSelectionModel()
   {
-    return null; // TODO
+    return selectionModel;
   }
 
   /**
Index: javax/swing/table/JTableHeader.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/table/JTableHeader.java,v
retrieving revision 1.2.2.1
diff -u -b -B -r1.2.2.1 JTableHeader.java
--- javax/swing/table/JTableHeader.java 9 Jun 2004 08:40:10 -0000       1.2.2.1
+++ javax/swing/table/JTableHeader.java 21 Jul 2004 07:18:20 -0000
@@ -60,4 +60,21 @@
   protected TableColumn resizingColumn;
   protected JTable table;
   protected boolean updateTableInRealTime;
+
+  public JTableHeader()
+  {
+    this(null);
+  }
+
+  public JTableHeader(TableColumnModel cm)
+  {
+    super();
+
+    this.columnModel = cm == null ? createDefaultColumnModel() : cm;
+  }
+
+  protected TableColumnModel createDefaultColumnModel()
+  {
+    return new DefaultTableColumnModel();
+  }
 }
Index: javax/swing/table/TableColumn.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/table/TableColumn.java,v
retrieving revision 1.3.18.2
diff -u -b -B -r1.3.18.2 TableColumn.java
--- javax/swing/table/TableColumn.java  10 Jul 2004 09:44:06 -0000      1.3.18.2
+++ javax/swing/table/TableColumn.java  21 Jul 2004 07:18:20 -0000
@@ -289,19 +289,15 @@
    * setHeaderRenderer
    * @param headerRenderer TODO
    */
-  public void setHeaderRenderer(TableCellRenderer headerRenderer)
+  public void setHeaderRenderer(TableCellRenderer renderer)
   {
-    // Variables
-    TableCellRenderer oldRenderer;
-
-    // Get Old Renderer
-    oldRenderer = this.headerRenderer;
+    if (headerRenderer == renderer)
+      return;
 
-    // Set Property
-    this.headerRenderer = headerRenderer;
-
-    // Notify Listeners of change
-    firePropertyChange(HEADER_RENDERER_PROPERTY, oldRenderer, headerRenderer);
+    TableCellRenderer oldRenderer = headerRenderer;
+    headerRenderer = renderer;
+    firePropertyChange(HEADER_RENDERER_PROPERTY, 
+                      oldRenderer, headerRenderer);
   }
 
   /**
@@ -317,19 +313,15 @@
    * setCellRenderer
    * @param cellRenderer TODO
    */
-  public void setCellRenderer(TableCellRenderer cellRenderer)
+  public void setCellRenderer(TableCellRenderer renderer)
   {
-    // Variables
-    TableCellRenderer oldRenderer;
-
-    // Get Old Renderer
-    oldRenderer = this.cellRenderer;
-
-    // Set Property
-    this.cellRenderer = cellRenderer;
+    if (cellRenderer == renderer)
+      return;
 
-    // Notify Listeners of change
-    firePropertyChange(CELL_RENDERER_PROPERTY, oldRenderer, cellRenderer);
+    TableCellRenderer oldRenderer = cellRenderer;
+    cellRenderer = renderer;
+    firePropertyChange(CELL_RENDERER_PROPERTY, 
+                      oldRenderer, cellRenderer);
   }
 
   /**
@@ -361,25 +353,23 @@
 
   /**
    * setWidth
-   * @param width TODO
+   * @param newWidth TODO
    */
-  public void setWidth(int width)
+  public void setWidth(int newWidth)
   {
-    // Variables
-    int oldWidth;
+    int        oldWidth = width;
 
-    // Get Old Width
-    oldWidth = this.width;
-
-    // Adjust Width within Limits
-    if (width < minWidth)
-      this.width = minWidth;
-    else if (width > maxWidth)
-      this.width = maxWidth;
+    if (newWidth < minWidth)
+      width = minWidth;
+    else if (newWidth > maxWidth)
+      width = maxWidth;
     else
-      this.width = width;
+      width = newWidth;
+
+    if (width == oldWidth)
+      return;
 
-    firePropertyChange(COLUMN_WIDTH_PROPERTY, oldWidth, this.width);
+    firePropertyChange(COLUMN_WIDTH_PROPERTY, oldWidth, width);
   }
 
   /**

signature.asc
Description: This is a digitally signed message part