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); }