Merge branch 'develop' into wset

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / model / NameHelper.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/NameHelper.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/NameHelper.java
index 0058d91d69ba07caf655a52023d5f7748dc41423..c97bc5c98b5dd164428d56f9848f5783f4f459fa 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/NameHelper.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/NameHelper.java
@@ -10,7 +10,7 @@
 package eu.etaxonomy.taxeditor.model;
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 
 /**
@@ -29,10 +29,19 @@ public class NameHelper {
         * @param name a {@link eu.etaxonomy.cdm.model.name.TaxonNameBase} object.
         * @return a {@link java.lang.String} object.
         */
-       public static String getDisplayName(TaxonNameBase name){
+       public static String getDisplayName(TaxonName name){
                return name.getTitleCache();
        }
        
+       /**
+        * <p>getDisplayName</p>
+        *
+        * @param name a {@link eu.etaxonomy.cdm.model.name.TaxonNameBase} object.
+        * @return a {@link java.lang.String} object.
+        */
+       public static String getDisplayNameCache(TaxonBase taxon){
+               return taxon.getName().getNameCache();
+       }
        /**
         * <p>getDisplayName</p>
         *
@@ -50,7 +59,7 @@ public class NameHelper {
         * @return a {@link java.lang.String} object.
         */
        public static String getDisplayNameWithRef(TaxonBase taxonBase) {
-               TaxonNameBase name = (TaxonNameBase) HibernateProxyHelper.deproxy(taxonBase.getName());
+               TaxonName name = HibernateProxyHelper.deproxy(taxonBase.getName());
                if (name != null) {
                        String fullTitle = name.generateFullTitle();
                        if (fullTitle != null){  //should never be null