X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fproviders%2FResultTreeLabelProvider.java;h=e3570c2a980ba83b219d4e1b61bd3304f46d60ed;hb=fd6362dda19f29ca746ecefae779694e6cb43dd4;hp=1a55983b5fcc939a1eba5bf0a2190b51aca5eec1;hpb=58e0e18d64a2080680a9f8397b0dfa2894519910;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java
index 1a55983b5..e3570c2a9 100644
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java
@@ -24,6 +24,7 @@ import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.SlcImages;
 import org.argeo.slc.client.ui.SlcUiConstants;
+import org.argeo.slc.client.ui.model.ParentNodeFolder;
 import org.argeo.slc.client.ui.model.ResultParent;
 import org.argeo.slc.client.ui.model.SingleResultNode;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -36,15 +37,21 @@ public class ResultTreeLabelProvider extends LabelProvider {
 
 	@Override
 	public String getText(Object element) {
-		if (element instanceof SingleResultNode) {
-			Node node = ((SingleResultNode) element).getNode();
-			try {
+		try {
+
+			if (element instanceof SingleResultNode) {
+				Node node = ((SingleResultNode) element).getNode();
 				if (node.isNodeType(NodeType.MIX_TITLE))
 					return node.getProperty(Property.JCR_TITLE).getString();
-			} catch (RepositoryException e) {
-				throw new SlcException("Unexpected error while getting "
-						+ "custom result label", e);
+
+			} else if (element instanceof ParentNodeFolder) {
+				Node node = ((ParentNodeFolder) element).getNode();
+				if (node.hasProperty(Property.JCR_TITLE))
+					return node.getProperty(Property.JCR_TITLE).getString();
 			}
+		} catch (RepositoryException e) {
+			throw new SlcException("Unexpected error while getting "
+					+ "custom result label", e);
 		}
 		return ((TreeParent) element).getName();
 	}