minor

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 9c0dc44d92f11b06601617a94c1cf6be246fd9e0..718af8dac81b208203f25f8574ae01d3844cc173 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
@@ -318,7 +318,7 @@ public class BotanicalName extends NonViralName<BotanicalName> /*implements IMer
         * @param zoologicalName
         * @return
         */
-       public static BotanicalName valueOf(ZoologicalName zoologicalName){
+       public static BotanicalName valueOf(TaxonNameBase taxonNameBase){
                logger.error("Not implemented yet.");
                return null;
        }

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalCode.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalCode.java
index a7fcb9ab52601147853cbe9a895110246045fa82..dacdfdf6d768899c3c3cf7c4c38eb21cf989cb4d 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalCode.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalCode.java
@@ -247,6 +247,21 @@ public enum NomenclaturalCode implements IDefinedTerm<NomenclaturalCode> {
                }\r
                return result;\r
        }       \r
+       \r
+       @Transient\r
+       public TaxonNameBase valueOf(TaxonNameBase taxonNameBase){\r
+               \r
+               switch(this){\r
+               case ICBN:\r
+                       return BotanicalName.valueOf(taxonNameBase);\r
+               case ICZN:\r
+                       return ZoologicalName.valueOf(taxonNameBase);\r
+               default:\r
+                       logger.error("Not implemented yet");\r
+               }\r
+                               \r
+               return taxonNameBase;\r
+       }\r
 }\r
 \r
 //@XmlAccessorType(XmlAccessType.FIELD)\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
index 069f43b73608c1b48ce07f64ce308f12c322a7ad..a4d12f2e46a68fdfa566263bde6c2b74006115ee 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
@@ -1252,6 +1252,6 @@ public class NonViralName<T extends NonViralName> extends TaxonNameBase<T, INonV
                        }
                }
        }
-
-
+       
+       
 }

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 172bc33880954540a389d36c07189a3bc7560154..bdda7e5962a22ad9e0c881ebe95dc86cd45c79fd 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
@@ -1550,6 +1550,7 @@ public void addRelationshipToName(TaxonNameBase toName, NameRelationshipType typ
         * @see         #getHasProblem()
         */
        abstract public NomenclaturalCode getNomenclaturalCode();
+       
        /* (non-Javadoc)
         * @see eu.etaxonomy.cdm.model.common.IdentifiableEntity#generateTitle()
         */

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ZoologicalName.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ZoologicalName.java
index fef01f56ca3317659d90095a8dcbdcb4c4efc4d5..940610d78eab3fb0d238588f4d7085e80b19e6f7 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ZoologicalName.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ZoologicalName.java
@@ -344,7 +344,7 @@ public class ZoologicalName extends NonViralName<ZoologicalName> {
                this.originalPublicationYear = originalPublicationYear;
        }
        
-       public static ZoologicalName valueOf(BotanicalName botanicalName){
+       public static ZoologicalName valueOf(TaxonNameBase taxonNameBase){
                logger.error("Not implemented yet.");
                return null;
        }