X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.workbench.rap%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fworkbench%2Finternal%2FEntitySingleColumnLabelProvider.java;h=49c39a58d9021c6c6d2e074acb151d915a4b0557;hp=48341c789be2b80e0aa55138b47a1b1175c95969;hb=a4592339d582315077ae7bb87043a6ec7a8bd4a2;hpb=80e0a96419fb63c3510b07081f5491e41099b9bb diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/internal/EntitySingleColumnLabelProvider.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/internal/EntitySingleColumnLabelProvider.java index 48341c7..49c39a5 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/internal/EntitySingleColumnLabelProvider.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/internal/EntitySingleColumnLabelProvider.java @@ -1,23 +1,25 @@ package org.argeo.suite.workbench.internal; import javax.jcr.Node; +import javax.jcr.Property; import javax.jcr.RepositoryException; +import javax.jcr.nodetype.NodeType; import org.argeo.activities.ActivitiesService; import org.argeo.activities.ActivitiesTypes; import org.argeo.activities.ui.ActivityListLabelProvider; import org.argeo.connect.resources.ResourcesService; import org.argeo.connect.ui.ConnectUiConstants; -import org.argeo.connect.ui.ConnectUiUtils; +import org.argeo.connect.ui.SystemWorkbenchService; import org.argeo.connect.ui.util.TagLabelProvider; -import org.argeo.connect.workbench.SystemWorkbenchService; +import org.argeo.connect.util.ConnectUtils; import org.argeo.people.PeopleException; import org.argeo.people.PeopleNames; import org.argeo.people.PeopleService; import org.argeo.people.PeopleTypes; -import org.argeo.people.workbench.rap.providers.GroupLabelProvider; -import org.argeo.people.workbench.rap.providers.OrgListLabelProvider; -import org.argeo.people.workbench.rap.providers.PersonListLabelProvider; +import org.argeo.people.ui.providers.GroupLabelProvider; +import org.argeo.people.ui.providers.OrgListLabelProvider; +import org.argeo.people.ui.providers.PersonListLabelProvider; import org.argeo.tracker.TrackerTypes; import org.argeo.tracker.ui.TrackerSingleColLP; import org.eclipse.jface.viewers.LabelProvider; @@ -68,9 +70,11 @@ public class EntitySingleColumnLabelProvider extends LabelProvider implements Pe result = mlInstanceLp.getText(element); else if (entity.isNodeType(PeopleTypes.PEOPLE_GROUP)) result = groupLp.getText(element); + else if (entity.isNodeType(NodeType.MIX_TITLE) && entity.hasProperty(Property.JCR_TITLE)) + result = entity.getProperty(Property.JCR_TITLE).getString(); else result = ""; - return ConnectUiUtils.replaceAmpersand(result); + return ConnectUtils.replaceAmpersand(result); } catch (RepositoryException re) { throw new PeopleException("Unable to get formatted value for node", re); }