Adapt to changes in Connect

[gpl/argeo-suite.git] / org.argeo.suite.workbench.rap / src / org / argeo / suite / workbench / internal / EntitySingleColumnLabelProvider.java

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 48341c789be2b80e0aa55138b47a1b1175c95969..42cd4e358c77aee939e50253f75ef8b82502fc4e 100644 (file)
--- 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,16 +1,18 @@
 package org.argeo.suite.workbench.internal;
 
 import javax.jcr.Node;
 package org.argeo.suite.workbench.internal;
 
 import javax.jcr.Node;

+import javax.jcr.Property;

 import javax.jcr.RepositoryException;
 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.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.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.PeopleException;
 import org.argeo.people.PeopleNames;
 import org.argeo.people.PeopleService;


@@ -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);
                                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 = "";
                        else
                                result = "";

-                       return ConnectUiUtils.replaceAmpersand(result);
+                       return ConnectUtils.replaceAmpersand(result);

                } catch (RepositoryException re) {
                        throw new PeopleException("Unable to get formatted value for node", re);
                }
                } catch (RepositoryException re) {
                        throw new PeopleException("Unable to get formatted value for node", re);
                }