Start using entity framework.

[gpl/argeo-suite.git] / org.argeo.suite.e4 / src / org / argeo / suite / e4 / parts / EntitySingleColumnLabelProvider.java

diff --git a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/EntitySingleColumnLabelProvider.java b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/EntitySingleColumnLabelProvider.java
index 490ae13433b6c77db63d815f57e279bcc3732dbb..5387d304662c1d1c45f7e0d2066d5fa4d73f3b89 100644 (file)
--- a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/EntitySingleColumnLabelProvider.java
+++ b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/EntitySingleColumnLabelProvider.java
@@ -22,15 +22,14 @@ 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.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.swt.graphics.Image;
 
 /**
  * Provide a single column label provider for entity lists. Icon and displayed
  * text vary with the element node type
  */
-public class EntitySingleColumnLabelProvider implements PeopleNames, ILabelProvider {
+public class EntitySingleColumnLabelProvider extends ColumnLabelProvider implements PeopleNames {
        private static final long serialVersionUID = 3111885324210673320L;
 
        private SystemWorkbenchService systemWorkbenchService;
@@ -71,9 +70,12 @@ public class EntitySingleColumnLabelProvider implements PeopleNames, ILabelProvi
                                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
+                       else if (entity.isNodeType(NodeType.MIX_TITLE)) {
+                               if (entity.hasProperty(Property.JCR_TITLE))
+                                       result = entity.getProperty(Property.JCR_TITLE).getString();
+                               else
+                                       result = entity.getName();
+                       } else
                                result = "";
                        return ConnectUtils.replaceAmpersand(result);
                } catch (RepositoryException re) {
@@ -87,28 +89,4 @@ public class EntitySingleColumnLabelProvider implements PeopleNames, ILabelProvi
                return systemWorkbenchService.getIconForType((Node) element);
        }
 
-       @Override
-       public void addListener(ILabelProviderListener listener) {
-               // TODO Auto-generated method stub
-
-       }
-
-       @Override
-       public void dispose() {
-               // TODO Auto-generated method stub
-
-       }
-
-       @Override
-       public boolean isLabelProperty(Object element, String property) {
-               // TODO Auto-generated method stub
-               return false;
-       }
-
-       @Override
-       public void removeListener(ILabelProviderListener listener) {
-               // TODO Auto-generated method stub
-
-       }
-
 }