Project

General

Profile

« Previous | Next » 

Revision 51688d00

Added by Andreas Müller almost 7 years ago

ref #6368 , ref #6671, ref #6630 adapt pesi to no taxon name model

View differences:

cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaAdditionalTaxonDataImport.java
24 24
import eu.etaxonomy.cdm.model.common.CdmBase;
25 25
import eu.etaxonomy.cdm.model.name.INonViralName;
26 26
import eu.etaxonomy.cdm.model.name.ITaxonNameBase;
27
import eu.etaxonomy.cdm.model.name.NonViralName;
28
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
27
import eu.etaxonomy.cdm.model.name.TaxonName;
29 28
import eu.etaxonomy.cdm.model.taxon.Taxon;
30 29
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
31 30

  
......
78 77
		FaunaEuropaeaImportConfigurator fauEuConfig = state.getConfig();
79 78
		ICdmDataSource destination = fauEuConfig.getDestination();
80 79
		TransactionStatus txStatus = null;
81
		List<TaxonNameBase> taxonNames = null;
80
		List<TaxonName> taxonNames = null;
82 81
		txStatus = startTransaction(false);
83 82

  
84 83
		String selectQuery = "SELECT t.uuid from TaxonNameBase t INNER JOIN " +
......
103 102
		if (!uuidSet.isEmpty()){
104 103
			taxonNames = getNameService().find(uuidSet);
105 104

  
106
			for (TaxonNameBase<?,?> taxonName : taxonNames) {
105
			for (TaxonName taxonName : taxonNames) {
107 106

  
108 107
				// Check whether its taxonName has an infraGenericEpithet
109
				if (taxonName != null && (taxonName.isInstanceOf(NonViralName.class))) {
110
					INonViralName targetNonViralName = CdmBase.deproxy(taxonName, NonViralName.class);
108
				if (taxonName != null) {
109
					INonViralName targetNonViralName = CdmBase.deproxy(taxonName);
111 110
					String infraGenericEpithet = targetNonViralName.getInfraGenericEpithet();
112 111
					if (infraGenericEpithet == null) {
113 112
						String genusOrUninomial = targetNonViralName.getGenusOrUninomial();
......
119 118
							TaxonBase<?> taxon = foundTaxa.iterator().next();
120 119
							if (taxon != null) {
121 120
								ITaxonNameBase name = taxon.getName();
122
								if (name != null && name.isInstanceOf(NonViralName.class)) {
123
									INonViralName nonViralName = CdmBase.deproxy(name, NonViralName.class);
121
								if (name != null) {
122
									INonViralName nonViralName = CdmBase.deproxy(name, TaxonName.class);
124 123
									infraGenericEpithet = nonViralName.getInfraGenericEpithet();
125 124

  
126 125
									// set infraGenericEpithet

Also available in: Unified diff