X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=swt%2Forg.argeo.cms.swt%2Fsrc%2Forg%2Fargeo%2Fcms%2Fswt%2Fwidgets%2FSwtTreeView.java;h=778ed41387459453c5625eb899e27b5f7e80f9b6;hb=84914c5224fe7d441cc10f30b8418bf4ac4b0a0f;hp=8fd1368b0853150e874fa4e47813ce30837f4b63;hpb=43d4cc1e87d33cdf45dfa01f48221b30f73235cc;p=lgpl%2Fargeo-commons.git

diff --git a/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtTreeView.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtTreeView.java
index 8fd1368b0..778ed4138 100644
--- a/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtTreeView.java
+++ b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/SwtTreeView.java
@@ -6,6 +6,7 @@ import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.ux.CmsIcon;
 import org.argeo.cms.swt.CmsSwtTheme;
 import org.argeo.cms.swt.CmsSwtUtils;
+import org.argeo.cms.ux.widgets.Column;
 import org.argeo.cms.ux.widgets.HierarchicalPart;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
@@ -76,15 +77,18 @@ public class SwtTreeView<T> extends AbstractSwtView<T, T> {
 	protected TreeItem addTreeItem(TreeItem parent, T data) {
 		TreeItem item = parent == null ? new TreeItem(tree, SWT.NONE) : new TreeItem(parent, SWT.NONE);
 		item.setData(data);
-		String txt = hierarchicalPart.getText(data);
-		if (txt != null)
-			item.setText(hierarchicalPart.getText(data));
-		CmsIcon icon = hierarchicalPart.getIcon(data);
-		if (icon != null) {
-			Image image = theme.getSmallIcon(icon);
-			item.setImage(image);
+		for (int i = 0; i < hierarchicalPart.getColumnCount(); i++) {
+			Column<T> column = hierarchicalPart.getColumn(i);
+			String txt = column.getText(data);
+			if (txt != null)
+				item.setText(txt);
+			CmsIcon icon = column.getIcon(data);
+			if (icon != null) {
+				Image image = theme.getSmallIcon(icon);
+				item.setImage(image);
+			}
 		}
-		// TODO optimize
+		// TODO optimise
 		List<T> grandChildren = hierarchicalPart.getChildren(data);
 		if (grandChildren.size() != 0)
 			new TreeItem(item, SWT.NONE);