Revision c9e66e15
Added by Katja Luther almost 4 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java | ||
|---|---|---|
| 17 | 17 |
|
| 18 | 18 |
import org.apache.commons.lang.StringUtils; |
| 19 | 19 |
import org.hibernate.LazyInitializationException; |
| 20 |
import org.joda.time.DateTimeFieldType; |
|
| 21 |
import org.joda.time.Partial; |
|
| 22 |
import org.joda.time.format.DateTimeFormatter; |
|
| 20 | 23 |
|
| 21 | 24 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; |
| 22 | 25 |
import eu.etaxonomy.cdm.common.CdmUtils; |
| ... | ... | |
| 26 | 29 |
import eu.etaxonomy.cdm.format.description.QuantitativeDataFormatter; |
| 27 | 30 |
import eu.etaxonomy.cdm.model.agent.AgentBase; |
| 28 | 31 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 32 |
import eu.etaxonomy.cdm.model.common.ExtendedTimePeriod; |
|
| 29 | 33 |
import eu.etaxonomy.cdm.model.common.IdentifiableEntity; |
| 30 | 34 |
import eu.etaxonomy.cdm.model.common.Language; |
| 31 | 35 |
import eu.etaxonomy.cdm.model.common.LanguageString; |
| ... | ... | |
| 75 | 79 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
| 76 | 80 |
import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; |
| 77 | 81 |
import eu.etaxonomy.cdm.model.term.Representation; |
| 82 |
import eu.etaxonomy.cdm.strategy.cache.common.ExtendedTimePeriodPartialFormatter; |
|
| 78 | 83 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
| 79 | 84 |
|
| 80 | 85 |
/** |
| ... | ... | |
| 781 | 786 |
* @return |
| 782 | 787 |
*/ |
| 783 | 788 |
private static String getTemporalDataText(TemporalData element) {
|
| 789 |
ExtendedTimePeriod period = element.getPeriod(); |
|
| 790 |
Partial end = period.getEnd().without(DateTimeFieldType.year()); |
|
| 791 |
Partial extremeEnd = period.getExtremeEnd().without(DateTimeFieldType.year()); |
|
| 784 | 792 |
|
| 785 |
return element.getPeriod().toString(); |
|
| 793 |
Partial start = period.getStart().without(DateTimeFieldType.year()); |
|
| 794 |
Partial extremeStart = period.getExtremeStart().without(DateTimeFieldType.year()); |
|
| 795 |
|
|
| 796 |
String result = ""; |
|
| 797 |
DateTimeFormatter formatter = ExtendedTimePeriodPartialFormatter.NewInstance(); |
|
| 798 |
if (extremeStart != null){
|
|
| 799 |
result = "(" + extremeStart.toString(formatter) +"-)";
|
|
| 800 |
} |
|
| 801 |
if (start != null){
|
|
| 802 |
result += start.toString(formatter); |
|
| 803 |
} |
|
| 804 |
if (end != null){
|
|
| 805 |
result += "-" + end.toString(formatter); |
|
| 806 |
} |
|
| 807 |
|
|
| 808 |
if (extremeEnd != null){
|
|
| 809 |
result += "(-" + extremeEnd.toString(formatter)+")"; |
|
| 810 |
} |
|
| 811 |
return result; |
|
| 812 |
|
|
| 813 |
// return element.getPeriod().toString(); |
|
| 786 | 814 |
} |
| 787 | 815 |
|
| 788 | 816 |
private static boolean isNotBlank(String str){
|
Also available in: Unified diff
ref #8990: use the extendedTimePeriodPartialFormatter