Project

General

Profile

« Previous | Next » 

Revision ded3de15

Added by Andreas Müller about 7 years ago

ref #6365 use TaxonNameFactory for factory methods in cdmlib-app

View differences:

cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/EfloraTaxonImport.java
66 66
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
67 67
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
68 68
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
69
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
69 70
import eu.etaxonomy.cdm.model.name.TypeDesignationBase;
70 71
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
71 72
import eu.etaxonomy.cdm.model.reference.IBook;
......
150 151
					logger.warn("body has element other than 'taxon'");
151 152
				}
152 153

  
153
				BotanicalName botanicalName = BotanicalName.NewInstance(Rank.SPECIES());
154
				BotanicalName botanicalName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
154 155
				Taxon taxon = Taxon.NewInstance(botanicalName, state.getConfig().getSourceReference());
155 156

  
156 157
				handleTaxonAttributes(elTaxon, taxon, state);
......
1279 1280
		verifyNoAttribute(elHomonym);
1280 1281

  
1281 1282
		//hommonym name
1282
		BotanicalName homonymName = BotanicalName.NewInstance(upperName.getRank());
1283
		BotanicalName homonymName = TaxonNameFactory.NewBotanicalInstance(upperName.getRank());
1283 1284
		homonymName.setGenusOrUninomial(upperName.getGenusOrUninomial());
1284 1285
		homonymName.setInfraGenericEpithet(upperName.getInfraGenericEpithet());
1285 1286
		homonymName.setSpecificEpithet(upperName.getSpecificEpithet());
......
1515 1516
			String homonymString = detail.substring(end);
1516 1517

  
1517 1518
			//hommonym name
1518
			BotanicalName homonymName = BotanicalName.NewInstance(name.getRank());
1519
			BotanicalName homonymName = TaxonNameFactory.NewBotanicalInstance(name.getRank());
1519 1520
			homonymName.setGenusOrUninomial(name.getGenusOrUninomial());
1520 1521
			homonymName.setInfraGenericEpithet(name.getInfraGenericEpithet());
1521 1522
			homonymName.setSpecificEpithet(name.getSpecificEpithet());
......
1650 1651
	private TaxonNameBase makeName(Taxon taxon,HomotypicalGroup homotypicalGroup, boolean isSynonym) {
1651 1652
		TaxonNameBase<?,?> name;
1652 1653
		if (isSynonym){
1653
			name = BotanicalName.NewInstance(Rank.SPECIES(), homotypicalGroup);
1654
			name = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES(), homotypicalGroup);
1654 1655
			SynonymType synonymType = SynonymType.HETEROTYPIC_SYNONYM_OF();
1655 1656
			if (taxon.getHomotypicGroup().equals(homotypicalGroup)){
1656 1657
				synonymType = SynonymType.HOMOTYPIC_SYNONYM_OF();

Also available in: Unified diff