X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/32b864831f56f8c85ca53950c44b3e06b9a4368e..41b23b4eae7c4261ee4baaddb686bd8b3fc8db1f:/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 bed478ecd2..46c76b7a99 100644
--- 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,9 +15,10 @@ import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
+import eu.etaxonomy.cdm.model.common.RelationshipBase;
 import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
 import eu.etaxonomy.cdm.strategy.cache.BotanicNameDefaultCacheStrategy;
-import eu.etaxonomy.cdm.strategy.parser.ITaxonNameParser;
+import eu.etaxonomy.cdm.strategy.parser.INonViralNameParser;
 import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl;
 
 import java.util.*;
@@ -42,7 +43,7 @@ public class BotanicalName extends NonViralName {
 	private boolean isAnamorphic;
 	private Set<HybridRelationship> hybridRelationships = new HashSet();
 
-	static private ITaxonNameParser nameParser = new NonViralNameParserImpl();
+	static private INonViralNameParser nameParser = new NonViralNameParserImpl();
 	
 	
 	/**
@@ -85,7 +86,7 @@ public class BotanicalName extends NonViralName {
 		if (nameParser == null){
 			nameParser = new NonViralNameParserImpl();
 		}
-		return (BotanicalName)nameParser.parseFullName(fullNameString, rank);
+		return (BotanicalName)nameParser.parseFullName(fullNameString, NomenclaturalCode.ICBN(),  rank);
 	}
 	
 	/**
@@ -106,7 +107,7 @@ public class BotanicalName extends NonViralName {
 		if (nameParser == null){
 			nameParser = new NonViralNameParserImpl();
 		}
-		return (BotanicalName)nameParser.parseFullReference(fullNameAndReferenceString, rank);
+		return (BotanicalName)nameParser.parseFullReference(fullNameAndReferenceString, NomenclaturalCode.ICBN(), rank);
 	}
 	
 	//needed by hibernate
@@ -150,7 +151,13 @@ public class BotanicalName extends NonViralName {
 		return hybridRelationships;
 	}
 
-
+	public void addRelationship(RelationshipBase relation) {
+		if (relation instanceof HybridRelationship){
+			addHybridRelationship((HybridRelationship)relation);
+		}else {
+			super.addRelationship(relation);
+		}
+	}
 
 	public boolean isHybridFormula(){
 		return this.isHybridFormula;
@@ -213,6 +220,7 @@ public class BotanicalName extends NonViralName {
 	}
 	
 	
+	@Transient
 	@Override
 	public NomenclaturalCode getNomeclaturalCode(){
 		return NomenclaturalCode.ICBN();