Author: sletellier Date: 2010-07-26 15:53:36 +0200 (Mon, 26 Jul 2010) New Revision: 2033 Url: http://nuiton.org/repositories/revision/jaxx/2033 Log: Add method to enable or not one click selection listener Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavHelper.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeHelper.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavHelper.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavHelper.java 2010-07-16 18:20:32 UTC (rev 2032) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavHelper.java 2010-07-26 13:53:36 UTC (rev 2033) @@ -27,7 +27,6 @@ import jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.JXTreeTable; import javax.swing.event.TreeExpansionEvent; import javax.swing.event.TreeModelEvent; @@ -35,7 +34,6 @@ import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.event.TreeWillExpandListener; -import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; import java.util.ArrayList; @@ -340,9 +338,6 @@ } // populate childs of node source.populateChilds(getBridge(), getDataProvider()); - - // Select expended node - selectNode(source); } @Override @@ -559,6 +554,24 @@ TreeSelectionListener listener); /** + * Registers the given {@code tree} for this helper. + * <p/> + * <b>Note:</b> as a side-effect, it will register (if required) the + * {@link #expandListener} listener and (if required) the + * {@link #selectionListener}. + * + * @param tree the tree to register + * @param addExpandTreeListener a flag to add expand listener + * @param addOneClickSelectionListener a flag to expend when selection + * @param listener the optional selection listener to add + */ + @SuppressWarnings({"unchecked"}) + public abstract void setUI(U tree, + boolean addExpandTreeListener, + boolean addOneClickSelectionListener, + TreeSelectionListener listener); + + /** * Registers the {@code dataProvider} for the helper. * <p/> * <b>Node:</b> As a side-effect, the provider will be propagate to the Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeHelper.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeHelper.java 2010-07-16 18:20:32 UTC (rev 2032) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeHelper.java 2010-07-26 13:53:36 UTC (rev 2033) @@ -153,14 +153,26 @@ public void setUI(JTree tree, boolean addExpandTreeListener, TreeSelectionListener listener) { + + setUI(tree, addExpandTreeListener, true, listener); + } + + @SuppressWarnings({"unchecked"}) + @Override + public void setUI(JTree tree, + boolean addExpandTreeListener, + boolean addOneClickSelectionListener, + TreeSelectionListener listener) { setUI(tree); if (addExpandTreeListener) { tree.addTreeWillExpandListener(expandListener); } if (listener != null) { - tree.getSelectionModel().addTreeSelectionListener(listener); + tree.addTreeSelectionListener(listener); } - tree.getSelectionModel().addTreeSelectionListener(selectionListener); + if (addOneClickSelectionListener) { + tree.addTreeSelectionListener(selectionListener); + } } @Override Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java 2010-07-16 18:20:32 UTC (rev 2032) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java 2010-07-26 13:53:36 UTC (rev 2033) @@ -139,6 +139,16 @@ public void setUI(JXTreeTable treeTable, boolean addExpandTreeListener, TreeSelectionListener listener) { + + setUI(treeTable, addExpandTreeListener, true, listener); + } + + @SuppressWarnings({"unchecked"}) + @Override + public void setUI(JXTreeTable treeTable, + boolean addExpandTreeListener, + boolean addOneClickSelectionListener, + TreeSelectionListener listener) { setUI(treeTable); if (addExpandTreeListener) { treeTable.addTreeWillExpandListener(expandListener); @@ -146,7 +156,9 @@ if (listener != null) { treeTable.addTreeSelectionListener(listener); } - treeTable.addTreeSelectionListener(selectionListener); + if (addOneClickSelectionListener) { + treeTable.addTreeSelectionListener(selectionListener); + } } @Override