Revision ea7deae0
Added by Andreas Müller almost 7 years ago
| app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceSourceImport.java | ||
|---|---|---|
| 129 | 129 |
if (ref != null){
|
| 130 | 130 |
DescriptionElementSource originalSource = DescriptionElementSource.NewInstance(OriginalSourceType.PrimaryTaxonomicSource); |
| 131 | 131 |
originalSource.setCitation(ref); |
| 132 |
TaxonName<?,?> taxonName;
|
|
| 132 |
TaxonName taxonName; |
|
| 133 | 133 |
taxonName = TaxonName.castAndDeproxy(getName(state, oldName, oldNameFk)); |
| 134 | 134 |
if (taxonName != null){
|
| 135 | 135 |
originalSource.setNameUsedInSource(taxonName); |
| ... | ... | |
| 227 | 227 |
*/ |
| 228 | 228 |
boolean isFirstTimeNoNameByService = true; |
| 229 | 229 |
private INonViralName getName(BerlinModelImportState state, String oldName, Integer oldNameFk) {
|
| 230 |
TaxonName<?,?> taxonName = (TaxonName)state.getRelatedObject(BerlinModelTaxonNameImport.NAMESPACE, String.valueOf(oldNameFk));
|
|
| 230 |
TaxonName taxonName = (TaxonName)state.getRelatedObject(BerlinModelTaxonNameImport.NAMESPACE, String.valueOf(oldNameFk)); |
|
| 231 | 231 |
if (taxonName == null && oldName != null){
|
| 232 | 232 |
if (isFirstTimeNoNameByService){
|
| 233 | 233 |
logger.warn("oldName not checked against names in BerlinModel. Just take it as a string");
|
Also available in: Unified diff
fix #6671 remove generics for TaxonName