- Jaxx-commits - mailman.cloud.codelutin.com

r2033 - in trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav: . tree treetable
by sletellier＠users.nuiton.org July 26, 2010

July 26, 2010

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. + * + * Note: 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. * * Node: 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

1 0

r2032 - in trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav: . treetable
by sletellier＠users.nuiton.org July 16, 2010

July 16, 2010

Author: sletellier Date: 2010-07-16 20:20:32 +0200 (Fri, 16 Jul 2010) New Revision: 2032 Url: http://nuiton.org/repositories/revision/jaxx/2032 Log: - Fix unselect on expend - Add insert method with position parameter - Add method to clear tree table child nodes Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavHelper.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.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-12 10:04:33 UTC (rev 2031) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavHelper.java 2010-07-16 18:20:32 UTC (rev 2032) @@ -340,6 +340,9 @@ } // populate childs of node source.populateChilds(getBridge(), getDataProvider()); + + // Select expended node + selectNode(source); } @Override @@ -588,6 +591,21 @@ } /** + * Inserts the given node to the given {@code parentNode}. + * + * The node will be added to his parent, then creation listeners will be + * fired. + * + * @param parentNode the parent node where to insert the new node * + * @param newNode the node to insert + * @param position position of node is inserted + */ + public void insertNode(N parentNode, N newNode, int position) { + parentNode.insert(newNode, position); + bridge.notifyNodeInserted(newNode); + } + + /** * Removes the given {@code node} from the registred tree model and returns * his parent. * Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java 2010-07-12 10:04:33 UTC (rev 2031) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java 2010-07-16 18:20:32 UTC (rev 2032) @@ -282,6 +282,10 @@ public Enumeration<N> children() { return (Enumeration<N>) super.children(); } + + public void removeAllChildren() { + super.children.clear(); + } @Override public void add(N node) {

1 0

r2031 - in trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav: . tree treetable
by sletellier＠users.nuiton.org July 12, 2010

July 12, 2010

Author: sletellier Date: 2010-07-12 12:04:33 +0200 (Mon, 12 Jul 2010) New Revision: 2031 Url: http://nuiton.org/repositories/revision/jaxx/2031 Log: Add methods to enable multiselection 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-09 10:59:44 UTC (rev 2030) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavHelper.java 2010-07-12 10:04:33 UTC (rev 2031) @@ -35,6 +35,7 @@ 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; @@ -137,6 +138,8 @@ public abstract void setSelectionPath(TreePath path); + public abstract void addSelectionPath(TreePath path); + public abstract void addSelectionPaths(TreePath[] paths); public abstract void removeSelectionPath(TreePath path); @@ -697,7 +700,7 @@ } TreePath path = new TreePath(bridge.getPathToRoot(node)); - setSelectionPath(path); + addSelectionPath(path); scrollPathToVisible(path); } @@ -749,11 +752,9 @@ // no model return; } - List<TreePath> paths = new ArrayList<TreePath>(); for (N node : nodes) { - paths.add(new TreePath(bridge.getPathToRoot(node))); + unSelectNode(node); } - removeSelectionPaths(paths.toArray(new TreePath[paths.size()])); } /** 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-09 10:59:44 UTC (rev 2030) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeHelper.java 2010-07-12 10:04:33 UTC (rev 2031) @@ -64,16 +64,21 @@ } @Override - public void removeSelectionPath(TreePath path) { - getUI().removeSelectionPath(path); + public void addSelectionPath(TreePath path) { + getUI().addSelectionPath(path); } @Override - public void removeSelectionPaths(TreePath[] paths) { - getUI().removeSelectionPaths(paths); + public void removeSelectionPaths(TreePath[] path) { + getUI().removeSelectionPaths(path); } @Override + public void removeSelectionPath(TreePath path) { + getUI().removeSelectionPath(path); + } + + @Override public TreeSelectionModel getSelectionModel() { return getUI().getSelectionModel(); } 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-09 10:59:44 UTC (rev 2030) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java 2010-07-12 10:04:33 UTC (rev 2031) @@ -32,7 +32,6 @@ import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; import java.util.ArrayList; -import java.util.Collections; import java.util.List; /** @@ -58,6 +57,11 @@ } @Override + public void addSelectionPath(TreePath path) { + getUI().getTreeSelectionModel().addSelectionPath(path); + } + + @Override public void addSelectionPaths(TreePath[] paths) { getUI().getTreeSelectionModel().addSelectionPaths(paths); }

