X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/be8935fa19e55a0e414a7a6829d4fbd663710e64..e6d7b501267d6cb02fe490b26fd8a2cede1536c5:/cdmlib-services/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java
index e54f7d6c69..59a6328dcc 100644
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java
@@ -18,13 +18,15 @@ import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TextData;
-import eu.etaxonomy.cdm.model.name.BotanicalName;
+import eu.etaxonomy.cdm.model.name.IBotanicalName;
 import eu.etaxonomy.cdm.model.name.Rank;
+import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
-import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
+import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 
 public class TaxonGenerator {
@@ -53,13 +55,14 @@ public class TaxonGenerator {
 		int descrIndex = 6000;
 		Person deCandolle = Person.NewInstance();
 		deCandolle.setTitleCache("DC.", true);
-		Reference<?> sec = ReferenceFactory.newDatabase();
+
+		Reference sec = ReferenceFactory.newDatabase();
 		sec.setTitleCache("Flora lunaea", true);
-		Reference<?> citationRef = ReferenceFactory.newBook();
+		Reference citationRef = ReferenceFactory.newBook();
 		citationRef.setTitleCache("Sp. lunarum", true);
 
         //genus taxon with Name, combinationAuthor,
-		BotanicalName botName = BotanicalName.NewInstance(Rank.GENUS());
+		IBotanicalName botName = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
         botName.setTitleCache("Hieracium L.", true);
         botName.setGenusOrUninomial("Hieracium");
         botName.setCombinationAuthorship(Person.NewInstance());
@@ -69,7 +72,7 @@ public class TaxonGenerator {
         genusTaxon.setUuid(GENUS_UUID);
 
         //a name that is the basionym of genusTaxon's name
-        BotanicalName basionym = BotanicalName.NewInstance(Rank.GENUS());
+        TaxonNameBase basionym = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
         basionym.setTitleCache("Hieracilla DC.", true);
         basionym.setGenusOrUninomial("Hieracilla");
         basionym.setCombinationAuthorship(deCandolle);
@@ -77,7 +80,7 @@ public class TaxonGenerator {
         botName.addBasionym(basionym, null, null,"216");
 
         //species taxon that is the child of genus taxon
-        BotanicalName botSpecies = BotanicalName.NewInstance(Rank.SPECIES());
+        IBotanicalName botSpecies = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
         botSpecies.setTitleCache("Hieracium asturianum Pau", true);
         botSpecies.setGenusOrUninomial("Hieracium");
         botSpecies.setSpecificEpithet("asturianum");
@@ -89,23 +92,23 @@ public class TaxonGenerator {
         TaxonDescription taxDesc = getTestDescription(descrIndex++);
         //taxDesc.setUuid(DESCRIPTION1_UUID);
         childTaxon.addDescription(taxDesc);
+
         Classification classification = getTestClassification("TestClassification");
         classification.addParentChild(genusTaxon, childTaxon, citationRef, "456");
-//        childTaxon.setTaxonomicParent(genusTaxon, citationRef, "456");
 
         //homotypic synonym of childTaxon1
-        BotanicalName botSpecies4= BotanicalName.NewInstance(Rank.SPECIES());
+        IBotanicalName botSpecies4= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
         botSpecies4.setTitleCache("Hieracium gueri DC.", true);
         botSpecies4.setGenusOrUninomial("Hieracium");
         botSpecies4.setSpecificEpithet("gueri");
         botSpecies4.setCombinationAuthorship(deCandolle);
         botSpecies4.setUuid(SYNONYM_NAME_UUID);
         Synonym homoSynonym = Synonym.NewInstance(botSpecies4, sec);
-        childTaxon.addSynonym(homoSynonym, SynonymRelationshipType.HOMOTYPIC_SYNONYM_OF());
+        childTaxon.addSynonym(homoSynonym, SynonymType.HOMOTYPIC_SYNONYM_OF());
 
 
         //2nd child species taxon that is the child of genus taxon
-        BotanicalName botSpecies2= BotanicalName.NewInstance(Rank.SPECIES());
+        IBotanicalName botSpecies2= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
         botSpecies2.setTitleCache("Hieracium wolffii Zahn", true);
         botSpecies2.setGenusOrUninomial("Hieracium");
         botSpecies2.setSpecificEpithet("wolffii");
@@ -115,20 +118,19 @@ public class TaxonGenerator {
         Taxon childTaxon2 = Taxon.NewInstance(botSpecies2, sec);
         childTaxon2.setUuid(SPECIES2_UUID);
         classification.addParentChild(genusTaxon, childTaxon2, citationRef, "499");
-        //childTaxon2.setTaxonomicParent(genusTaxon, citationRef, "499");
 
         //heterotypic synonym of childTaxon2
-        BotanicalName botSpecies3= BotanicalName.NewInstance(Rank.SPECIES());
+        IBotanicalName botSpecies3= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
         botSpecies3.setTitleCache("Hieracium lupium DC.", true);
         botSpecies3.setGenusOrUninomial("Hieracium");
         botSpecies3.setSpecificEpithet("lupium");
         botSpecies3.setCombinationAuthorship(deCandolle);
         botSpecies3.setUuid(SYNONYM2_NAME_UUID);
         Synonym heteroSynonym = Synonym.NewInstance(botSpecies3, sec);
-        childTaxon2.addSynonym(heteroSynonym, SynonymRelationshipType.HETEROTYPIC_SYNONYM_OF());
+        childTaxon2.addSynonym(heteroSynonym, SynonymType.HETEROTYPIC_SYNONYM_OF());
 
         //missaplied Name for childTaxon2
-        BotanicalName missName= BotanicalName.NewInstance(Rank.SPECIES());
+        IBotanicalName missName= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
         missName.setTitleCache("Hieracium lupium DC.", true);
         missName.setGenusOrUninomial("Hieracium");
         missName.setSpecificEpithet("lupium");