Revision 5d5e8580
Added by Andreas Müller over 9 years ago
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceImport.java | ||
---|---|---|
45 | 45 |
import eu.etaxonomy.cdm.model.common.TermVocabulary; |
46 | 46 |
import eu.etaxonomy.cdm.model.description.DescriptionElementBase; |
47 | 47 |
import eu.etaxonomy.cdm.model.description.Distribution; |
48 |
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;
|
|
48 |
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm; |
|
49 | 49 |
import eu.etaxonomy.cdm.model.description.TaxonDescription; |
50 | 50 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
51 | 51 |
import eu.etaxonomy.cdm.model.location.NamedAreaLevel; |
... | ... | |
338 | 338 |
|
339 | 339 |
try { |
340 | 340 |
//status |
341 |
PresenceAbsenceTermBase<?> status = null;
|
|
341 |
PresenceAbsenceTerm status = null; |
|
342 | 342 |
String alternativeStatusString = null; |
343 | 343 |
if (emStatusId != null){ |
344 | 344 |
status = BerlinModelTransformer.occStatus2PresenceAbsence(emStatusId); |
... | ... | |
501 | 501 |
Distribution oldDistr = HibernateProxyHelper.deproxy(descElBase, Distribution.class); |
502 | 502 |
NamedArea oldArea = oldDistr.getArea(); |
503 | 503 |
if (oldArea != null && oldArea.equals(distribution.getArea())){ |
504 |
PresenceAbsenceTermBase<?> oldStatus = oldDistr.getStatus();
|
|
504 |
PresenceAbsenceTerm oldStatus = oldDistr.getStatus(); |
|
505 | 505 |
if (oldStatus != null && oldStatus.equals(distribution.getStatus())){ |
506 | 506 |
duplicateMap.put(bmDistributionId, oldDistr.getSources().iterator().next().getIdInSource()); |
507 | 507 |
return oldDistr; |
Also available in: Unified diff
adapt app-import to model 3.4.1