From: <cpm...@us...> - 2008-06-25 01:42:33
|
Revision: 6881 http://pcgen.svn.sourceforge.net/pcgen/?rev=6881&view=rev Author: cpmeister Date: 2008-06-24 18:42:40 -0700 (Tue, 24 Jun 2008) Log Message: ----------- minor bug fix Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/tools/TreeViewSelectionPane.java branches/cdomui/code/src/java/pcgen/gui/util/JTableEx.java branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewPane.java Modified: branches/cdomui/code/src/java/pcgen/gui/tools/TreeViewSelectionPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/TreeViewSelectionPane.java 2008-06-25 00:32:06 UTC (rev 6880) +++ branches/cdomui/code/src/java/pcgen/gui/tools/TreeViewSelectionPane.java 2008-06-25 01:42:40 UTC (rev 6881) @@ -58,7 +58,10 @@ super(JSplitPane.VERTICAL_SPLIT, true); availableView = new FilteredTreeViewDisplay(context); selectedView = new FilteredTreeViewDisplay(context); - + + availableView.getTreeViewPane().setDragEnabled(true); + selectedView.getTreeViewPane().setDragEnabled(true); + setTopComponent(selectedView); setBottomComponent(availableView); } Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTableEx.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTableEx.java 2008-06-25 00:32:06 UTC (rev 6880) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTableEx.java 2008-06-25 01:42:40 UTC (rev 6881) @@ -24,11 +24,13 @@ import javax.swing.ListSelectionModel; import javax.swing.SwingConstants; import java.awt.Component; +import java.awt.Container; import java.math.BigDecimal; import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Vector; +import javax.swing.JViewport; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableColumnModel; import javax.swing.table.TableColumnModel; @@ -98,6 +100,23 @@ } @Override + public boolean getScrollableTracksViewportHeight() + { + // fetch the table's parent + Container viewport = getParent(); + + // if the parent is not a viewport, calling this isn't useful + if (!(viewport instanceof JViewport)) + { + return false; + } + + // return true if the table's preferred height is smaller + // than the viewport height, else false + return getPreferredSize().height < viewport.getHeight(); + } + + @Override public void setModel(TableModel model) { if (!(model instanceof SortableTableModel)) Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewPane.java 2008-06-25 00:32:06 UTC (rev 6880) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewPane.java 2008-06-25 01:42:40 UTC (rev 6881) @@ -95,6 +95,11 @@ throw new UnsupportedOperationException(); } + public void setDragEnabled(boolean b) + { + getTable().setDragEnabled(b); + } + @Override public void setTransferHandler(TransferHandler newHandler) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |