validate termType not null and some minor changes

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermBase.java
index 94b5ef8fe85f5edb9e52345879c5d89f137040df..894681a9ab00cab5ae46f42cbc4c6cc5de02ca49 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermBase.java
@@ -73,8 +73,7 @@ public abstract class TermBase extends IdentifiableEntity<IIdentifiableEntityCac
         */
        @XmlAttribute(name ="TermType")
        @Column(name="termType")
-//     @NotNull
-//     @Enumerated
+       @NotNull
     @Type(type = "eu.etaxonomy.cdm.hibernate.EnumUserType",
             parameters = {@org.hibernate.annotations.Parameter(name  = "enumClass", value = "eu.etaxonomy.cdm.model.common.TermType")}
         )

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermType.java
index fd6e4cfb3b8632aaf71c557631cdf8c9ec0423cf..36291d428506d4d822782a17aa5775de1260adb2 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermType.java
@@ -374,7 +374,7 @@ public enum TermType implements IEnumTerm<TermType>, Serializable{
         * @see Sequencing \r
         * @see Sequencing#getMarker() \r
         */\r
-       @XmlEnumValue("Marker")\r
+       @XmlEnumValue("DnaMarker")\r
        DnaMarker(UUID.fromString("7fdddb4f-b0ec-4ce0-bc28-dc94e30e8252"), "DNA Marker", "MAR", null),\r
        ;\r
        \r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java
index acb1f93ea31dd86276f85a9e5e4db28c0a836a38..1e966a68d0c2b163708ce877688bd95aef721cb1 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java
@@ -176,14 +176,19 @@ public class TermVocabulary<T extends DefinedTermBase> extends TermBase implemen
        public TermVocabulary<T> readCsvLine(List<String> csvLine, Language lang) {
                this.setUuid(UUID.fromString(csvLine.get(0)));
                this.setUri(URI.create(csvLine.get(1)));
-               String description = csvLine.get(3);
                String label = csvLine.get(2).trim();
+               String description = csvLine.get(3);
+               
                //see  http://dev.e-taxonomy.eu/trac/ticket/3550
 //             this.addRepresentation(Representation.NewInstance(description, label, null, lang) );
                //preliminary until above is solved
                this.setTitleCache(label, true);
                
-               this.setTermType(TermType.getByKey(csvLine.get(4)));
+               TermType termType = TermType.getByKey(csvLine.get(4));
+               if (termType == null){
+                       throw new IllegalArgumentException("TermType can not be mapped: " + csvLine.get(4));
+               }
+               this.setTermType(termType);
                
                return this;
        }