ref #9071 use getTimePeriod instead of ExtendedTimePeriodPartialFormatter

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
index 21a342c713ce1c4f160971a2e3b17a6a09981ca8..dedb73f6fbd456bd4120e0e26a23ea68f40331bb 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
@@ -17,9 +17,6 @@ import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.LazyInitializationException;
-import org.joda.time.DateTimeFieldType;
-import org.joda.time.Partial;
-import org.joda.time.format.DateTimeFormatter;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.common.CdmUtils;
@@ -79,7 +76,6 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.term.Representation;
-import eu.etaxonomy.cdm.strategy.cache.common.ExtendedTimePeriodPartialFormatter;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
@@ -707,32 +703,11 @@ public class DescriptionHelper {
 
         ExtendedTimePeriod period = element.getPeriod();
 
-        if(period != null){
-            Partial end = period.getEnd()==null? null :period.getEnd().without(DateTimeFieldType.year());
-            Partial extremeEnd = period.getExtremeEnd()== null? null: period.getExtremeEnd().without(DateTimeFieldType.year());
-
-            Partial start = period.getStart()==null? null: period.getStart().without(DateTimeFieldType.year());
-            Partial extremeStart = period.getExtremeStart()==null? null : period.getExtremeStart().without(DateTimeFieldType.year());
-
-            DateTimeFormatter formatter = ExtendedTimePeriodPartialFormatter.NewInstance();
-            if (extremeStart != null){
-                result = "(" + extremeStart.toString(formatter) +"-)";
-            }
-            if (start != null){
-                result += start.toString(formatter);
-            }
-            if (end != null){
-                result += "-" + end.toString(formatter);
-            }
-
-            if (extremeEnd != null){
-                result += "(-" + extremeEnd.toString(formatter)+")";
-            }
+        if (period != null){
+            result = period.getTimePeriod();
         }
 
         return result;
-
-//        return element.getPeriod().toString();
     }
 
     private static boolean isNotBlank(String str){