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:

app-import/src/main/java/eu/etaxonomy/cdm/app/util/TestDatabase.java
41 41
import eu.etaxonomy.cdm.model.name.BotanicalName;
42 42
import eu.etaxonomy.cdm.model.name.Rank;
43 43
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
44
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
44 45
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
45 46
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
46 47
import eu.etaxonomy.cdm.model.reference.Reference;
......
194 195

  
195 196
        // taxonomic names
196 197

  
197
		nameRoot1 = BotanicalName.NewInstance(rankGenus,"Calendula",null,null,null,linne,null,"p.100", null);
198
		nameRoot1 = TaxonNameFactory.NewBotanicalInstance(rankGenus,"Calendula",null,null,null,linne,null,"p.100", null);
198 199
		nameRoot1.addDescription(taxNameDescription);
199 200
		nameRoot1.addDescription(newTaxNameDesc);
200
		name1 = BotanicalName.NewInstance(rankSpecies,"Calendula",null,"arvensis",null,linne,null,"p.1", null);
201
		synName11 = BotanicalName.NewInstance(rankSpecies,"Caltha",null,"arvensis",null,linne,null,"p.11", null);
202
		synName12 = BotanicalName.NewInstance(rankSpecies,"Calendula",null,"sancta",null,linne,null,"p.12", null);
201
		name1 = TaxonNameFactory.NewBotanicalInstance(rankSpecies,"Calendula",null,"arvensis",null,linne,null,"p.1", null);
202
		synName11 = TaxonNameFactory.NewBotanicalInstance(rankSpecies,"Caltha",null,"arvensis",null,linne,null,"p.11", null);
203
		synName12 = TaxonNameFactory.NewBotanicalInstance(rankSpecies,"Calendula",null,"sancta",null,linne,null,"p.12", null);
203 204

  
204
		name2 = BotanicalName.NewInstance(rankSpecies,"Calendula",null,"lanzae",null,linne,null,"p.2", null);
205
		synName2 = BotanicalName.NewInstance(rankSpecies,"Calendula",null,"echinata",null,linne,null,"p.2", null);
205
		name2 = TaxonNameFactory.NewBotanicalInstance(rankSpecies,"Calendula",null,"lanzae",null,linne,null,"p.2", null);
206
		synName2 = TaxonNameFactory.NewBotanicalInstance(rankSpecies,"Calendula",null,"echinata",null,linne,null,"p.2", null);
206 207

  
207
		name21 = BotanicalName.NewInstance(rankSubspecies,"Calendula",null,"lanzea","something",linne,null,"p.1", null);
208
		//name211 = BotanicalName.NewInstance(rankSpecies,"Calendula",null,"lanzea",null,linne,null,"p.1", null);
209
		//name212 = BotanicalName.NewInstance(rankSpecies,"Calendula",null,"lanzea",null,linne,null,"p.1", null);
208
		name21 = TaxonNameFactory.NewBotanicalInstance(rankSubspecies,"Calendula",null,"lanzea","something",linne,null,"p.1", null);
209
		//name211 = TaxonNameFactory.NewBotanicalInstance(rankSpecies,"Calendula",null,"lanzea",null,linne,null,"p.1", null);
210
		//name212 = TaxonNameFactory.NewBotanicalInstance(rankSpecies,"Calendula",null,"lanzea",null,linne,null,"p.1", null);
210 211

  
211 212
		nameRoot2 =
212
			BotanicalName.NewInstance(rankGenus,"Sonchus",null,null,null,linne,null,"p.200", null);
213
		nameR2_1 = BotanicalName.NewInstance(rankSpecies,"Sonchus",null,"child1",null,linne,null,"p.1", null);
214
		nameR2_2 = BotanicalName.NewInstance(rankSpecies,"Sonchus",null,"child2",null,linne,null,"p.2", null);
213
			TaxonNameFactory.NewBotanicalInstance(rankGenus,"Sonchus",null,null,null,linne,null,"p.200", null);
214
		nameR2_1 = TaxonNameFactory.NewBotanicalInstance(rankSpecies,"Sonchus",null,"child1",null,linne,null,"p.1", null);
215
		nameR2_2 = TaxonNameFactory.NewBotanicalInstance(rankSpecies,"Sonchus",null,"child2",null,linne,null,"p.2", null);
215 216

  
216
		nameFree = BotanicalName.NewInstance(rankSpecies,"Cichorium",null,"intybus",null,linne,null,"p.200", null);
217
		synNameFree = BotanicalName.NewInstance(rankSpecies,"Cichorium",null,"balearicum",null,linne,null,"p.2", null);
217
		nameFree = TaxonNameFactory.NewBotanicalInstance(rankSpecies,"Cichorium",null,"intybus",null,linne,null,"p.200", null);
218
		synNameFree = TaxonNameFactory.NewBotanicalInstance(rankSpecies,"Cichorium",null,"balearicum",null,linne,null,"p.2", null);
218 219

  
219 220
		taxonomicNames.add(nameRoot1);
220 221
		taxonomicNames.add(name1);

Also available in: Unified diff