fixing missing text of Group members (User) in details section

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
index 1792d441c0191c6247671e1fc89857d1444fa3e7..3ee7c331651fbc3734e820ef19ffb081bb7d1943 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
@@ -19,7 +19,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.ISources;
 import org.springframework.security.core.GrantedAuthority;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
@@ -29,10 +28,9 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
+import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD;
-import eu.etaxonomy.cdm.persistence.hibernate.permission.CdmAuthority;
-import eu.etaxonomy.cdm.persistence.hibernate.permission.CdmPermissionClass;
 import eu.etaxonomy.taxeditor.model.ImageResources;
 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -67,7 +65,7 @@ public class EntitySelectionElement<T extends ICdmBase> extends
        private static final EnumSet<CRUD> UPDATE = EnumSet.of(CRUD.UPDATE);
        private static final EnumSet<CRUD> DELETE = EnumSet.of(CRUD.DELETE);
        private static final EnumSet<CRUD> CREATE = EnumSet.of(CRUD.CREATE);
-       
+
        /**
         * Bitmask for configuring functionality of selection element
         */
@@ -309,7 +307,10 @@ public class EntitySelectionElement<T extends ICdmBase> extends
                                return ((Group) entity).getName();
                        } else if(entity instanceof GrantedAuthority){
                                return GrantedAuthorityLabelTextProvider.getText(((GrantedAuthority) entity));
-                       }
+                       } else if(entity instanceof User){
+                return ((User) entity).getUsername();
+            }
+
                }
                return "";
        }
@@ -462,7 +463,7 @@ public class EntitySelectionElement<T extends ICdmBase> extends
        @Override
        public void update(CdmDataChangeMap changeEvents) {
        }
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement#removeElements()
         */
@@ -481,6 +482,6 @@ public class EntitySelectionElement<T extends ICdmBase> extends
        }
 
        private void updateButtonStates() {
-               button_edit.setEnabled(isEditable && button_selection.isEnabled() && getEntity() != null && CdmStore.currentAuthentiationHasPermission((CdmBase) getEntity(), UPDATE));         
+               button_edit.setEnabled(isEditable && button_selection.isEnabled() && getEntity() != null && CdmStore.currentAuthentiationHasPermission((CdmBase) getEntity(), UPDATE));
        }
 }