swing/src/net/sf/xframe/swing JXTable.java,1.7,1.8

Update of /cvsroot/xframe/swing/src/net/sf/xframe/swing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12102/src/net/sf/xframe/swing

Modified Files:
	JXTable.java 
Log Message:
Fix for bug [1169153] JXTable.setModel doesn't work.


Index: JXTable.java
===================================================================
RCS file: /cvsroot/xframe/swing/src/net/sf/xframe/swing/JXTable.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JXTable.java	12 Nov 2004 11:37:17 -0000	1.7
--- JXTable.java	23 Mar 2005 15:29:50 -0000	1.8
***************
*** 1826,1829 ****
--- 1826,1833 ----
          lockedTable.setModel(dataModel);
          scrollTable.setModel(dataModel);
+         // Check if new model has enough columns for current number of frozen columns
+         if (frozenColumns > dataModel.getColumnCount()) {
+             frozenColumns = 0;
+         }
          // Remove the locked columns from the main table
          final TableColumnModel scrollColumnModel = scrollTable.getColumnModel();
***************
*** 1836,1839 ****
--- 1840,1851 ----
              lockedColumnModel.removeColumn(lockedColumnModel.getColumn(frozenColumns));
          }
+         // Add new columns to the locked table
+         for (int i = 0; i < frozenColumns; i++) {
+             lockedColumnModel.addColumn(new TableColumn(i));
+         }
+         // Add new columns to the scrollable table
+         for (int i = frozenColumns; i < dataModel.getColumnCount(); i++) {
+             scrollColumnModel.addColumn(new TableColumn(i));
+         }
          // Add the fixed table to the scroll pane
          lockedTable.setPreferredScrollableViewportSize(lockedTable.getPreferredSize());



-------------------------------------------------------
This SF.net email is sponsored by: 2005 Windows Mobile Application Contest
Submit applications for Windows Mobile(tm)-based Pocket PCs or Smartphones
for the chance to win $25,000 and application distribution. Enter today at
http://ads.osdn.com/?ad_id=6882&alloc_id=15148&op=click