fix #6360 use TaxonNameFactory for NonViralNames

diff --git a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/occurrence/gbif/GbifJsonOccurrenceParser.java b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/occurrence/gbif/GbifJsonOccurrenceParser.java
index 84471f4737ce27fedc9875f3bb22a0c3cba03a77..4f50db220b0fa98da75a0557717e411c215e2725 100644 (file)
--- a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/occurrence/gbif/GbifJsonOccurrenceParser.java
+++ b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/occurrence/gbif/GbifJsonOccurrenceParser.java
@@ -270,10 +270,10 @@ public class GbifJsonOccurrenceParser {
                                 } else if (record.getString(KINGDOM).equals(BACTERIA)){
                                     name = TaxonNameFactory.NewBacterialInstance(rank);
                                 } else{
-                                    name = TaxonNameBase.NewNonViralInstance(rank);
+                                    name = TaxonNameFactory.NewNonViralInstance(rank);
                                 }
                             } else{
-                                name = TaxonNameBase.NewNonViralInstance(rank);
+                                name = TaxonNameFactory.NewNonViralInstance(rank);
                             }
                         }
                         if (record.has(GENUS)){

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImport.java
index b4e13a83d67556039b9760abebf8c17f29a9955b..79253cba510bbd9006d3370b28061c1fa222d969 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImport.java
@@ -46,7 +46,6 @@ import eu.etaxonomy.cdm.model.description.TaxonNameDescription;
 import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.media.Media;
-import eu.etaxonomy.cdm.model.name.BotanicalName;
 import eu.etaxonomy.cdm.model.name.ITaxonNameBase;
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
@@ -54,6 +53,7 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
 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.reference.INomenclaturalReference;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
@@ -506,7 +506,7 @@ public class NormalExplicitImport extends TaxonExcelImporterBase {
         }else if (nc.isKindOf(NomenclaturalCode.ICNAFP)){
             name = TaxonNameBase.NewBotanicalInstance(taxonBase.getName().getRank());
         } else{
-            name = TaxonNameBase.NewNonViralInstance(taxonBase.getName().getRank());
+            name = TaxonNameFactory.NewNonViralInstance(taxonBase.getName().getRank());
         }
         name.setTitleCache(synonymNameStr, true);
         if (name != null){

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/ikeyplus/IkeyPlusImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/ikeyplus/IkeyPlusImport.java
index 83dae3c958257f50f164104fca6cd3d3a6d968f8..313b50c45742a97b8656d43cdfe246f75c352f5e 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/ikeyplus/IkeyPlusImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/ikeyplus/IkeyPlusImport.java
@@ -29,7 +29,7 @@ import eu.etaxonomy.cdm.model.description.PolytomousKey;
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 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 fr.lis.ikeyplus.IO.SDDSaxParser;
 import fr.lis.ikeyplus.model.DataSet;
 import fr.lis.ikeyplus.model.ICharacter;
@@ -173,7 +173,7 @@ public class IkeyPlusImport extends CdmImportBase<IkeyPlusImportConfigurator, Ik
                 pkNode = createPkNode(null, statement);
 
                 //TODO handle rank
-                NonViralName<?> nonViralName = TaxonNameBase.NewNonViralInstance(Rank.UNKNOWN_RANK());
+                NonViralName<?> nonViralName = TaxonNameFactory.NewNonViralInstance(Rank.UNKNOWN_RANK());
                 nonViralName.setTitleCache(taxon.getName(), true);
                 eu.etaxonomy.cdm.model.taxon.Taxon cdmTaxon = eu.etaxonomy.cdm.model.taxon.Taxon.NewInstance(
                         nonViralName, null); //FIXME !!!!!!

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java
index 2bc0a5489dfa10dc21a54b006af74f37309f5cef..3371b8d803f41af57cd9109989d5c06bbb94e1ee 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java
@@ -83,6 +83,7 @@ import eu.etaxonomy.cdm.model.name.INonViralName;
 import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;\r
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
@@ -918,7 +919,7 @@ public class SDDImport extends XmlImportBase<SDDImportConfigurator, SDDImportSta
 \r
                                NonViralName<?> tnb = null;\r
                                if (!id.equals("")) {\r
-                                       tnb = TaxonNameBase.NewNonViralInstance(defaultRank);\r
+                                       tnb = TaxonNameFactory.NewNonViralInstance(defaultRank);\r
                                        IdentifiableSource source = null;\r
                                        if (isNotBlank(uri)) {\r
                                                //TODO type\r
@@ -1223,7 +1224,7 @@ public class SDDImport extends XmlImportBase<SDDImportConfigurator, SDDImportSta
        private Taxon handleCDNoScope(Namespace sddNamespace,\r
                SDDImportState cdmState, Element elCodedDescription     ) {\r
                Taxon taxon = null;\r
-               NonViralName<?> nonViralName = TaxonNameBase.NewNonViralInstance(defaultRank);\r
+               NonViralName<?> nonViralName = TaxonNameFactory.NewNonViralInstance(defaultRank);\r
                String id = new String("" + taxonNamesCount);\r
                IdentifiableSource source = IdentifiableSource.NewDataImportInstance(id, "TaxonName");\r
                importRepresentation(elCodedDescription, sddNamespace, nonViralName, id, cdmState);\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java
index e061a1fe1a5eba62d6a76473526c3e07c59e079e..f3aea99d3d36dda81dba7e7e982ecf8298b6dbf6 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java
@@ -164,7 +164,7 @@ public abstract class SpecimenImportBase<CONFIG extends IImportConfigurator, STA
             }else if (state.getDataHolder().getNomenclatureCode().equals(NomenclaturalCode.ICZN)){
                 taxonName = TaxonNameBase.NewZoologicalInstance(rank);
             }else{
-                taxonName = TaxonNameBase.NewNonViralInstance(rank);
+                taxonName = TaxonNameFactory.NewNonViralInstance(rank);
             }
             taxonName.setFullTitleCache(scientificName,true);
             taxonName.setTitleCache(scientificName, true);
@@ -455,11 +455,11 @@ public abstract class SpecimenImportBase<CONFIG extends IImportConfigurator, STA
 
                if (problem) {
                    logger.info("Problem im setTaxonNameByType ");
-                   TaxonNameBase<?,?> taxonName = TaxonNameBase.NewNonViralInstance(null);
+                   TaxonNameBase<?,?> taxonName = TaxonNameFactory.NewNonViralInstance(null);
                    taxonName.setFullTitleCache(fullName, true);
                    return taxonName;
                }
-               TaxonNameBase<?,?> tn = TaxonNameBase.NewNonViralInstance(null);
+               TaxonNameBase<?,?> tn = TaxonNameFactory.NewNonViralInstance(null);
                return tn;
            }
 

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenCdmExcelImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenCdmExcelImport.java
index 313c178880e590b952d018491ba6a2567d5e0a14..aeb38c83765c7ae3085117e725a42e5c5829c2bb 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenCdmExcelImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenCdmExcelImport.java
@@ -52,6 +52,7 @@ import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
 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.model.occurrence.Collection;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
@@ -506,7 +507,7 @@ public class SpecimenCdmExcelImport  extends ExcelTaxonOrSpecimenImportBase<Spec
                        if (nc != null){
                                name = nc.getNewTaxonNameInstance(rank);
                        }else{
-                               name = TaxonNameBase.NewNonViralInstance(rank);
+                               name = TaxonNameFactory.NewNonViralInstance(rank);
                        }
                        if (StringUtils.isNotBlank(commonDetermination.genus)){
                                name.setGenusOrUninomial(commonDetermination.genus);
@@ -644,7 +645,7 @@ public class SpecimenCdmExcelImport  extends ExcelTaxonOrSpecimenImportBase<Spec
         * @return
         */
        private NonViralName<?> makeTaxonName(SpecimenCdmExcelImportState state, DeterminationLight determinationLight) {
-               NonViralName<?> name = TaxonNameBase.NewNonViralInstance(null);
+               NonViralName<?> name = TaxonNameFactory.NewNonViralInstance(null);
                NomenclaturalCode nc = state.getConfig().getNomenclaturalCode();
                if (nc != null){
                        name = (NonViralName<?>)nc.getNewTaxonNameInstance(null);

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSythesysExcelImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSythesysExcelImport.java
index cab2b9b08916818dda1ed7183dfb471a04000996..182994d893021e59d18a56f0c74b6fdfa9fae2f5 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSythesysExcelImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSythesysExcelImport.java
@@ -50,7 +50,7 @@ import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.media.Media;
 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.occurrence.Collection;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
@@ -451,7 +451,7 @@ public class SpecimenSythesysExcelImport  extends CdmImportBase<SpecimenSynthesy
                     taxonName = parseScientificName(scientificName);
                 }
                 else{
-                    taxonName = TaxonNameBase.NewNonViralInstance(null);
+                    taxonName = TaxonNameFactory.NewNonViralInstance(null);
                     taxonName.setTitleCache(scientificName, true);
                 }
                 getNameService().save(taxonName);
@@ -521,7 +521,7 @@ public class SpecimenSythesysExcelImport  extends CdmImportBase<SpecimenSynthesy
         }
 
         if(nomenclatureCode == null){
-            taxonName = TaxonNameBase.NewNonViralInstance(null);
+            taxonName = TaxonNameFactory.NewNonViralInstance(null);
             taxonName.setTitleCache(scientificName, true);
             return taxonName;
         }
@@ -556,7 +556,7 @@ public class SpecimenSythesysExcelImport  extends CdmImportBase<SpecimenSynthesy
         //      }
         //TODO: parsing of ViralNames?
         if(problem){
-            taxonName = TaxonNameBase.NewNonViralInstance(null);
+            taxonName = TaxonNameFactory.NewNonViralInstance(null);
             taxonName.setTitleCache(scientificName, true);
         }
         return taxonName;

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonNameImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonNameImport.java
index 66bed3006ccdd9e55d372c048611a411665f5ed6..dee54f8294a19ab2f7aa0e9f895c9b2e8d8ec064 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonNameImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonNameImport.java
@@ -33,6 +33,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.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
@@ -290,7 +291,7 @@ public class TcsXmlTaxonNameImport extends TcsXmlImportBase implements ICdmIO<Tc
                        if (nomCode != null){
                                nameBase = nomCode.getNewTaxonNameInstance(rank);
                        }else{
-                               nameBase = TaxonNameBase.NewNonViralInstance(rank);
+                               nameBase = TaxonNameFactory.NewNonViralInstance(rank);
                        }
                        childName = "Simple";
                        obligatory = true;

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonRelationsImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonRelationsImport.java
index afacd665128d1957017d39c59780fbad21c74a8b..963c3e3baf0f99bea6965ef29f84356796e713dd 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonRelationsImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonRelationsImport.java
@@ -37,6 +37,7 @@ import eu.etaxonomy.cdm.model.common.RelationshipTermBase;
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.taxon.Classification;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
@@ -213,7 +214,7 @@ public class TcsXmlTaxonRelationsImport extends TcsXmlImportBase implements ICdm
 \r
 \r
                        } else{\r
-                               basionymName = TaxonNameBase.NewNonViralInstance(name.getRank());\r
+                               basionymName = TaxonNameFactory.NewNonViralInstance(name.getRank());\r
                                childName = "RelatedName";\r
                                obligatory = true;\r
                                Element elName = XmlHelp.getSingleChildElement(success, elBasionym, childName, tcsNamespace, obligatory);\r
@@ -543,7 +544,7 @@ public class TcsXmlTaxonRelationsImport extends TcsXmlImportBase implements ICdm
                                }else{\r
                                        String title = elToTaxonConcept.getTextNormalize();\r
                                        //TODO synonym?\r
-                                       TaxonNameBase<?,?> taxonName = TaxonNameBase.NewNonViralInstance(null);\r
+                                       TaxonNameBase<?,?> taxonName = TaxonNameFactory.NewNonViralInstance(null);\r
                                        taxonName.setTitleCache(title, true);\r
                                        logger.warn("Free text related taxon seems to be bug in TCS");\r
                                        if (isSynonym){\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java
index ff49acbeb4107e3311f83f50631f3df811b5c4d9..19fa6e7a637b0918b6396dc57ecc72cb4ad52447 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java
@@ -509,46 +509,6 @@ public abstract class TaxonNameBase<T extends TaxonNameBase<?,?>, S extends INam
 
 // *************** FACTORY METHODS ********************************/
 
-    /**
-     * Creates a new non viral taxon name instance
-     * only containing its {@link common.Rank rank} and
-      * the {@link eu.etaxonomy.cdm.strategy.cache.name.NonViralNameDefaultCacheStrategy default cache strategy}.
-     *
-     * @param  rank  the rank to be assigned to <i>this</i> non viral taxon name
-     * @see    #NewInstance(Rank, HomotypicalGroup)
-     * @see    #NonViralName(Rank, HomotypicalGroup)
-     * @see    #NonViralName()
-     * @see    #NonViralName(Rank, String, String, String, String, TeamOrPersonBase, Reference, String, HomotypicalGroup)
-     * @see    eu.etaxonomy.cdm.strategy.cache.name.INonViralNameCacheStrategy
-     * @see    eu.etaxonomy.cdm.strategy.cache.name.INameCacheStrategy
-     * @see    eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy
-     */
-    public static NonViralName NewNonViralInstance(Rank rank){
-        return new NonViralName(rank, null);
-    }
-
-    /**
-     * Creates a new non viral taxon name instance
-     * only containing its {@link common.Rank rank},
-     * its {@link HomotypicalGroup homotypical group} and
-      * the {@link eu.etaxonomy.cdm.strategy.cache.name.NonViralNameDefaultCacheStrategy default cache strategy}.
-     * The new non viral taxon name instance will be also added to the set of
-     * non viral taxon names belonging to this homotypical group.
-     *
-     * @param  rank  the rank to be assigned to <i>this</i> non viral taxon name
-     * @param  homotypicalGroup  the homotypical group to which <i>this</i> non viral taxon name belongs
-     * @see    #NewInstance(Rank)
-     * @see    #NonViralName(Rank, HomotypicalGroup)
-     * @see    #NonViralName()
-     * @see    #NonViralName(Rank, String, String, String, String, TeamOrPersonBase, Reference, String, HomotypicalGroup)
-     * @see    eu.etaxonomy.cdm.strategy.cache.name.INonViralNameCacheStrategy
-     * @see    eu.etaxonomy.cdm.strategy.cache.name.INameCacheStrategy
-     * @see    eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy
-     */
-    public static NonViralName NewNonViralInstance(Rank rank, HomotypicalGroup homotypicalGroup){
-        return new NonViralName(rank, homotypicalGroup);
-    }
-
 
     /**
      * Creates a new zoological taxon name instance

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java
index 28fc12e7a37251dd20a043b804e7749a7fe6bcf4..560d8e2625290b102249fb12aab35ae28e7afb70 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java
@@ -107,7 +107,7 @@ public class NonViralNameParserImpl extends NonViralNameParserImplRegExBase impl
                        }else if ( isZoologicalName && ! isBotanicalName && !isBacteriologicalName && !isCultivatedPlantName){
                                result = TaxonNameFactory.NewBacterialInstance(rank);
                        }else {
-                               result =  TaxonNameBase.NewNonViralInstance(rank);
+                               result =  TaxonNameFactory.NewNonViralInstance(rank);
                        }
                } else {
                        switch (code) {

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/aspectj/NewEntityListenerTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/aspectj/NewEntityListenerTest.java
index 7fb477759eabef148310026ad020f5ae0a361681..5a5ea6740238f6676c4f7e6b51061ae628bcda0d 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/aspectj/NewEntityListenerTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/aspectj/NewEntityListenerTest.java
@@ -17,7 +17,7 @@ import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 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 cmathew
@@ -38,7 +38,7 @@ public class NewEntityListenerTest implements NewEntityListener {
     public void testPropertyChange() {
         CdmBase.setNewEntityListener(this);
 
-        NonViralName<?> b = TaxonNameBase.NewNonViralInstance(Rank.SPECIES());
+        NonViralName<?> b = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES());
         Annotation newAnnotation = Annotation.NewDefaultLanguageInstance("test");
         b.addAnnotation(newAnnotation);
         Assert.assertEquals(newAnnotation, lastPropValue);

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java
index 0ab6ce3da4be0d7c5713aa33a3aa38f0e3c52b01..e47e13e9c57afa4ba4da90df28dd2d283ca60185 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java
@@ -23,6 +23,7 @@ import eu.etaxonomy.cdm.model.name.BotanicalName;
 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;
 
        public class PropertyChangeTest implements PropertyChangeListener {
                static Logger logger = Logger.getLogger(PropertyChangeTest.class);
@@ -38,7 +39,7 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 
                @Test
                public void testPropertyChange() {
-                       NonViralName<?> b = TaxonNameBase.NewNonViralInstance(Rank.SPECIES());
+                       NonViralName<?> b = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES());
                        b.addPropertyChangeListener(this);
                        b.setGenusOrUninomial("Abies");
                                assertEquals(b.getGenusOrUninomial(), lastPropValue);

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java
index 4ff82001661f31cc98535cd876b82616b90dc434..a8ca8d31e0db6b2f330643c9353407d93c93db12 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java
@@ -26,6 +26,7 @@ import eu.etaxonomy.cdm.model.name.HybridRelationshipType;
 import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
@@ -77,7 +78,7 @@ public class IdentifiableEntityTest {
        @Before\r
        public void setUp() throws Exception {\r
 \r
-               abies = TaxonNameBase.NewNonViralInstance(Rank.GENUS(), null);\r
+               abies = TaxonNameFactory.NewNonViralInstance(Rank.GENUS(), null);\r
                abies.setNameCache("Abies");\r
                abies.setTitleCache("Abies", true);\r
                Reference sec = ReferenceFactory.newArticle();\r
@@ -85,24 +86,24 @@ public class IdentifiableEntityTest {
 \r
                abiesTaxon = Taxon.NewInstance(abies, sec);\r
 \r
-               abiesMill = TaxonNameBase.NewNonViralInstance(Rank.GENUS(), null);\r
+               abiesMill = TaxonNameFactory.NewNonViralInstance(Rank.GENUS(), null);\r
                abiesMill.setNameCache("Abies");\r
                abiesMill.setTitleCache("Abies Mill.", true);\r
                abiesMillTaxon = Taxon.NewInstance(abiesMill, sec);\r
 \r
-               abiesAlba = TaxonNameBase.NewNonViralInstance(Rank.SPECIES(), null);\r
+               abiesAlba = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES(), null);\r
                abiesAlba.setNameCache("Abies alba");\r
                abiesAlba.setTitleCache("Abies alba", true);\r
 \r
-               abiesAlbaMichx = TaxonNameBase.NewNonViralInstance(Rank.SPECIES(), null);\r
+               abiesAlbaMichx = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES(), null);\r
                abiesAlbaMichx.setNameCache("Abies alba");\r
                abiesAlbaMichx.setTitleCache("Abies alba Michx.", true);\r
 \r
-               abiesAlbaMill = TaxonNameBase.NewNonViralInstance(Rank.SPECIES(), null);\r
+               abiesAlbaMill = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES(), null);\r
                abiesAlbaMill.setNameCache("Abies alba");\r
                abiesAlbaMill.setTitleCache("Abies alba Mill.", true);\r
 \r
-               abiesAutonym  = TaxonNameBase.NewNonViralInstance(Rank.SECTION_BOTANY());\r
+               abiesAutonym  = TaxonNameFactory.NewNonViralInstance(Rank.SECTION_BOTANY());\r
                abiesAutonym.setGenusOrUninomial("Abies");\r
                abiesAutonym.setInfraGenericEpithet("Abies");\r
 \r
@@ -110,15 +111,15 @@ public class IdentifiableEntityTest {
                abiesAutonym.getNameCache();\r
                abiesAutonymTaxon = Taxon.NewInstance(abiesAutonym, sec);\r
 \r
-               abiesBalsamea  = TaxonNameBase.NewNonViralInstance(Rank.SECTION_BOTANY());\r
+               abiesBalsamea  = TaxonNameFactory.NewNonViralInstance(Rank.SECTION_BOTANY());\r
                abiesBalsamea.setGenusOrUninomial("Abies");\r
                abiesBalsamea.setInfraGenericEpithet("Balsamea");\r
                abiesBalsamea.getNameCache();\r
                abiesBalsamea.setTitleCache("Abies sect. Balsamea L.", true);\r
                abiesBalsameaTaxon = Taxon.NewInstance(abiesBalsamea, sec);\r
 \r
-               abiesAlbaxPinusBeta = TaxonNameBase.NewNonViralInstance(Rank.SPECIES());\r
-               pinusBeta = TaxonNameBase.NewNonViralInstance(Rank.SPECIES());\r
+               abiesAlbaxPinusBeta = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES());\r
+               pinusBeta = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES());\r
                pinusBeta.setGenusOrUninomial("Pinus");\r
                pinusBeta.setSpecificEpithet("beta");\r
                abiesAlbaxPinusBeta.setHybridFormula(true);\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NonViralNameTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NonViralNameTest.java
index c74e6a3d06720cdd1845ef2182cae2b8e5ec463d..9b1a305d27b3054698dc686072bb69d7df51681d 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NonViralNameTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NonViralNameTest.java
@@ -98,7 +98,7 @@ public class NonViralNameTest extends EntityTestBase {
         */
        @Test
        public final void testNonViralNameRank() {
-               NonViralName<?> nonViralName = TaxonNameBase.NewNonViralInstance(Rank.GENUS());
+               NonViralName<?> nonViralName = TaxonNameFactory.NewNonViralInstance(Rank.GENUS());
                assertNotNull(nonViralName);
        }
 
@@ -325,7 +325,7 @@ public class NonViralNameTest extends EntityTestBase {
                assertEquals(0, botanicalName1.getHybridParentRelations().size());
                assertEquals(0, botanicalName1.getHybridChildRelations().size());
                BotanicalName femaleParent = TaxonNameBase.NewBotanicalInstance(null);
-               NonViralName<?> maleParent = TaxonNameBase.NewNonViralInstance(null);
+               NonViralName<?> maleParent = TaxonNameFactory.NewNonViralInstance(null);
                ZoologicalName child = TaxonNameBase.NewZoologicalInstance(null);
 
                botanicalName1.addHybridParent(femaleParent, HybridRelationshipType.FEMALE_PARENT(), null);
@@ -365,10 +365,10 @@ public class NonViralNameTest extends EntityTestBase {
                nonViralName1.setInfraSpecificEpithet("infrabus");
                nonViralName1.setBinomHybrid(true);
 
-               NonViralName<?> parent = TaxonNameBase.NewNonViralInstance(Rank.SPECIES());
-               NonViralName<?> parent2 = TaxonNameBase.NewNonViralInstance(Rank.SPECIES());
-               NonViralName<?> child = TaxonNameBase.NewNonViralInstance(Rank.SPECIES());
-               NonViralName<?> child2 = TaxonNameBase.NewNonViralInstance(Rank.SPECIES());
+               NonViralName<?> parent = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES());
+               NonViralName<?> parent2 = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES());
+               NonViralName<?> child = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES());
+               NonViralName<?> child2 = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES());
                nonViralName1.addHybridParent(parent, HybridRelationshipType.FIRST_PARENT(), "parent rule");
                nonViralName1.addHybridParent(parent2, HybridRelationshipType.SECOND_PARENT(), "parent rule2");
                nonViralName1.addHybridChild(child, HybridRelationshipType.FEMALE_PARENT(), "child rule");

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TaxonNameBaseTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TaxonNameBaseTest.java
index 3b5c4f0df28816f8b46e624cc63b2637c81d9496..3c825907f33084dd38dc68eb9434cd3f88585363 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TaxonNameBaseTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TaxonNameBaseTest.java
@@ -799,13 +799,13 @@ public class TaxonNameBaseTest {
 \r
        @Test\r
        public void testClone(){\r
-               NonViralName taxonNameBase1 = TaxonNameBase.NewNonViralInstance(Rank.SPECIES());\r
-               NonViralName<?> genusName = TaxonNameBase.NewNonViralInstance(Rank.GENUS());\r
+               NonViralName taxonNameBase1 = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES());\r
+               NonViralName<?> genusName = TaxonNameFactory.NewNonViralInstance(Rank.GENUS());\r
                Taxon taxonBase = Taxon.NewInstance(taxonNameBase1, null);\r
 \r
                //basionym & homonym\r
-               NonViralName<?> basionym = TaxonNameBase.NewNonViralInstance(Rank.SPECIES());\r
-               NonViralName<?> earlierHomonym = TaxonNameBase.NewNonViralInstance(Rank.SPECIES());\r
+               NonViralName<?> basionym = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES());\r
+               NonViralName<?> earlierHomonym = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES());\r
                taxonNameBase1.addBasionym(basionym);\r
                taxonNameBase1.addRelationshipToName(earlierHomonym, NameRelationshipType.LATER_HOMONYM(), "later homonym rule");\r
                //status\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java
index 9fc56ca1a2a130915547215e672ebce64fe3fbbf..507b18e4068abc952c0b00dfd4101c66e43209a2 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java
@@ -30,6 +30,7 @@ import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 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.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
@@ -284,8 +285,8 @@ public class NonViralNameDefaultCacheStrategyTest extends NameCacheStrategyTestB
         Assert.assertEquals(author.getNomenclaturalTitle(), speciesName.getAuthorshipCache());
         Assert.assertEquals("Should be 'Abies alba L.'", "Abies alba L.", speciesName.getTitleCache());
 
-        NonViralName<?> hybridName = TaxonNameBase.NewNonViralInstance(Rank.SPECIES());
-        NonViralName<?> secondParent = TaxonNameBase.NewNonViralInstance(Rank.SPECIES());
+        NonViralName<?> hybridName = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES());
+        NonViralName<?> secondParent = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES());
 
         secondParent.setTitleCache("Second parent Mill.", true);
         hybridName.addHybridParent(speciesName, HybridRelationshipType.FIRST_PARENT(), null);
