Skip to content
Snippets Groups Projects
Commit 05cff4c0 authored by Sylvain Mainguy's avatar Sylvain Mainguy
Browse files

No commit message

No commit message
parent a2b3a228
No related branches found
No related tags found
No related merge requests found
...@@ -57,10 +57,36 @@ public class TreeNodeTool { ...@@ -57,10 +57,36 @@ public class TreeNodeTool {
} }
} }
public static ITreeNode findTreeNodeForTreeItem(TreeItem treeItem, ITreeNode node) { public static TreeItem findTreeItemFromTreeNode(ITreeNode rootNode, TreeItem treeItem) {
TreeItem result = null;
if (treeItem != null && rootNode != null) {
result = findTreeItem_aux(rootNode, treeItem);
}
return result;
}
private static TreeItem findTreeItem_aux(ITreeNode node, TreeItem treeItem) {
TreeItem result = null;
if (sameDatas(treeItem, node)) {
result = treeItem;
}
else {
for (TreeItem child : treeItem.getItems()) {
result = findTreeItem_aux(node, child);
if (result != null) {
break;
}
}
}
return result;
}
public static ITreeNode findTreeNodeForTreeItem(TreeItem treeItem, ITreeNode rootNode) {
ITreeNode result = null; ITreeNode result = null;
if (treeItem != null) { if (treeItem != null && rootNode != null) {
result = findTreeNode_aux(treeItem, node); result = findTreeNode_aux(treeItem, rootNode);
} }
return result; return result;
} }
...@@ -68,8 +94,7 @@ public class TreeNodeTool { ...@@ -68,8 +94,7 @@ public class TreeNodeTool {
private static ITreeNode findTreeNode_aux(TreeItem treeItem, ITreeNode node) { private static ITreeNode findTreeNode_aux(TreeItem treeItem, ITreeNode node) {
ITreeNode result = null; ITreeNode result = null;
if (treeItem.getText().equals(node.getName()) && // text can't be null if (sameDatas(treeItem, node)) {
treeItem.getData() == node.getData()) {// == or equals
result = node; result = node;
} }
else { else {
...@@ -84,6 +109,11 @@ public class TreeNodeTool { ...@@ -84,6 +109,11 @@ public class TreeNodeTool {
return result; return result;
} }
private static boolean sameDatas(TreeItem treeItem, ITreeNode node) {
return treeItem.getText().equals(node.getName()) && // text can't be null
treeItem.getData() == node.getData();// == or equals
}
// ------------------------- // -------------------------
public static TreeItem createRootTreeNode2(Tree parent, ITreeNode cometeTreeNode) { public static TreeItem createRootTreeNode2(Tree parent, ITreeNode cometeTreeNode) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment