This is an automated email from the git hooks/post-receive script. New commit to branch feature/8429 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 2d34b2d3a547d43f742c75c2991a073f889391b8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 23 09:18:14 2016 +0100 ajout API getChild pour remplacer l'API findNodeById --- .../swing/ui/actions/content/CloseAndCreateUIAction.java | 2 +- .../swing/ui/tree/navigation/NavigationTree.java | 4 ++-- .../swing/ui/tree/navigation/NavigationTreeModel.java | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseAndCreateUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseAndCreateUIAction.java index da724ca..70b0e52 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseAndCreateUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseAndCreateUIAction.java @@ -144,7 +144,7 @@ public class CloseAndCreateUIAction extends AbstractContentUIAction { String id = dataContext.getOpenActivityId(); - NavigationTreeNodeSupport node1 = node.findNodeById(tree.getTreeModel(), id); + NavigationTreeNodeSupport node1 = tree.getChild(node, id); TreePath activityPath = path.pathByAddingChild(node1); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java index 84e0c71..772c19e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java @@ -158,7 +158,7 @@ public class NavigationTree extends JXTree { log.debug("try to select node from ids " + Arrays.toString(path)); } RootNavigationTreeNode root = this.getTreeModel().getRoot(); - NavigationTreeNodeSupport node = NavigationTreeNodeSupport.findNode(getTreeModel(), root, path); + NavigationTreeNodeSupport node = getTreeModel().findNode(root, path); if (log.isDebugEnabled()) { log.debug("selected node [" + node + "]"); } @@ -184,7 +184,7 @@ public class NavigationTree extends JXTree { } public NavigationTreeNodeSupport getChild(NavigationTreeNodeSupport node, String id) { - return node.findNodeById(getTreeModel(), id); + return node.getChild(getTreeModel(), id); } public void removeNode(NavigationTreeNodeSupport node) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeModel.java index c7a76ee..6453287 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeModel.java @@ -42,6 +42,22 @@ public class NavigationTreeModel extends DefaultTreeModel { super(new RootNavigationTreeNode()); } + public NavigationTreeNodeSupport findNode(NavigationTreeNodeSupport node, String... ids) { + NavigationTreeNodeSupport result = null; + for (String id : ids) { + + result = node.getChild(this, id); + + if (result == null) { + + // un des noeud n'a pas ete trouve, on sort + break; + } + node = result; + } + return result; + } + public void populate() { NavigationService navigationService = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newNavigationService(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.