From: Andreas Müller <a.mueller@bgbm.org>
Date: Tue, 23 Apr 2013 14:26:33 +0000 (+0000)
Subject: update ReferenceFactory method
X-Git-Tag: cdmlib-parent-3.2.0~59
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/dd9756831104922e66aced3a1688010f8d1b4c90

update ReferenceFactory method
---

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