update ReferenceFactory method
authorAndreas Müller <a.mueller@bgbm.org>
Tue, 23 Apr 2013 14:26:33 +0000 (14:26 +0000)
committerAndreas Müller <a.mueller@bgbm.org>
Tue, 23 Apr 2013 14:26:33 +0000 (14:26 +0000)
cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestTaxonFunction.java

index 741f1ae1c9e3db0e9b1e99c7693e2e96c7e34592..ab0b5d2b40bc0b105a828fb69bc7e399cdd99566 100644 (file)
@@ -63,32 +63,31 @@ public class TestTaxonFunction {
                DbSchemaValidation hbm2dll = DbSchemaValidation.CREATE;\r
                CdmApplicationController cdmApp = getCdmApplicationController("defaultMySql", hbm2dll);\r
 \r
-               INonViralNameParser parser = NonViralNameParserImpl.NewInstance();\r
-               ReferenceFactory refFactory = ReferenceFactory.newInstance();\r
-               Reference sec = refFactory.newBook();\r
+               INonViralNameParser<?> parser = NonViralNameParserImpl.NewInstance();\r
+               Reference<?> sec = ReferenceFactory.newBook();\r
                sec.setTitleCache("ConceptRef", true);\r
 \r
                //root\r
                String rootName = "Hieracium L.";\r
-               TaxonNameBase botanicalName= parser.parseFullName(rootName);\r
+               TaxonNameBase<?,?> botanicalName= parser.parseFullName(rootName);\r
                sec.setUuid(getRefUuid());\r
                Taxon genusTaxon = Taxon.NewInstance(botanicalName, sec);\r
 \r
                //child1\r
                String child1Name = "Hieracium asturianum Pau";\r
-               TaxonNameBase botSpecies= parser.parseFullName(child1Name);\r
+               TaxonNameBase<?,?> botSpecies= parser.parseFullName(child1Name);\r
                Taxon childTaxon = Taxon.NewInstance(botSpecies, sec);\r
                childTaxon.setTaxonomicParent(genusTaxon, null, null);\r
 \r
                //child2\r
                String child2Name = "Hieracium wolffii Zahn";\r
-               TaxonNameBase botSpecies2= parser.parseFullName(child2Name);\r
+               TaxonNameBase<?,?> botSpecies2= parser.parseFullName(child2Name);\r
                Taxon childTaxon2 = Taxon.NewInstance(botSpecies2, sec);\r
                childTaxon2.setTaxonomicParent(childTaxon, null, null);\r
 \r
                //synonym\r
                String synonymName = "Acacium wolffii Syn.";\r
-               TaxonNameBase botSynName= parser.parseFullName(synonymName);\r
+               TaxonNameBase<?,?> botSynName= parser.parseFullName(synonymName);\r
 \r
                Synonym synTaxon = Synonym.NewInstance(botSynName, sec);\r
                childTaxon2.addSynonym(synTaxon, SynonymRelationshipType.HETEROTYPIC_SYNONYM_OF());\r
@@ -111,7 +110,7 @@ public class TestTaxonFunction {
                        initDatabase();\r
                }\r
                CdmApplicationController cdmApp = getCdmApplicationController("defaultMySql", DbSchemaValidation.VALIDATE);\r
-               Reference sec = cdmApp.getReferenceService().find(getRefUuid());\r
+               Reference<?> sec = cdmApp.getReferenceService().find(getRefUuid());\r
                List<Taxon> rootList = cdmApp.getTaxonService().getRootTaxa(sec, CdmFetch.NO_FETCH(), false);\r
                for (Taxon taxon:rootList){\r
                        System.out.println(taxon);\r