remove deproxy

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / util / TaxonTreeNodeLabelProvider.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/TaxonTreeNodeLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/TaxonTreeNodeLabelProvider.java
index 849abbdb57405f87d6e8a8881cb0326bb058f304..979670c2fea6fb90e263ff7366363e867c16643d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/TaxonTreeNodeLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/TaxonTreeNodeLabelProvider.java
@@ -17,7 +17,6 @@ import org.hibernate.LazyInitializationException;
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
@@ -43,7 +42,7 @@ public class TaxonTreeNodeLabelProvider
         //classification
         if(element instanceof Classification){
             String text = ((Classification) element).getName().getText();
-            return text != null ? text : "Unnamed Taxonomic Tree";
+            return text != null ? text : "Unnamed Classification";
         }
         //taxon node
         else if (element instanceof TaxonNode){
@@ -59,10 +58,10 @@ public class TaxonTreeNodeLabelProvider
                 }else{
                     try{
                         String text = "";
-                            if (taxonNode.getStatus() != null){
-                                text += taxonNode.getStatus().getSymbol() + " ";
-                            }
-                        text += taxon.getName() != null ? ((IIdentifiableEntity) HibernateProxyHelper.deproxy(taxon.getName())).getTitleCache() : new String();
+                        if (taxonNode.getStatus() != null){
+                            text = taxonNode.getStatus().getSymbol() + " ";
+                        }
+                        text += taxon.getName() != null ? taxon.getName().getTitleCache() : "";
                         return text;
                     }catch(Exception e){
                         MessagingUtils.error(getClass(), e);