1 0

r2030 - in trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav: tree treetable
by sletellier＠users.nuiton.org July 9, 2010

July 9, 2010

Author: sletellier Date: 2010-07-09 12:59:44 +0200 (Fri, 09 Jul 2010) New Revision: 2030 Url: http://nuiton.org/repositories/revision/jaxx/2030 Log: Dont use EMPTY_LIST... Modified: 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/tree/NavTreeHelper.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeHelper.java 2010-07-09 10:15:22 UTC (rev 2029) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeHelper.java 2010-07-09 10:59:44 UTC (rev 2030) @@ -32,6 +32,7 @@ import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -124,7 +125,7 @@ return null; } TreePath[] paths = tree.getSelectionPaths(); - List<N> nodes = Collections.emptyList(); + List<N> nodes = new ArrayList<N>(); if (paths != null) { for (TreePath path : paths) { if (path != null) { 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-09 10:15:22 UTC (rev 2029) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java 2010-07-09 10:59:44 UTC (rev 2030) @@ -31,6 +31,7 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -111,7 +112,7 @@ return null; } TreePath[] paths = tree.getTreeSelectionModel().getSelectionPaths(); - List<N> nodes = Collections.emptyList(); + List<N> nodes = new ArrayList<N>(); if (paths != null) { for (TreePath path : paths) { if (path != null) {

1 0

r2029 - in trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav: . tree treetable
by sletellier＠users.nuiton.org July 9, 2010

July 9, 2010

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. + * + * Note: 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. - * - * Note: 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,

1 0

r2028 - in trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav: . tree treetable
by sletellier＠users.nuiton.org July 5, 2010

July 5, 2010

