Author: sletellier Date: 2010-07-09 12:15:22 +0200 (Fri, 09 Jul 2010) New Revision: 2029 Url: http://nuiton.org/repositories/revision/jaxx/2029 Log: - Make protected setUI method - Add setUI method with no listener to add 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-05 11:10:40 UTC (rev 2028) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavHelper.java 2010-07-09 10:15:22 UTC (rev 2029) @@ -27,6 +27,7 @@ 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; @@ -258,6 +259,7 @@ @Override public void valueChanged(TreeSelectionEvent e) { + if (!checkModel()) { return; } @@ -530,6 +532,19 @@ * * @param tree the tree to register * @param addExpandTreeListener a flag to add expand listener + */ + @SuppressWarnings({"unchecked"}) + public abstract void setUI(U tree, + boolean addExpandTreeListener); + + /** + * 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 the {@link #selectionListener}. + * + * @param tree the tree to register + * @param addExpandTreeListener a flag to add expand listener * @param listener the optional selection listener to add */ @SuppressWarnings({"unchecked"}) @@ -858,7 +873,7 @@ return result; } - public void setUI(U ui) { + protected void setUI(U ui) { this.ui = ui; } } 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-05 11:10:40 UTC (rev 2028) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeHelper.java 2010-07-09 10:15:22 UTC (rev 2029) @@ -138,6 +138,13 @@ @SuppressWarnings({"unchecked"}) @Override public void setUI(JTree tree, + boolean addExpandTreeListener) { + setUI(tree, addExpandTreeListener, null); + } + + @SuppressWarnings({"unchecked"}) + @Override + public void setUI(JTree tree, boolean addExpandTreeListener, TreeSelectionListener listener) { setUI(tree); 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-05 11:10:40 UTC (rev 2028) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java 2010-07-09 10:15:22 UTC (rev 2029) @@ -121,17 +121,14 @@ } return nodes; } + + @SuppressWarnings({"unchecked"}) + @Override + public void setUI(JXTreeTable treeTable, + boolean addExpandTreeListener) { + setUI(treeTable, addExpandTreeListener, null); + } - /** - * Registers the given {@code treeTable} for this helper. - * <p/> - * <b>Note:</b> as a side-effect, it will register (if required) the - * {@link #expandListener} listener and the {@link #selectionListener}. - * - * @param treeTable the tree table to register - * @param addExpandTreeListener a flag to add expand listener - * @param listener the optional selection listener to add - */ @SuppressWarnings({"unchecked"}) @Override public void setUI(JXTreeTable treeTable,