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

index 94ce237b0a92b12de3e5937bdbfc2ceca583f643..0170398d86cb51f1947a47b37620fd7f45ccd2a7 100644 (file)
@@ -36,7 +36,6 @@ import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.name.ZoologicalName;\r
-import eu.etaxonomy.cdm.model.reference.IJournal;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
@@ -60,8 +59,7 @@ public class TestService {
 \r
        private static final UUID TEST_TAXON_UUID = UUID.fromString("b3084573-343d-4279-ba92-4ab01bb47db5");\r
        private static CdmApplicationController appCtr;\r
-       ReferenceFactory refFactory = ReferenceFactory.newInstance();\r
-\r
+       \r
        public void testAppController() {\r
                logger.info("Create name objects...");\r
                NonViralName<?> nvn = NonViralName.NewInstance(Rank.SPECIES());\r
@@ -71,7 +69,7 @@ public class TestService {
 \r
                logger.info("Create reference objects...");\r
 \r
-               Reference sec = refFactory.newJournal();\r
+               Reference<?> sec = ReferenceFactory.newJournal();\r
                sec.setTitleCache("TestJournal", true);\r
 \r
                logger.info("Create taxon objects...");\r
@@ -148,7 +146,7 @@ public class TestService {
        public void testDeleteTaxa(){\r
                ITaxonService taxonService = (ITaxonService)appCtr.getTaxonService();\r
                TaxonNameBase<?,?> taxonName = BotanicalName.NewInstance(Rank.SPECIES());\r
-               Reference ref = refFactory.newJournal();\r
+               Reference<?> ref = ReferenceFactory.newJournal();\r
                Taxon taxon1 = Taxon.NewInstance(taxonName, ref);\r
                Taxon taxon2 = Taxon.NewInstance(taxonName, null);\r
                logger.info("Save taxon ...");\r
@@ -186,7 +184,7 @@ public class TestService {
        public void testDeleteRelationship(){\r
                ITaxonService taxonService = (ITaxonService)appCtr.getTaxonService();\r
                TaxonNameBase<?,?> taxonName = BotanicalName.NewInstance(Rank.SPECIES());\r
-               Reference ref = refFactory.newJournal();\r
+               Reference<?> ref = ReferenceFactory.newJournal();\r
                Taxon parent = Taxon.NewInstance(taxonName, ref);\r
                Taxon child = Taxon.NewInstance(taxonName, null);\r
                parent.addTaxonomicChild(child, null, null);\r
@@ -210,7 +208,7 @@ public class TestService {
        public void testTransientRank(){\r
                ITaxonService taxonService = (ITaxonService)appCtr.getTaxonService();\r
                TaxonNameBase<?,?> taxonName = BotanicalName.NewInstance(transientRank);\r
-               Reference ref =  refFactory.newJournal();\r
+               Reference<?> ref =  ReferenceFactory.newJournal();\r
                Taxon taxon = Taxon.NewInstance(taxonName, ref);\r
 \r
                logger.info("Save taxon ...");\r