Author: sletellier Date: 2010-07-05 13:10:40 +0200 (Mon, 05 Jul 2010) New Revision: 2028 Url: http://nuiton.org/repositories/revision/jaxx/2028 Log: Add multi selection methods 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-02 11:17:20 UTC (rev 2027) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavHelper.java 2010-07-05 11:10:40 UTC (rev 2028) @@ -136,6 +136,12 @@ public abstract void setSelectionPath(TreePath path); + public abstract void addSelectionPaths(TreePath[] paths); + + public abstract void removeSelectionPath(TreePath path); + + public abstract void removeSelectionPaths(TreePath[] paths); + public abstract TreeSelectionModel getSelectionModel(); public abstract boolean isExpanded(TreePath pathToExpand); @@ -491,6 +497,14 @@ public abstract N getSelectedNode(); /** + * Obtains the selected nodes of the registred tree. + * + * @return the selected tree or {@code null} if no registred tree nor + * selection empty. + */ + public abstract List<N> getSelectedNodes(); + + /** * Obtains the path of ids fro the root node to the selected node on the * registred tree. * @@ -673,6 +687,61 @@ } /** + * Selects the given {@code nodes} in the registred tree. + * + * @param nodes the nodes to select + */ + public void selectNodes(List<N> nodes) { + if (!checkModel()) { + + // no model + return; + } + List<TreePath> paths = new ArrayList<TreePath>(); + for (N node : nodes) { + paths.add(new TreePath(bridge.getPathToRoot(node))); + } + addSelectionPaths(paths.toArray(new TreePath[paths.size()])); + } + + /** + * Unselects the given {@code node} in the registred tree. + * + * @param node the node to select + */ + public void unSelectNode(N node) { + if (!checkModel()) { + + // no model + return; + } + if (log.isDebugEnabled()) { + log.debug("try to select node [" + node + "]"); + } + TreePath path = new TreePath(bridge.getPathToRoot(node)); + + removeSelectionPath(path); + } + + /** + * Selects the given {@code nodes} in the registred tree. + * + * @param nodes the nodes to select + */ + public void unSelectNodes(List<N> nodes) { + if (!checkModel()) { + + // no model + return; + } + List<TreePath> paths = new ArrayList<TreePath>(); + for (N node : nodes) { + paths.add(new TreePath(bridge.getPathToRoot(node))); + } + removeSelectionPaths(paths.toArray(new TreePath[paths.size()])); + } + + /** * Selects the node described by his given {@code path} of ids. * * @param path the absolute path of ids from root node to node to select. 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-02 11:17:20 UTC (rev 2027) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeHelper.java 2010-07-05 11:10:40 UTC (rev 2028) @@ -32,6 +32,8 @@ import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; +import java.util.Collections; +import java.util.List; /** * The implementation of {@link NavHelper} base on a {@link JTree} component. @@ -56,6 +58,21 @@ } @Override + public void addSelectionPaths(TreePath[] paths) { + getUI().addSelectionPaths(paths); + } + + @Override + public void removeSelectionPath(TreePath path) { + getUI().removeSelectionPath(path); + } + + @Override + public void removeSelectionPaths(TreePath[] paths) { + getUI().removeSelectionPaths(paths); + } + + @Override public TreeSelectionModel getSelectionModel() { return getUI().getSelectionModel(); } @@ -101,6 +118,25 @@ @SuppressWarnings({"unchecked"}) @Override + public List<N> getSelectedNodes() { + JTree tree = getUI(); + if (tree == null) { + return null; + } + TreePath[] paths = tree.getSelectionPaths(); + List<N> nodes = Collections.emptyList(); + if (paths != null) { + for (TreePath path : paths) { + if (path != null) { + nodes.add((N) path.getLastPathComponent()); + } + } + } + return nodes; + } + + @SuppressWarnings({"unchecked"}) + @Override public void setUI(JTree tree, boolean addExpandTreeListener, TreeSelectionListener listener) { 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-02 11:17:20 UTC (rev 2027) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java 2010-07-05 11:10:40 UTC (rev 2028) @@ -31,6 +31,8 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; +import java.util.Collections; +import java.util.List; /** * The implementation of {@link NavHelper} based on a {@link JXTreeTable} component. @@ -55,6 +57,21 @@ } @Override + public void addSelectionPaths(TreePath[] paths) { + getUI().getTreeSelectionModel().addSelectionPaths(paths); + } + + @Override + public void removeSelectionPath(TreePath path) { + getUI().getTreeSelectionModel().removeSelectionPath(path); + } + + @Override + public void removeSelectionPaths(TreePath[] paths) { + getUI().getTreeSelectionModel().removeSelectionPaths(paths); + } + + @Override public TreeSelectionModel getSelectionModel() { return getUI().getTreeSelectionModel(); } @@ -86,6 +103,25 @@ return node; } + @SuppressWarnings({"unchecked"}) + @Override + public List<N> getSelectedNodes() { + JXTreeTable tree = getUI(); + if (tree == null) { + return null; + } + TreePath[] paths = tree.getTreeSelectionModel().getSelectionPaths(); + List<N> nodes = Collections.emptyList(); + if (paths != null) { + for (TreePath path : paths) { + if (path != null) { + nodes.add((N) path.getLastPathComponent()); + } + } + } + return nodes; + } + /** * Registers the given {@code treeTable} for this helper. *

1 0

r2027 - trunk/jaxx-tutorial-css
by tchemit＠users.nuiton.org July 2, 2010

July 2, 2010

Author: tchemit Date: 2010-07-02 13:17:20 +0200 (Fri, 02 Jul 2010) New Revision: 2027 Url: http://nuiton.org/repositories/revision/jaxx/2027 Log: fix build of css tutorial Modified: trunk/jaxx-tutorial-css/pom.xml Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2010-07-02 11:10:58 UTC (rev 2026) +++ trunk/jaxx-tutorial-css/pom.xml 2010-07-02 11:17:20 UTC (rev 2027) @@ -47,7 +47,7 @@  - <maven.jar.main.class>org.nuiton.jaxx.tutorials.css.css</maven.jar.main.class> + <maven.jar.main.class>org.nuiton.jaxx.tutorials.css.Css</maven.jar.main.class>

1 0

r2026 - in tags/jaxx-2.1: jaxx-demo/src/main/resources/i18n jaxx-tutorial-css
by tchemit＠users.nuiton.org July 2, 2010

July 2, 2010