@@ -518,7 +519,7 @@ public class NonViralNameDefaultCacheStrategyTest extends NameCacheStrategyTestB
     @Test
     public void testGetInfraGenericNames(){
         String author = "Anyauthor";
-        NonViralName<?> nonViralName = TaxonNameBase.NewNonViralInstance(Rank.SUBGENUS());
+        NonViralName<?> nonViralName = TaxonNameFactory.NewNonViralInstance(Rank.SUBGENUS());
         nonViralName.setGenusOrUninomial("Genus");
         nonViralName.setInfraGenericEpithet("subgenus");
         nonViralName.setAuthorshipCache(author);

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/generate/IdentificationKeyGeneratorTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/generate/IdentificationKeyGeneratorTest.java
index 9870b16a106e7e087b1cccb59335763d7416288e..c18b1b8ddebc69c7dd2f041581a2b9ef4ec47a7d 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/generate/IdentificationKeyGeneratorTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/generate/IdentificationKeyGeneratorTest.java
@@ -20,7 +20,7 @@ import eu.etaxonomy.cdm.model.description.StatisticalMeasure;
 import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.cdm.model.name.INonViralName;\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 \r
 /**\r
@@ -67,14 +67,14 @@ public class IdentificationKeyGeneratorTest {
                feature3 = Feature.NewInstance("","Length of wings","");\r
                feature4 = Feature.NewInstance("","Colour","");\r
 \r
-               INonViralName tn1 = TaxonNameBase.NewNonViralInstance(null);\r
-               INonViralName tn2 = TaxonNameBase.NewNonViralInstance(null);\r
-               INonViralName tn3 = TaxonNameBase.NewNonViralInstance(null);\r
-               INonViralName tn4 = TaxonNameBase.NewNonViralInstance(null);\r
-               INonViralName tn5 = TaxonNameBase.NewNonViralInstance(null);\r
-               INonViralName tn6 = TaxonNameBase.NewNonViralInstance(null);\r
-               INonViralName tn7 = TaxonNameBase.NewNonViralInstance(null);\r
-               INonViralName tn8 = TaxonNameBase.NewNonViralInstance(null);\r
+               INonViralName tn1 = TaxonNameFactory.NewNonViralInstance(null);\r
+               INonViralName tn2 = TaxonNameFactory.NewNonViralInstance(null);\r
+               INonViralName tn3 = TaxonNameFactory.NewNonViralInstance(null);\r
+               INonViralName tn4 = TaxonNameFactory.NewNonViralInstance(null);\r
+               INonViralName tn5 = TaxonNameFactory.NewNonViralInstance(null);\r
+               INonViralName tn6 = TaxonNameFactory.NewNonViralInstance(null);\r
+               INonViralName tn7 = TaxonNameFactory.NewNonViralInstance(null);\r
+               INonViralName tn8 = TaxonNameFactory.NewNonViralInstance(null);\r
 \r
                taxon1 = Taxon.NewInstance(tn1, null);\r
                taxon2 = Taxon.NewInstance(tn2, null);\r

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/cache/CdmCacherTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/cache/CdmCacherTest.java
index f3daeb2c994b60060f38316dfc914c27e787c341..26e211b3ccdfb6b3acd1d9a1860ab4dbfef2a899 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/cache/CdmCacherTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/cache/CdmCacherTest.java
@@ -13,7 +13,7 @@ import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.model.common.Language;
 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.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
@@ -47,7 +47,7 @@ public class CdmCacherTest extends CdmIntegrationTest {
                // to a taxon name with no name cache to begin with
                Reference sec = ReferenceFactory.newDatabase();
         referenceService.save(sec);
-               Taxon taxon = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(Rank.SERIES()), sec);
+               Taxon taxon = Taxon.NewInstance(TaxonNameFactory.NewNonViralInstance(Rank.SERIES()), sec);
         taxon.setTitleCache("Tax" + "CdmCacher", true);
         taxonService.save(taxon);
         NonViralName<?> nvn = (NonViralName<?>)taxon.getName();

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NaturalLanguageGeneratorTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NaturalLanguageGeneratorTest.java
index 0f9ecbb5367a795f146be62b722a221c876f102d..435d200831dedcf202ff77d91339191f71d57d92 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NaturalLanguageGeneratorTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NaturalLanguageGeneratorTest.java
@@ -29,7 +29,7 @@ import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.name.INonViralName;
-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.test.integration.CdmIntegrationTest;
 
@@ -50,7 +50,7 @@ public class NaturalLanguageGeneratorTest extends CdmIntegrationTest {
        public void setUp() throws Exception {
         // set up your test objects here
 
-               INonViralName tnb = TaxonNameBase.NewNonViralInstance(null);
+               INonViralName tnb = TaxonNameFactory.NewNonViralInstance(null);
                Taxon taxon = Taxon.NewInstance(tnb, null);
                description = TaxonDescription.NewInstance(taxon);
 

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplBusinessTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplBusinessTest.java
index dc6fb68d60c6a8c03a6e2c71a5775d1c90d449c9..b462d314eaa8257bd0d71971c3538d6b97c59c8f 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplBusinessTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplBusinessTest.java
@@ -28,6 +28,7 @@ import eu.etaxonomy.cdm.api.service.exception.HomotypicalGroupChangeException;
 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.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
@@ -72,16 +73,16 @@ public class TaxonServiceImplBusinessTest extends CdmIntegrationTest {
                //service = new TaxonServiceImpl();
                //nameService = new NameServiceImpl();
 
-               t1n = TaxonNameBase.NewNonViralInstance(null);
+               t1n = TaxonNameFactory.NewNonViralInstance(null);
                t1 = Taxon.NewInstance(t1n, reference);
 
-               t2n = TaxonNameBase.NewNonViralInstance(null);
+               t2n = TaxonNameFactory.NewNonViralInstance(null);
                t2 = Taxon.NewInstance(t2n, reference);
 
-               s1n = TaxonNameBase.NewNonViralInstance(null);
+               s1n = TaxonNameFactory.NewNonViralInstance(null);
                s1 = Synonym.NewInstance(s1n, reference);
 
-               s2n = TaxonNameBase.NewNonViralInstance(null);
+               s2n = TaxonNameFactory.NewNonViralInstance(null);
                s2 = Synonym.NewInstance(s2n, reference);
 
                // referencing
@@ -142,9 +143,9 @@ public class TaxonServiceImplBusinessTest extends CdmIntegrationTest {
        @Test
        public final void testChangeSynonymWithMultipleSynonymsInHomotypicalGroupToAcceptedTaxon() {
                t1.addSynonym(s1, heteroTypicSynonymType);
-               TaxonNameBase<?,?> otherHeteroSynonymName = TaxonNameBase.NewNonViralInstance(null);
+               TaxonNameBase<?,?> otherHeteroSynonymName = TaxonNameFactory.NewNonViralInstance(null);
                t1.addHeterotypicSynonymName(otherHeteroSynonymName);
-               TaxonNameBase<?,?> homotypicSynonymName = TaxonNameBase.NewNonViralInstance(null);
+               TaxonNameBase<?,?> homotypicSynonymName = TaxonNameFactory.NewNonViralInstance(null);
                Synonym homotypicSynonym = Synonym.NewInstance(homotypicSynonymName, t1.getSec());
                t1.addHomotypicSynonym(homotypicSynonym);
 
@@ -250,16 +251,16 @@ public class TaxonServiceImplBusinessTest extends CdmIntegrationTest {
                t1.addSynonym(s1, heteroTypicSynonymType);
 
                //s2 - heterotypic
-               TaxonNameBase otherHeteroSynonymName = TaxonNameBase.NewNonViralInstance(null);
+               TaxonNameBase otherHeteroSynonymName = TaxonNameFactory.NewNonViralInstance(null);
                Synonym s2 = Synonym.NewInstance(otherHeteroSynonymName, t1.getSec());
                t1.addSynonym(s2, heteroTypicSynonymType);
-               TaxonNameBase<?,?> otherHeteroSynonymNameB = TaxonNameBase.NewNonViralInstance(null);
+               TaxonNameBase<?,?> otherHeteroSynonymNameB = TaxonNameFactory.NewNonViralInstance(null);
                otherHeteroSynonymName.addBasionym(otherHeteroSynonymNameB);
                Synonym s2b = Synonym.NewInstance(otherHeteroSynonymNameB, t1.getSec());
                t1.addSynonym(s2b, heteroTypicSynonymType);
 
                //homotypic
-               TaxonNameBase<?,?> homotypicSynonymName = TaxonNameBase.NewNonViralInstance(null);
+               TaxonNameBase<?,?> homotypicSynonymName = TaxonNameFactory.NewNonViralInstance(null);
                Synonym homotypicSynonym = Synonym.NewInstance(homotypicSynonymName, t1.getSec());
                t1.addHomotypicSynonym(homotypicSynonym);
                t1.getName().addBasionym(homotypicSynonymName);

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java
index 2bb71b90bbc09004469853739bba71cd08baa9f3..268de17abdb4f0425d44a93458b5f34c1788911a 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java
@@ -55,6 +55,7 @@ import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 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.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
 import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
@@ -288,11 +289,11 @@ public class TaxonServiceImplTest extends CdmTransactionalIntegrationTest {
         Reference reference = ReferenceFactory.newGeneric();
         String referenceDetail = "test";
 
-        NonViralName<?> t1n = TaxonNameBase.NewNonViralInstance(null);
+        NonViralName<?> t1n = TaxonNameFactory.NewNonViralInstance(null);
         Taxon t1 = Taxon.NewInstance(t1n, reference);
-        NonViralName<?> t2n = TaxonNameBase.NewNonViralInstance(null);
+        NonViralName<?> t2n = TaxonNameFactory.NewNonViralInstance(null);
         Taxon t2 = Taxon.NewInstance(t2n, reference);
-        NonViralName<?> s1n = TaxonNameBase.NewNonViralInstance(null);
+        NonViralName<?> s1n = TaxonNameFactory.NewNonViralInstance(null);
         Synonym s1 = Synonym.NewInstance(s1n, reference);
         t1.addSynonym(s1, heteroTypicSynonymType);
         service.saveOrUpdate(t1);

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestService.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestService.java
index 045c863d5f8f9e7a96f638a456e184fda12ddb8e..1c65c2c9448f587bb98c437117d66e6a51484f47 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestService.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestService.java
@@ -33,6 +33,7 @@ import eu.etaxonomy.cdm.model.name.BotanicalName;
 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.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
@@ -59,7 +60,7 @@ public class TestService {
 
        public void testAppController() {
                logger.info("Create name objects...");
-               NonViralName<?> nvn = TaxonNameBase.NewNonViralInstance(Rank.SPECIES());
+               NonViralName<?> nvn = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES());
 
                BotanicalName bn = TaxonNameBase.NewBotanicalInstance(Rank.SUBSPECIES());
                ZoologicalName zn = TaxonNameBase.NewZoologicalInstance(Rank.FAMILY());
@@ -224,10 +225,10 @@ public class TestService {
                        appCtr = CdmApplicationController.NewInstance(dbSchemaValidation);
 
 
-                       TaxonNameBase<?,?> name = TaxonNameBase.NewNonViralInstance(null);
+                       TaxonNameBase<?,?> name = TaxonNameFactory.NewNonViralInstance(null);
                        name.setTitleCache("Abies alba", true);
 
-                       TaxonNameBase<?,?> name2 = TaxonNameBase.NewNonViralInstance(null);
+                       TaxonNameBase<?,?> name2 = TaxonNameFactory.NewNonViralInstance(null);
                        name2.setTitleCache("Abies beta", true);
 
                        //appCtr.getNameService().saveTaxonName(name);