Project

General

Profile

« Previous | Next » 

Revision da39aca0

Added by Andreas Müller about 7 years ago

ref #6365 merge static methods from BotanicaName to TaxonNameBase

View differences:

cdmlib-model/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java
17 17
import eu.etaxonomy.cdm.model.description.TextData;
18 18
import eu.etaxonomy.cdm.model.name.BotanicalName;
19 19
import eu.etaxonomy.cdm.model.name.Rank;
20
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
20 21
import eu.etaxonomy.cdm.model.reference.Reference;
21 22
import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
22 23
import eu.etaxonomy.cdm.model.taxon.Synonym;
......
43 44
		citationRef.setTitleCache("Sp. lunarum", true);
44 45

  
45 46
        //genus taxon with Name, combinationAuthor,
46
		BotanicalName botName = BotanicalName.NewInstance(Rank.GENUS());
47
		BotanicalName botName = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
47 48
        botName.setTitleCache("Hieracium L.", true);
48 49
        botName.setGenusOrUninomial("Hieracium");
49 50
        botName.setCombinationAuthorship(Person.NewInstance());
......
51 52
        Taxon genusTaxon = Taxon.NewInstance(botName, sec);
52 53

  
53 54
        //a name that is the basionym of genusTaxon's name
54
        BotanicalName basionym = BotanicalName.NewInstance(Rank.GENUS());
55
        BotanicalName basionym = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
55 56
        basionym.setTitleCache("Hieracilla DC.", true);
56 57
        basionym.setGenusOrUninomial("Hieracilla");
57 58
        basionym.setCombinationAuthorship(deCandolle);
58 59
        botName.addBasionym(basionym, null, null, "216");
59 60

  
60 61
        //species taxon that is the child of genus taxon
61
        BotanicalName botSpecies = BotanicalName.NewInstance(Rank.SPECIES());
62
        BotanicalName botSpecies = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
62 63
        botSpecies.setTitleCache("Hieracium asturianum Pau", true);
63 64
        botSpecies.setGenusOrUninomial("Hieracium");
64 65
        botSpecies.setSpecificEpithet("asturianum");
......
67 68
        Taxon childTaxon = Taxon.NewInstance(botSpecies, sec);
68 69

  
69 70
        //homotypic synonym of childTaxon1
70
        BotanicalName botSpecies4= BotanicalName.NewInstance(Rank.SPECIES());
71
        BotanicalName botSpecies4= TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
71 72
        botSpecies4.setTitleCache("Hieracium gueri DC.", true);
72 73
        botSpecies4.setGenusOrUninomial("Hieracium");
73 74
        botSpecies4.setSpecificEpithet("gueri");
......
77 78

  
78 79

  
79 80
        //2nd child species taxon that is the child of genus taxon
80
        BotanicalName botSpecies2= BotanicalName.NewInstance(Rank.SPECIES());
81
        BotanicalName botSpecies2= TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
81 82
        botSpecies2.setTitleCache("Hieracium wolffii Zahn", true);
82 83
        botSpecies2.setGenusOrUninomial("Hieracium");
83 84
        botSpecies2.setSpecificEpithet("wolffii");
......
86 87
        Taxon childTaxon2 = Taxon.NewInstance(botSpecies2, sec);
87 88

  
88 89
        //heterotypic synonym of childTaxon2
89
        BotanicalName botSpecies3= BotanicalName.NewInstance(Rank.SPECIES());
90
        BotanicalName botSpecies3= TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
90 91
        botSpecies3.setTitleCache("Hieracium lupium DC.", true);
91 92
        botSpecies3.setGenusOrUninomial("Hieracium");
92 93
        botSpecies3.setSpecificEpithet("lupium");
......
95 96
        childTaxon2.addSynonym(heteroSynonym, SynonymType.HETEROTYPIC_SYNONYM_OF());
96 97

  
97 98
        //missaplied Name for childTaxon2
98
        BotanicalName missName= BotanicalName.NewInstance(Rank.SPECIES());
99
        BotanicalName missName= TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
99 100
        missName.setTitleCache("Hieracium lupium DC.", true);
100 101
        missName.setGenusOrUninomial("Hieracium");
101 102
        missName.setSpecificEpithet("lupium");

Also available in: Unified diff