Row sorter support.

Author: Qualtagh

src/org/quinto/swing/table/view/JBroTable.java

@@ -33,6 +33,7 @@ public class JBroTable extends JTable {
   private static final Pattern TAG_PATTERN = Pattern.compile( "<[^<>]++>" );
   private Integer headerHeight;
   private HeaderHeightWatcher headerHeightWatcher;
+  private Integer currentLevel;
 
   public JBroTable() {
     this( null );
@@ -523,6 +524,20 @@ public void columnSelectionChanged( ListSelectionEvent e ) {
     }
     super.columnSelectionChanged( e );
   }
+
+  void setCurrentLevel( Integer currentLevel ) {
+    this.currentLevel = currentLevel;
+  }
+
+  @Override
+  public TableColumnModel getColumnModel() {
+    return currentLevel == null ? super.getColumnModel() : getTableHeader().getColumnModel( currentLevel );
+  }
+
+  @Override
+  public JBroTableHeader getTableHeader() {
+    return ( JBroTableHeader )super.getTableHeader();
+  }
 
   private class HeaderHeightWatcher implements TableColumnModelListener {
     @Override

src/org/quinto/swing/table/view/JBroTableHeaderUI.java

@@ -379,7 +379,9 @@ private void paintCell( Graphics g, Rectangle cellRect, JBroTableColumn group )
     TableCellRenderer renderer = getRenderer( group );
     boolean parentUIdeterminesRolloverColumnItself = hasParentUI( renderer );
     boolean rollover = parentUIdeterminesRolloverColumnItself ? group == getHeader().getDraggedGroup() : group == selectedColumn;
-    Component component = renderer.getTableCellRendererComponent( header.getTable(), group.getHeaderValue(), rollover, rollover, group.getY(), getTableColumnModel().getColumnRelativeIndex( group ) );
+    table.setCurrentLevel( group.getY() );
+    Component component = renderer.getTableCellRendererComponent( table, group.getHeaderValue(), rollover, rollover, group.getY(), getTableColumnModel().getColumnRelativeIndex( group ) );
+    table.setCurrentLevel( null );
     paintCell( g, component, cellRect );
   }
 

test/org/quinto/swing/table/view/JBroTableColumnModelShowcase.java

@@ -14,7 +14,6 @@
 import javax.swing.JFrame;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
-import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.plaf.metal.DefaultMetalTheme;
@@ -125,11 +124,11 @@ else if ( laf == 4 ) {
     for ( int i = 0; i < rows.length; i++ ) {
       rows[ i ] = new ModelRow( fields.length );
       for ( int j = 0; j < fields.length; j++ )
-        rows[ i ].setValue( j, String.valueOf( ( char )( 'A' + j ) ) + i );
+        rows[ i ].setValue( j, i == j ? "sort me" : String.valueOf( ( char )( 'A' + j ) ) + i );
     }
     data.setRows( rows );
     table = new JBroTable( data );
-   // table.setAutoCreateRowSorter( true );
+    table.setAutoCreateRowSorter( true );
     System.out.println( table.getColumnModel() );
     for ( TableColumn tc : Collections.list( table.getColumnModel().getColumns() ) )
       System.out.println( tc.getHeaderValue() );

test/org/quinto/swing/table/view/JBroTableColumnModelTest.java

@@ -63,11 +63,11 @@ public void setUp() {
     for ( int i = 0; i < rows.length; i++ ) {
       rows[ i ] = new ModelRow( fields.length );
       for ( int j = 0; j < fields.length; j++ )
-        rows[ i ].setValue( j, fields[ j ].getCaption() + i );
+        rows[ i ].setValue( j, i == j ? "sort me" : fields[ j ].getCaption() + i );
     }
     data.setRows( rows );
     table = new JBroTable( data );
-   // table.setAutoCreateRowSorter( true );
+    table.setAutoCreateRowSorter( true );
   }
 
   @After

test/org/quinto/swing/table/view/JBroTableColumnTest.java

@@ -60,7 +60,7 @@ public void setUp() {
     };
     data.setRows( rows );
     table = new JBroTable( data );
-   // table.setAutoCreateRowSorter( true );
+    table.setAutoCreateRowSorter( true );
     pane = new JScrollPane( table );
     frame = new JFrame();
     frame.add( pane );

test/org/quinto/swing/table/view/JBroTableUIShowcase.java

@@ -37,11 +37,11 @@ public static void main( String args[] ) throws Exception {
     for ( int i = 0; i < rows.length; i++ ) {
       rows[ i ] = new ModelRow( fields.length );
       for ( int j = 0; j < fields.length; j++ )
-        rows[ i ].setValue( j, fields[ j ].getCaption() + i );
+        rows[ i ].setValue( j, j == 1 || j == 2 ? rows[ i ].getValue( 0 ) : i == j ? "sort me" : fields[ j ].getCaption() + i );
     }
     data.setRows( rows );
     JBroTable table = new JBroTable( data );
-   // table.setAutoCreateRowSorter( true );
+    table.setAutoCreateRowSorter( true );
     table.setUI( new JBroTableUI().withSpan( new ModelSpan( "B", "B" ).withColumns( "B", "C", "E" ).withDrawAsHeader( true ) )
                                   .withSpan( new ModelSpan( "G", "G" ).withColumns( "G", "J" ) ) );
     JFrame frame = new JFrame( "Testing" );

test/org/quinto/swing/table/view/Sample.java

@@ -41,10 +41,11 @@ public static void main( String args[] ) throws Exception {
     for ( int i = 0; i < rows.length; i++ ) {
       rows[ i ] = new ModelRow( fields.length );
       for ( int j = 0; j < fields.length; j++ )
-        rows[ i ].setValue( j, fields[ j ].getCaption() + i );
+        rows[ i ].setValue( j, i == j ? "sort me" : fields[ j ].getCaption() + i );
     }
     data.setRows( rows );
     JBroTable table = new JBroTable( data );
+    table.setAutoCreateRowSorter( true );
 
     // Window.
     JFrame frame = new JFrame( "Test" );