ref #6618 , ref #8012, ref #3853 add TermType.Character

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 157c4ea02604b5b0dbe974c6d4947803db0cbce3..395c9558709c9510f72a07ed4f16be09055634bb 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
@@ -485,6 +485,19 @@ public enum TermType implements IEnumTerm<TermType>{
     @XmlEnumValue("StructureModifier")\r
     StructureModifier(UUID.fromString("41617e59-17c9-47f5-8fe6-319e117447ce"), "Structure Modifier", "STMO", Modifier),\r
 \r
+\r
+    //37\r
+    /**\r
+     * The type for {@link Character characters}. Is subtype of {@link #Feature}\r
+     * @see TermType#Feature\r
+     * @deprecated not yet clear if really needed, might be replaced in future\r
+     * by {@value TermType#Feature}\r
+     */\r
+    @XmlEnumValue("Character")\r
+    @Deprecated\r
+    Character(UUID.fromString("70baa056-4a3c-4a79-860f-934765c626c4"), "Character", "CHA", Feature),\r
+\r
+\r
     ;\r
 \r
 \r
@@ -559,6 +572,8 @@ public enum TermType implements IEnumTerm<TermType>{
                 return DefinedTerm.NewInstance(this, null, "Untitled", null);\r
             case Feature:\r
                 return eu.etaxonomy.cdm.model.description.Feature.NewInstance(null, "Untitled", null);\r
+            case Character:\r
+                return eu.etaxonomy.cdm.model.description.Character.NewInstance(null, null, null, "Untitled", null);\r
             case State:\r
                 return eu.etaxonomy.cdm.model.description.State.NewInstance(null, "Untitled", null);\r
             case MarkerType:\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Character.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Character.java
index 9ea3a11cf621b2dc83a3fecbd6a94f856f77c082..7b3400981bb6915e58c2f17ae9bdbdacbaf84363 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Character.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Character.java
@@ -25,6 +25,7 @@ import org.hibernate.search.annotations.IndexedEmbedded;
 
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.common.TermType;
 
 /**
  * A subclass of the Feature class that is meant for handling
@@ -137,6 +138,7 @@ public class Character extends Feature {
     @Deprecated
     protected Character() {
         super();
+        this.setTermType(TermType.Character);
     }
 
 
@@ -160,6 +162,7 @@ public class Character extends Feature {
      */
     protected Character(FeatureNode structure, FeatureNode property, String term, String label, String labelAbbrev) {
         super(term, label, labelAbbrev);
+        this.setTermType(TermType.Character);
         this.structure = structure;
         this.property = property;
     }