ref #6365 use TaxonNameFactory for factory methods in TaxEditor

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperationTest.java
index 7fc0175c2961339c06a787fb44321ba7db1af28a..54edfc2f5b63308009114e8ebb749d9b7028e2af 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperationTest.java
@@ -20,6 +20,7 @@ import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
@@ -53,7 +54,7 @@ public class ChangeConceptToSynonymOperationTest extends AbstractTaxeditorOperat
        @BeforeClass
        public static void setUpBeforeClass() throws Exception {
                taxon = Taxon.NewInstance(null, null);
-               concept = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
+               concept = Taxon.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
                homotypicalGroup = HomotypicalGroup.NewInstance();
                
                concept.addTaxonRelation(taxon, TaxonRelationshipType.MISAPPLIED_NAME_FOR(), null, null);

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperationTest.java
index f321f1cf8c16d422667b1c85f55a0ced8f1b07a3..4581d2db379b5735801fb857f3097c0ee510e19e 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperationTest.java
@@ -20,6 +20,7 @@ import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeHomotypicGroupOperation;
@@ -57,7 +58,7 @@ public class ChangeHomotypicGroupOperationTest extends AbstractTaxeditorOperatio
        public static void setUpBeforeClass() throws Exception {
                
                taxon = Taxon.NewInstance(null, null);
-               synonym = Synonym.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
+               synonym = Synonym.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
                
                oldHomotypicalGroup = HomotypicalGroup.NewInstance();
                oldHomotypicalGroup.addTypifiedName(synonym.getName());

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperationTest.java
index c93e37b34d5452f82a41aadef9bc6550d15a162e..73bfe8bbea4d6ad0357f8adcb977348b0a0dca83 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperationTest.java
@@ -18,6 +18,7 @@ import org.junit.Test;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
@@ -47,7 +48,7 @@ public class ChangeSynonymToConceptOperationTest extends AbstractTaxeditorOperat
        public static void setUpBeforeClass() throws Exception {
                
                taxon = Taxon.NewInstance(null, null);
-               synonym = Synonym.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
+               synonym = Synonym.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
                taxonRelationshipType = TaxonRelationshipType.CONTRADICTION();
                
                taxon.addSynonym(synonym, SynonymType.SYNONYM_OF());

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperationTest.java
index e43b20d69b4d20e15de7ae27ee13ad29c05b171f..915307daa33a56efc09a17cf3d4abb9f781d0af7 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperationTest.java
@@ -18,6 +18,7 @@ import org.junit.Test;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
@@ -47,7 +48,7 @@ public class ChangeSynonymToMisapplicationOperationTest extends AbstractTaxedito
        @BeforeClass
        public static void setUpBeforeClass() throws Exception {
                taxon = Taxon.NewInstance(null, null);
-               synonym = Synonym.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
+               synonym = Synonym.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
                synonymType = SynonymType.SYNONYM_OF();
                taxon.addSynonym(synonym, synonymType);
                

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInExisitingHomotypicalGroupOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInExisitingHomotypicalGroupOperationTest.java
index 7386249857cd1cc92772e6fc7f515861407dfda2..1ee35a3af80c0023ffe26874ef5b441b645dc48a 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInExisitingHomotypicalGroupOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInExisitingHomotypicalGroupOperationTest.java
@@ -17,6 +17,7 @@ import org.junit.Test;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.store.operations.AbstractTaxeditorOperationTestBase;
@@ -40,11 +41,11 @@ public class CreateSynonymInExisitingHomotypicalGroupOperationTest extends Abstr
        @Before
        public void setUp() throws Exception {
 
-               taxonName = TaxonNameBase.NewNonViralInstance(null);
+               taxonName = TaxonNameFactory.NewNonViralInstance(null);
                taxon = Taxon.NewInstance(taxonName, null);
 
                homotypicalGroup = HomotypicalGroup.NewInstance();
-               newSynonymName = TaxonNameBase.NewNonViralInstance(null);
+               newSynonymName = TaxonNameFactory.NewNonViralInstance(null);
 
                operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
                                                        undoContext, taxon, homotypicalGroup, newSynonymName, postOperation);

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperationTest.java
index 79bfadebe8218069c08955f497e2001a43ff1af5..f08f60535dab7b0ce7bc51a6b1c1276085b0f3ae 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperationTest.java
@@ -16,6 +16,7 @@ import org.junit.Test;
 
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.editor.name.operation.CreateSynonymInNewGroupOperation;
 import eu.etaxonomy.taxeditor.store.operations.AbstractTaxeditorOperationTestBase;
@@ -36,7 +37,7 @@ public class CreateSynonymInNewGroupOperationTest extends AbstractTaxeditorOpera
        public static void setUpBeforeClass() throws Exception {
                
                taxon = Taxon.NewInstance(null, null);
-               newSynonymName = TaxonNameBase.NewNonViralInstance(null);
+               newSynonymName = TaxonNameFactory.NewNonViralInstance(null);
                
                operation = new CreateSynonymInNewGroupOperation("Create Synonyma In New Group",  undoContext, taxon, newSynonymName, postOperation);
        }

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java
index 243ce3f5495f7e8551566a0e2db4e9ad9a9e837b..848fcf555f7ed3759f68124126f67cce77074616 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java
@@ -21,6 +21,7 @@ import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
@@ -72,7 +73,7 @@ public class SwapSynonymAndAcceptedOperationTest extends AbstractTaxeditorOperat
                (new DefaultTermInitializer()).initialize();
 
                // Create the original accepted taxon
-               oldTaxonName = TaxonNameBase.NewNonViralInstance(null);
+               oldTaxonName = TaxonNameFactory.NewNonViralInstance(null);
                taxon = Taxon.NewInstance(oldTaxonName, null);
 
 //             // Create its parent taxon
@@ -84,14 +85,14 @@ public class SwapSynonymAndAcceptedOperationTest extends AbstractTaxeditorOperat
 //             childTaxon.setTaxonomicParent(taxon, null, null);
 
                // Create a homotypic synonym for the accepted taxon
-               taxon.addHomotypicSynonymName(TaxonNameBase.NewNonViralInstance(null));
+               taxon.addHomotypicSynonymName(TaxonNameFactory.NewNonViralInstance(null));
 //             homotypicSynonym = Synonym.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
 //             HomotypicalGroup acceptedHomotypicalGroup = HomotypicalGroup.NewInstance();
 //             acceptedHomotypicalGroup.addTypifiedName(oldTaxon.getName());
 //             acceptedHomotypicalGroup.addTypifiedName(homotypicSynonym.getName());
 
                // Create a heterotypic synonym that will be used to create the new accepted taxon
-               oldSynonymName = TaxonNameBase.NewNonViralInstance(null);
+               oldSynonymName = TaxonNameFactory.NewNonViralInstance(null);
                oldHeterotypicSynonym = Synonym.NewInstance(oldSynonymName, null);
 //             oldTaxon.addS .addHeterotypicSynonym(oldHeterotypicSynonym, null, null);
                heteroypicalGroup = HomotypicalGroup.NewInstance();
@@ -99,11 +100,11 @@ public class SwapSynonymAndAcceptedOperationTest extends AbstractTaxeditorOperat
                taxon.addSynonym(oldHeterotypicSynonym, SynonymType.HETEROTYPIC_SYNONYM_OF());
 
                // Create a misapplication
-               misapplication = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
+               misapplication = Taxon.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
                taxon.addMisappliedName(misapplication, null, null);
 
                // Create a concept relation
-               concept = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
+               concept = Taxon.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
                conceptRelationshipType = TaxonRelationshipType.CONGRUENT_TO();
                concept.addTaxonRelation(taxon, conceptRelationshipType, null, null);
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java
index 58f680dbffd28c972046d9e52354c1b38e81cfe4..3674afa8762cc81f9ec9d608e6ef9017a2d015f2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java
@@ -14,6 +14,7 @@ import eu.etaxonomy.cdm.model.name.BotanicalName;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.name.ZoologicalName;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -39,9 +40,9 @@ public class NewNonViralNameWizard extends AbstractNewEntityWizard<NonViralName>
        protected NonViralName createNewEntity() {
                NomenclaturalCode code = PreferencesUtil.getPreferredNomenclaturalCode();
                if(code.equals(NomenclaturalCode.ICNAFP )){
-                       return TaxonNameBase.NewBotanicalInstance(null);
+                       return TaxonNameFactory.NewBotanicalInstance(null);
                }else if(code.equals(NomenclaturalCode.ICZN)){
-                       return TaxonNameBase.NewZoologicalInstance(null);
+                       return TaxonNameFactory.NewZoologicalInstance(null);
                }
                return null;
        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonWizard.java
index 9dc7b64d71bc0e123ddae84d9e4d5f81a0bdcbb3..a558f0c406967fac2b1653252407c02f1c4f293a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonWizard.java
@@ -12,6 +12,7 @@ package eu.etaxonomy.taxeditor.newWizard;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameWizardPage;
@@ -35,7 +36,7 @@ public class NewTaxonWizard extends AbstractNewEntityWizard<Taxon> {
        /** {@inheritDoc} */
        @Override
        protected Taxon createNewEntity() {
-               return Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
+               return Taxon.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailElement.java
index 57576cb8ad8bfdb17c66875cf2bae3665543e59d..86b675566db289d5a472a6be0c4f52e6f9a4e0e6 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailElement.java
@@ -15,6 +15,7 @@ import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.name.ZoologicalName;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
@@ -122,7 +123,7 @@ public class AuthorshipDetailElement extends
        @Override
        public void updateContent() {
                if (getEntity() == null) {
-                       setEntity(TaxonNameBase.NewNonViralInstance(null));
+                       setEntity(TaxonNameFactory.NewNonViralInstance(null));
                }
 
                super.updateContent();

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
index d23812c3d572cf4dbc05ceb38ce6a1953547238e..a4f17a28400a4ecb0510ae568057a5b361dcf3c5 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
@@ -20,6 +20,7 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 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.name.ZoologicalName;
 import eu.etaxonomy.cdm.strategy.parser.ParserProblem;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
@@ -126,7 +127,7 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<N
        @Override
        protected void updateContent() {
                if(getEntity() == null){
-                       setEntity(TaxonNameBase.NewNonViralInstance(null));
+                       setEntity(TaxonNameFactory.NewNonViralInstance(null));
                }
 
                super.updateContent();

diff --git a/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java b/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java
index a02580e0beb32ba89058755c529cbf01f2254ca8..02483eb92e1833021726b079c14f006c5171d4d6 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java
+++ b/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java
@@ -19,6 +19,7 @@ import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 
 /**
  * @author n.hoffmann
@@ -46,7 +47,7 @@ public class NameProtectTitleCacheTest /*extends CdmIntegrationTest */{
                
                (new DefaultTermInitializer()).initialize();
                
-               name = TaxonNameBase.NewNonViralInstance(Rank.SPECIES());
+               name = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES());
                
                name.setGenusOrUninomial("Joe");
                name.setSpecificEpithet("mama");

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/AbstractLazyInitializerTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/AbstractLazyInitializerTest.java
index a1346e5295192b9129718db663e7deeab1766f37..5ccc11410617d057da898b28ea8e27f8ce41223b 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/AbstractLazyInitializerTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/AbstractLazyInitializerTest.java
@@ -30,6 +30,7 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.name.BotanicalName;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
@@ -140,7 +141,7 @@ public class AbstractLazyInitializerTest extends BaseRemotingTest {
         public void testCDMEntitySaveLazyNew() {
             Team combAuthor = Team.NewInstance();
             combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
-            BotanicalName name = TaxonNameBase.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
+            BotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
             name.setCombinationAuthorship(combAuthor);
             Taxon tax1 = Taxon.NewInstance(name, null);
             UUID taxonUuid1 = taxonService.save(tax1).getUuid();

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/RemoteLazyLoadingTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/RemoteLazyLoadingTest.java
index 4c357eadef45c678261fc0aaf95958133b1a929f..9e3693d1524fc286ed0711cb30e32e1cbe99372b 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/RemoteLazyLoadingTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/RemoteLazyLoadingTest.java
@@ -30,6 +30,7 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.name.BotanicalName;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
@@ -140,7 +141,7 @@ public class RemoteLazyLoadingTest extends BaseRemotingTest {
 
         Team combAuthor = Team.NewInstance();
         combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
-        BotanicalName name = TaxonNameBase.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
+        BotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
         name.setCombinationAuthorship(combAuthor);
         Taxon taxon = Taxon.NewInstance(name, null);
         UUID taxonUuid = taxonService.save(taxon).getUuid();
@@ -202,7 +203,7 @@ public class RemoteLazyLoadingTest extends BaseRemotingTest {
     public void testCDMEntitySaveLazyNew() {
         Team combAuthor = Team.NewInstance();
         combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
-        BotanicalName name = TaxonNameBase.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
+        BotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
         name.setCombinationAuthorship(combAuthor);
         Taxon tax1 = Taxon.NewInstance(name, null);
         UUID taxonUuid1 = taxonService.save(tax1).getUuid();

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/TaxonNameEditorTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/TaxonNameEditorTest.java
index 8dad50852fcd9fcedf104d2dc0651248db168ca6..6d857439ce0cc1783f9d8aea5adeea96ec3c626e 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/TaxonNameEditorTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/TaxonNameEditorTest.java
@@ -34,6 +34,7 @@ import eu.etaxonomy.cdm.model.name.BotanicalName;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
@@ -65,7 +66,7 @@ public class TaxonNameEditorTest extends BaseOperationTest {
         TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid);
         Taxon taxon = taxonNode.getTaxon();
         HomotypicalGroup group = taxon.getHomotypicGroup();
-        BotanicalName newSynonymName = TaxonNameBase.NewBotanicalInstance(null);
+        BotanicalName newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
         newSynonymName.setTitleCache("New Synonym", true);
         operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
                 undoContext, taxon, group, newSynonymName, postOperation);
@@ -86,7 +87,7 @@ public class TaxonNameEditorTest extends BaseOperationTest {
         TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid);
         Taxon taxon = taxonNode.getTaxon();
         HomotypicalGroup group = taxon.getHomotypicGroup();
-        BotanicalName newSynonymName = TaxonNameBase.NewBotanicalInstance(null);
+        BotanicalName newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
         newSynonymName.setTitleCache("New Synonym", true);
         operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
                 undoContext, taxon, group, newSynonymName, postOperation);
@@ -104,7 +105,7 @@ public class TaxonNameEditorTest extends BaseOperationTest {
         TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid);
         Taxon taxon = taxonNode.getTaxon();
         HomotypicalGroup group = taxon.getHomotypicGroup();
-        BotanicalName newSynonymName = TaxonNameBase.NewBotanicalInstance(null);
+        BotanicalName newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
         newSynonymName.setTitleCache("New Synonym", true);
         operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
                 undoContext, taxon, group, newSynonymName, postOperation);
@@ -120,7 +121,7 @@ public class TaxonNameEditorTest extends BaseOperationTest {
 
         taxonNodeService.merge(taxonNode);
 
-        newSynonymName = TaxonNameBase.NewBotanicalInstance(null);
+        newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
         newSynonymName.setTitleCache("Another New Synonym", true);
         operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
                 undoContext, taxon, group, newSynonymName, postOperation);
@@ -152,7 +153,7 @@ public class TaxonNameEditorTest extends BaseOperationTest {
 
     @Test
     public void addTaxon() {
-        NonViralName taxonName = TaxonNameBase.NewNonViralInstance(null);
+        NonViralName taxonName = TaxonNameFactory.NewNonViralInstance(null);
         Taxon taxon = Taxon.NewInstance(taxonName, null);
         taxonService.merge(taxon);
     }