Revision 2837fda6
Added by Andreas Müller over 6 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/occurrences/SpecimenOrObservationBaseFormatter.java | ||
|---|---|---|
| 24 | 24 |
@Override |
| 25 | 25 |
protected void initFormatKeys(Object object) {
|
| 26 | 26 |
super.initFormatKeys(object); |
| 27 |
SpecimenOrObservationBase specimenOrObservationBase = (SpecimenOrObservationBase)object;
|
|
| 27 |
SpecimenOrObservationBase<?> specimenOrObservationBase = (SpecimenOrObservationBase<?>)object;
|
|
| 28 | 28 |
if(specimenOrObservationBase.getRecordBasis()!=null){
|
| 29 | 29 |
formatKeyMap.put(FormatKey.RECORD_BASIS, specimenOrObservationBase.getRecordBasis().toString()); |
| 30 | 30 |
} |
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java | ||
|---|---|---|
| 129 | 129 |
|
| 130 | 130 |
@ManyToMany(fetch = FetchType.LAZY) |
| 131 | 131 |
@JoinTable(name="DefinedTermBase_StatisticalMeasure") |
| 132 |
private final Set<StatisticalMeasure> recommendedStatisticalMeasures = new HashSet<StatisticalMeasure>();
|
|
| 132 |
private final Set<StatisticalMeasure> recommendedStatisticalMeasures = new HashSet<>(); |
|
| 133 | 133 |
|
| 134 | 134 |
/* for M:M see #4843 */ |
| 135 | 135 |
@ManyToMany(fetch = FetchType.LAZY) |
| 136 | 136 |
@JoinTable(name="DefinedTermBase_SupportedCategoricalEnumeration") |
| 137 |
private final Set<TermVocabulary<State>> supportedCategoricalEnumerations = new HashSet<TermVocabulary<State>>();
|
|
| 137 |
private final Set<TermVocabulary<State>> supportedCategoricalEnumerations = new HashSet<>(); |
|
| 138 | 138 |
|
| 139 | 139 |
|
| 140 | 140 |
@ManyToMany(fetch = FetchType.LAZY) |
| 141 | 141 |
@JoinTable(name="DefinedTermBase_MeasurementUnit") |
| 142 |
private final Set<MeasurementUnit> recommendedMeasurementUnits = new HashSet<MeasurementUnit>();
|
|
| 142 |
private final Set<MeasurementUnit> recommendedMeasurementUnits = new HashSet<>(); |
|
| 143 | 143 |
|
| 144 | 144 |
|
| 145 | 145 |
//copy from RelationshipTermBase |
| ... | ... | |
| 151 | 151 |
) |
| 152 | 152 |
@Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE, CascadeType.DELETE})
|
| 153 | 153 |
// @IndexedEmbedded(depth = 2) |
| 154 |
private Set<Representation> inverseRepresentations = new HashSet<Representation>();
|
|
| 154 |
private Set<Representation> inverseRepresentations = new HashSet<>(); |
|
| 155 | 155 |
|
| 156 | 156 |
private static final UUID uuidUnknown = UUID.fromString("910307f1-dc3c-452c-a6dd-af5ac7cd365c");
|
| 157 | 157 |
public static final UUID uuidDescription = UUID.fromString("9087cdcd-8b08-4082-a1de-34c9ba9fb493");
|
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java | ||
|---|---|---|
| 528 | 528 |
|
| 529 | 529 |
//specimen identifier |
| 530 | 530 |
FormatKey collectionKey = FormatKey.COLLECTION_CODE; |
| 531 |
String specimenIdentifier = CdmFormatterFactory.format(derivedUnit, new FormatKey[] { FormatKey.COLLECTION_CODE });
|
|
| 531 |
String specimenIdentifier = CdmFormatterFactory.format(derivedUnit, collectionKey);
|
|
| 532 | 532 |
if (CdmUtils.isBlank(specimenIdentifier)) {
|
| 533 | 533 |
collectionKey = FormatKey.COLLECTION_NAME; |
| 534 | 534 |
} |
Also available in: Unified diff
cleanup