Basically fixes #2282. I will create new tickets for still open issues.

[taxeditor.git] / taxeditor-bulkeditor / src / main / java / eu / etaxonomy / taxeditor / bulkeditor / BulkEditorLineDisplay.java

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorLineDisplay.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorLineDisplay.java
index 8a8085aeead4311377787132473caf91272f5403..3cfe8bd2c14cf882bc92110b534b226888ac1bf0 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorLineDisplay.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorLineDisplay.java
@@ -25,6 +25,7 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.IAnnotatableEntity;
+import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
@@ -76,19 +77,7 @@ public class BulkEditorLineDisplay implements ILineDisplayStrategy {
         */
        /** {@inheritDoc} */
        public String getText(Object entity) {          
-               String text = null;
-               
-               if(entity instanceof IdentifiableEntity){
-                       IdentifiableEntity identifiableEntity = (IdentifiableEntity) HibernateProxyHelper.deproxy(entity);
-                       if(identifiableEntity instanceof TaxonNameBase){
-                               // TODO it is not very nice to do this here. Please refactor
-                               text = ((TaxonNameBase) identifiableEntity).getFullTitleCache();
-                       }else{
-                               text = identifiableEntity.getTitleCache();
-                       }
-               }
-               
-               return text == null ? "" : text;
+               return editor.getEditorInput().getText((ICdmBase) entity);
        }