Author: tchemit Date: 2010-07-02 13:10:58 +0200 (Fri, 02 Jul 2010) New Revision: 2026 Url: http://nuiton.org/repositories/revision/jaxx/2026 Log: fix css Tutorial build Modified: tags/jaxx-2.1/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties tags/jaxx-2.1/jaxx-tutorial-css/pom.xml Modified: tags/jaxx-2.1/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties =================================================================== --- tags/jaxx-2.1/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties 2010-07-02 10:24:01 UTC (rev 2025) +++ tags/jaxx-2.1/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties 2010-07-02 11:10:58 UTC (rev 2026) @@ -145,7 +145,7 @@ jaxxdemo.action.exit.tip=Quit JAXXDemo jaxxdemo.action.fullscreen=Full screen jaxxdemo.action.fullscreen.tip=Change to full screen mode -jaxxdemo.action.help=Help +jaxxdemo.action.help= jaxxdemo.action.help.tip=Display help jaxxdemo.action.locale.fr=French jaxxdemo.action.locale.fr.tip=Change to french language Modified: tags/jaxx-2.1/jaxx-tutorial-css/pom.xml =================================================================== --- tags/jaxx-2.1/jaxx-tutorial-css/pom.xml 2010-07-02 10:24:01 UTC (rev 2025) +++ tags/jaxx-2.1/jaxx-tutorial-css/pom.xml 2010-07-02 11:10:58 UTC (rev 2026) @@ -47,7 +47,7 @@  - <maven.jar.main.class>org.nuiton.jaxx.tutorials.css.css</maven.jar.main.class> + <maven.jar.main.class>org.nuiton.jaxx.tutorials.css.Css</maven.jar.main.class>

1 0

r2025 - in trunk: . jaxx-compiler jaxx-demo jaxx-runtime jaxx-tutorial jaxx-tutorial-config jaxx-tutorial-css jaxx-tutorial-databinding jaxx-tutorial-helloworld jaxx-tutorial-helloworld2 jaxx-widgets maven-jaxx-plugin
by tchemit＠users.nuiton.org July 2, 2010

July 2, 2010

Author: tchemit Date: 2010-07-02 12:24:01 +0200 (Fri, 02 Jul 2010) New Revision: 2025 Url: http://nuiton.org/repositories/revision/jaxx/2025 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-tutorial-config/pom.xml trunk/jaxx-tutorial-css/pom.xml trunk/jaxx-tutorial-databinding/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/jaxx-tutorial/pom.xml trunk/jaxx-widgets/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2010-07-02 10:23:57 UTC (rev 2024) +++ trunk/jaxx-compiler/pom.xml 2010-07-02 10:24:01 UTC (rev 2025) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-07-02 10:23:57 UTC (rev 2024) +++ trunk/jaxx-demo/pom.xml 2010-07-02 10:24:01 UTC (rev 2025) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2010-07-02 10:23:57 UTC (rev 2024) +++ trunk/jaxx-runtime/pom.xml 2010-07-02 10:24:01 UTC (rev 2025) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2010-07-02 10:23:57 UTC (rev 2024) +++ trunk/jaxx-tutorial/pom.xml 2010-07-02 10:24:01 UTC (rev 2025) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2010-07-02 10:23:57 UTC (rev 2024) +++ trunk/jaxx-tutorial-config/pom.xml 2010-07-02 10:24:01 UTC (rev 2025) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2010-07-02 10:23:57 UTC (rev 2024) +++ trunk/jaxx-tutorial-css/pom.xml 2010-07-02 10:24:01 UTC (rev 2025) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2010-07-02 10:23:57 UTC (rev 2024) +++ trunk/jaxx-tutorial-databinding/pom.xml 2010-07-02 10:24:01 UTC (rev 2025) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2010-07-02 10:23:57 UTC (rev 2024) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2010-07-02 10:24:01 UTC (rev 2025) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2010-07-02 10:23:57 UTC (rev 2024) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2010-07-02 10:24:01 UTC (rev 2025) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2010-07-02 10:23:57 UTC (rev 2024) +++ trunk/jaxx-widgets/pom.xml 2010-07-02 10:24:01 UTC (rev 2025) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2010-07-02 10:23:57 UTC (rev 2024) +++ trunk/maven-jaxx-plugin/pom.xml 2010-07-02 10:24:01 UTC (rev 2025) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-02 10:23:57 UTC (rev 2024) +++ trunk/pom.xml 2010-07-02 10:24:01 UTC (rev 2025) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -505,9 +505,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.1</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> </scm> <profiles>

1 0

r2024 - tags
by tchemit＠users.nuiton.org July 2, 2010

July 2, 2010

Author: tchemit Date: 2010-07-02 12:23:57 +0200 (Fri, 02 Jul 2010) New Revision: 2024 Url: http://nuiton.org/repositories/revision/jaxx/2024 Log: [maven-release-plugin] copy for tag jaxx-2.1 Added: tags/jaxx-2.1/

1 0