Skip to content
Snippets Groups Projects
Commit cc85d087 authored by Katy Saintin's avatar Katy Saintin
Browse files

add image for Tree in SWT

parent 3ac17f22
No related branches found
No related tags found
No related merge requests found
......@@ -22,7 +22,6 @@ package fr.soleil.comete.swt;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
......@@ -333,7 +332,7 @@ public class Tree extends CometeComposite<org.eclipse.swt.widgets.Tree> implemen
@Override
public void widgetDefaultSelected(SelectionEvent e) {
System.out.println("selection1 " + e.item.toString());
// System.out.println("selection1 " + e.item.toString());
// TODO warnSelectionListeners
}
......@@ -346,15 +345,7 @@ public class Tree extends CometeComposite<org.eclipse.swt.widgets.Tree> implemen
@Override
public void run() {
if (!getControl().isDisposed()) {
System.out.println("selection2 " + e.item.toString());
TreeItem[] selection = getControl().getSelection();
if (Arrays.asList(selection).contains(e.item)) {
System.out.println("selected");
}
else {
System.out.println("deselected");
}
warnSelectionListeners();
}
}
......@@ -362,6 +353,10 @@ public class Tree extends CometeComposite<org.eclipse.swt.widgets.Tree> implemen
}
}
private void warnSelectionListeners() {
new TreeNodeSelectionEvent(this, true, getSelectedNodes());
}
@Override
public void setHorizontalAlignment(int halign) {
// nop
......
......@@ -7,6 +7,7 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
import fr.soleil.comete.definition.widget.util.CometeImage;
import fr.soleil.comete.definition.widget.util.ITreeNode;
public class TreeNodeTool {
......@@ -43,6 +44,11 @@ public class TreeNodeTool {
Object data = cometeTreeNode.getData();
treeItem.setText(treeName);
treeItem.setData(data);
CometeImage image = cometeTreeNode.getImage();
SwtImage swtImage = ImageTool.getImage(image);
if ((swtImage != null) && (swtImage.getImage() != null)) {
treeItem.setImage(swtImage.getImage());
}
createChildTreeNodes(treeItem, cometeTreeNode);
}
......@@ -59,7 +65,7 @@ public class TreeNodeTool {
public static TreeItem findTreeItemFromTreeNode(ITreeNode rootNode, TreeItem treeItem) {
TreeItem result = null;
if (treeItem != null && rootNode != null) {
if ((treeItem != null) && (rootNode != null)) {
result = findTreeItem_aux(rootNode, treeItem);
}
return result;
......@@ -85,7 +91,7 @@ public class TreeNodeTool {
public static ITreeNode findTreeNodeForTreeItem(TreeItem treeItem, ITreeNode rootNode) {
ITreeNode result = null;
if (treeItem != null && rootNode != null) {
if ((treeItem != null) && (rootNode != null)) {
result = findTreeNode_aux(treeItem, rootNode);
}
return result;
......@@ -111,7 +117,7 @@ public class TreeNodeTool {
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
(treeItem.getData() == node.getData());// == or equals
}
// -------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment