swing/src/net/sf/xframe/swing JXTable.java,1.10,1.11

Kurt Riede <[email protected]> Wed, 06 Apr 2005 20:21:41 +0000
Newsgroups gmane.text.xml.xframe.xsddoc.devel
Message-ID <[email protected]>
Update of /cvsroot/xframe/swing/src/net/sf/xframe/swing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15916/src/net/sf/xframe/swing

Modified Files:
	JXTable.java 
Log Message:
fix for bug [1177810] setSelectionModel just sets frozenTable's

Index: JXTable.java
===================================================================
RCS file: /cvsroot/xframe/swing/src/net/sf/xframe/swing/JXTable.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JXTable.java	4 Apr 2005 16:06:06 -0000	1.10
--- JXTable.java	6 Apr 2005 20:21:38 -0000	1.11
***************
*** 244,248 ****
          scrollPane = new JScrollPane();
          adjuster = new JScrollPaneAdjuster(scrollPane);
-         frozenColumns = numFrozenColumns;
          final TableModel model;
          if (dm == null) {
--- 244,247 ----
***************
*** 251,254 ****
--- 250,257 ----
              model = dm;
          }
+         frozenColumns = numFrozenColumns;
+         if (frozenColumns > model.getColumnCount()) {
+             frozenColumns = model.getColumnCount();
+         }
          final TableColumnModel cm1;
          final TableColumnModel cm2;
***************
*** 1815,1819 ****
          final TableColumnModel lockedColumnModel = lockedTable.getColumnModel();
          while (lockedTable.getColumnCount() > 0) {
!             lockedColumnModel.removeColumn(lockedColumnModel.getColumn(frozenColumns));
          }
          lockedTable.setModel(dataModel);
--- 1818,1822 ----
          final TableColumnModel lockedColumnModel = lockedTable.getColumnModel();
          while (lockedTable.getColumnCount() > 0) {
!             lockedColumnModel.removeColumn(lockedColumnModel.getColumn(0));
          }
          lockedTable.setModel(dataModel);
***************
*** 1898,1901 ****
--- 1901,1905 ----
      public void setRowSelectionInterval(final int index0, final int index1) {
          lockedTable.setRowSelectionInterval(index0, index1);
+         scrollTable.setRowSelectionInterval(index0, index1);
      }
  
***************
*** 1909,1912 ****
--- 1913,1917 ----
      public void setSelectionModel(final ListSelectionModel newModel) {
          lockedTable.setSelectionModel(newModel);
+         scrollTable.setSelectionModel(newModel);
      }
  



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click