/[classpath]/classpath/javax/swing/JTable.java
ViewVC logotype

Diff of /classpath/javax/swing/JTable.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.26 by rabbit78, Wed May 18 14:05:20 2005 UTC revision 1.27 by rabbit78, Fri Jun 24 12:40:24 2005 UTC
# Line 616  public class JTable extends JComponent Line 616  public class JTable extends JComponent
616     */     */
617    public JTable (TableModel dm, TableColumnModel cm, ListSelectionModel sm)    public JTable (TableModel dm, TableColumnModel cm, ListSelectionModel sm)
618    {    {
619      this.dataModel = dm == null ? createDefaultDataModel() : dm;      setModel(dm == null ? createDefaultDataModel() : dm);
620      setSelectionModel(sm == null ? createDefaultSelectionModel() : sm);      setSelectionModel(sm == null ? createDefaultSelectionModel() : sm);
621    
622      this.columnModel = cm;      this.columnModel = cm;
# Line 626  public class JTable extends JComponent Line 626  public class JTable extends JComponent
626    
627    protected void initializeLocalVars()    protected void initializeLocalVars()
628    {    {
629        setTableHeader(createDefaultTableHeader());
630      this.autoCreateColumnsFromModel = false;      this.autoCreateColumnsFromModel = false;
631      if (columnModel == null)      if (columnModel == null)
632        {        {
# Line 653  public class JTable extends JComponent Line 654  public class JTable extends JComponent
654      this.editingColumn = -1;      this.editingColumn = -1;
655      this.editingRow = -1;      this.editingRow = -1;
656      setIntercellSpacing(new Dimension(1,1));      setIntercellSpacing(new Dimension(1,1));
     setTableHeader(createDefaultTableHeader());  
657    }    }
658    
659    /**    /**
# Line 778  public class JTable extends JComponent Line 778  public class JTable extends JComponent
778    
779    public void tableChanged (TableModelEvent event)    public void tableChanged (TableModelEvent event)
780    {    {
781        // update the column model from the table model if the structure has
782        // changed and the flag autoCreateColumnsFromModel is set
783        if ((event.getFirstRow() ==TableModelEvent.HEADER_ROW)
784            && autoCreateColumnsFromModel)
785    
786            createColumnsFromModel();
787    
788      repaint();      repaint();
789    }    }
790    
# Line 1557  public class JTable extends JComponent Line 1564  public class JTable extends JComponent
1564          for (int i = 0; i < ncols; ++i)          for (int i = 0; i < ncols; ++i)
1565            columnModel.getColumn(i).setHeaderValue(dataModel.getColumnName(i));            columnModel.getColumn(i).setHeaderValue(dataModel.getColumnName(i));
1566        }        }
1567    
1568        // according to Sun's spec we also have to set the tableHeader's
1569        // column model here
1570        if (tableHeader != null)
1571          tableHeader.setColumnModel(c);
1572    
1573      revalidate();      revalidate();
1574      repaint();      repaint();
1575    }    }

Legend:
Removed from v.1.26  
changed lines
  Added in v.1.27

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26