(no commit message)

[cdmlib.git] / cdmlib-model / src / main / java / eu / etaxonomy / cdm / model / name / BotanicalName.java

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/BotanicalName.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/BotanicalName.java
index 38e77be0af671ccacbd6e5e2ac1e9e43544ef0f4..7dedb4f25c71a0186ffcaab9901c6d2b70b52865 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/BotanicalName.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/BotanicalName.java
@@ -15,10 +15,11 @@ import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 
 import eu.etaxonomy.cdm.model.agent.Agent;
-import eu.etaxonomy.cdm.model.agent.INomenclaturalAgent;
+import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;
+import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
-import eu.etaxonomy.cdm.strategy.BotanicNameDefaultCacheStrategy;
-import eu.etaxonomy.cdm.strategy.TaxonNameParserBotanicalNameImpl;
+import eu.etaxonomy.cdm.strategy.cache.BotanicNameDefaultCacheStrategy;
+import eu.etaxonomy.cdm.strategy.parser.TaxonNameParserBotanicalNameImpl;
 
 import java.util.*;
 
@@ -49,7 +50,42 @@ public class BotanicalName extends NonViralName {
         * @return
         */
        public static BotanicalName NewInstance(Rank rank){
-               return new BotanicalName(rank);
+               return new BotanicalName(rank, null);
+       }
+
+
+       /**
+        * @param rank
+        * @param homotypicalGroup
+        * @return
+        */
+       public static BotanicalName NewInstance(Rank rank, HomotypicalGroup homotypicalGroup){
+               return new BotanicalName(rank, homotypicalGroup);
+       }
+       
+       public static  BotanicalName NewInstance(Rank rank, String genusOrUninomial, String specificEpithet, String infraSpecificEpithet, TeamOrPersonBase combinationAuthorTeam, INomenclaturalReference nomenclaturalReference, String nomenclMicroRef, HomotypicalGroup homotypicalGroup) {
+               return new BotanicalName(rank, genusOrUninomial, specificEpithet, infraSpecificEpithet, combinationAuthorTeam, nomenclaturalReference, nomenclMicroRef, homotypicalGroup);
+       }
+       
+       /**
+        * Returns a parsed Name
+        * @param fullName
+        * @return
+        */
+       public static BotanicalName PARSED_NAME(String fullNameString){
+               return PARSED_NAME(fullNameString, Rank.GENUS());
+       }
+       
+       /**
+        * Returns a parsed Name
+        * @param fullName
+        * @return
+        */
+       public static BotanicalName PARSED_NAME(String fullNameString, Rank rank){
+               if (nameParser == null){
+                       nameParser = new TaxonNameParserBotanicalNameImpl();
+               }
+               return (BotanicalName)nameParser.parseFullName(fullNameString, rank);
        }
        
        /**
@@ -57,8 +93,8 @@ public class BotanicalName extends NonViralName {
         * @param fullName
         * @return
         */
-       public static BotanicalName PARSED_NAME(String fullName){
-               return PARSED_NAME(fullName, Rank.GENUS());
+       public static BotanicalName PARSED_REFERENCE(String fullNameAndReferenceString){
+               return PARSED_REFERENCE(fullNameAndReferenceString, Rank.GENUS());
        }
        
        /**
@@ -66,11 +102,11 @@ public class BotanicalName extends NonViralName {
         * @param fullName
         * @return
         */
-       public static BotanicalName PARSED_NAME(String fullName, Rank rank){
+       public static BotanicalName PARSED_REFERENCE(String fullNameAndReferenceString, Rank rank){
                if (nameParser == null){
                        nameParser = new TaxonNameParserBotanicalNameImpl();
                }
-               return (BotanicalName)nameParser.parseFullName(fullName, rank);
+               return (BotanicalName)nameParser.parseFullReference(fullNameAndReferenceString, rank);
        }
        
        //needed by hibernate
@@ -78,12 +114,12 @@ public class BotanicalName extends NonViralName {
                super();
                this.cacheStrategy = BotanicNameDefaultCacheStrategy.NewInstance();
        }
-       public BotanicalName(Rank rank) {
-               super(rank);
+       protected BotanicalName(Rank rank, HomotypicalGroup homotypicalGroup) {
+               super(rank, homotypicalGroup);
                this.cacheStrategy = BotanicNameDefaultCacheStrategy.NewInstance();
        }
-       public BotanicalName(Rank rank, String genusOrUninomial, String specificEpithet, String infraSpecificEpithet, INomenclaturalAgent combinationAuthorTeam, INomenclaturalReference nomenclaturalReference, String nomenclMicroRef) {
-               super(rank, genusOrUninomial, specificEpithet, infraSpecificEpithet, combinationAuthorTeam, nomenclaturalReference, nomenclMicroRef);
+       protected BotanicalName(Rank rank, String genusOrUninomial, String specificEpithet, String infraSpecificEpithet, TeamOrPersonBase combinationAuthorTeam, INomenclaturalReference nomenclaturalReference, String nomenclMicroRef, HomotypicalGroup homotypicalGroup) {
+               super(rank, genusOrUninomial, specificEpithet, infraSpecificEpithet, combinationAuthorTeam, nomenclaturalReference, nomenclMicroRef, homotypicalGroup);
                this.cacheStrategy = BotanicNameDefaultCacheStrategy.NewInstance();
        }