Revision bf3b1132
Added by Andreas Müller almost 4 years ago
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TimePeriod.java | ||
---|---|---|
39 | 39 |
import com.fasterxml.jackson.annotation.JsonIgnore; |
40 | 40 |
|
41 | 41 |
import eu.etaxonomy.cdm.common.CdmUtils; |
42 |
import eu.etaxonomy.cdm.common.UTF8; |
|
43 |
import eu.etaxonomy.cdm.format.common.TimePeriodPartialFormatter; |
|
42 | 44 |
import eu.etaxonomy.cdm.hibernate.search.PartialBridge; |
43 | 45 |
import eu.etaxonomy.cdm.jaxb.PartialAdapter; |
44 |
import eu.etaxonomy.cdm.strategy.cache.common.TimePeriodPartialFormatter; |
|
45 | 46 |
|
46 | 47 |
/** |
47 | 48 |
* @author m.doering |
... | ... | |
69 | 70 |
public static final DateTimeFieldType HOUR_TYPE = DateTimeFieldType.hourOfDay(); |
70 | 71 |
public static final DateTimeFieldType MINUTE_TYPE = DateTimeFieldType.minuteOfHour(); |
71 | 72 |
|
73 |
public static final String SEP = UTF8.EN_DASH.toString(); //maybe this will be moved to a formatter class in future |
|
74 |
|
|
72 | 75 |
public static final Partial CONTINUED = new Partial |
73 | 76 |
(new DateTimeFieldType[]{YEAR_TYPE, MONTH_TYPE, DAY_TYPE}, |
74 | 77 |
new int[]{9999, 11, 30}); |
... | ... | |
522 | 525 |
result = CdmUtils.concat("", strStart, "+"); |
523 | 526 |
}else{ |
524 | 527 |
String strEnd = end != null ? end.toString(formatter): null; |
525 |
result = CdmUtils.concat("-", strStart, strEnd);
|
|
528 |
result = CdmUtils.concat(SEP, strStart, strEnd);
|
|
526 | 529 |
} |
527 | 530 |
|
528 | 531 |
return result; |
... | ... | |
534 | 537 |
if (getStartYear() != null){ |
535 | 538 |
result += String.valueOf(getStartYear()); |
536 | 539 |
if (getEndYear() != null){ |
537 |
result += "-" + String.valueOf(getEndYear());
|
|
540 |
result += SEP + String.valueOf(getEndYear());
|
|
538 | 541 |
} |
539 | 542 |
}else{ |
540 | 543 |
if (getEndYear() != null){ |
... | ... | |
564 | 567 |
|
565 | 568 |
//*********** EQUALS **********************************/ |
566 | 569 |
|
567 |
|
|
568 | 570 |
@Override |
569 | 571 |
public boolean equals(Object obj) { |
570 | 572 |
if (obj == null){ |
Also available in: Unified diff
ref #9071, ref #6276 Change TimePeriodFormatting to YYYY-MMM-DD