From: <jde...@us...> - 2009-10-31 00:59:52
|
Revision: 10851 http://pcgen.svn.sourceforge.net/pcgen/?rev=10851&view=rev Author: jdempsey Date: 2009-10-31 00:59:43 +0000 (Sat, 31 Oct 2009) Log Message: ----------- Fix bug: Column header doesn't sort - Merge fix from 5.16 branch Issue#: 2873833 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui/tabs/ability/AbilitySelectionPanel.java Trunk/pcgen/code/src/java/pcgen/gui/utils/JTreeTableSorter.java Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/ability/AbilitySelectionPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/ability/AbilitySelectionPanel.java 2009-10-31 00:56:54 UTC (rev 10850) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/ability/AbilitySelectionPanel.java 2009-10-31 00:59:43 UTC (rev 10851) @@ -672,6 +672,7 @@ theModel.setAbilityList(getAbilityList(), thePC); if (theSorter != null) { + theSorter.setRoot((PObjectNode) theModel.getRoot()); theSorter.sortNodeOnColumn(); } theTable.updateUI(); Modified: Trunk/pcgen/code/src/java/pcgen/gui/utils/JTreeTableSorter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/utils/JTreeTableSorter.java 2009-10-31 00:56:54 UTC (rev 10850) +++ Trunk/pcgen/code/src/java/pcgen/gui/utils/JTreeTableSorter.java 2009-10-31 00:59:43 UTC (rev 10851) @@ -22,6 +22,7 @@ import pcgen.util.Logging; +import javax.swing.SwingUtilities; import javax.swing.table.JTableHeader; import javax.swing.table.TableColumnModel; import java.awt.event.InputEvent; @@ -88,13 +89,20 @@ // JTreeTableSorter.this.mode = 0; } - sortNodeOnColumn(JTreeTableSorter.this.root, column, e - .getModifiers() - & InputEvent.SHIFT_MASK); - JTreeTableSorter.this.prevCol = column; - JTreeTableSorter.this.prevAscending = + final int sortAscending = e.getModifiers() & InputEvent.SHIFT_MASK; - updateSortModel(); + SwingUtilities.invokeLater(new Runnable() + { + public void run() + { + sortNodeOnColumn(JTreeTableSorter.this.root, + column, sortAscending); + JTreeTableSorter.this.prevCol = column; + JTreeTableSorter.this.prevAscending = sortAscending; + updateSortModel(); + } + }); + } } }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |