final implementation of MaterialOrMethodEvent, Cloning, PreservationMethod, ... ...

[cdmlib.git] / cdmlib-model / src / main / java / eu / etaxonomy / cdm / model / common / TermType.java

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 ed4e8015278305bf8729afae55b8b5e101296a85..b6b5d3eab0d9ec057ef4c9594e58e61bcfb6d7c3 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
@@ -119,7 +119,7 @@ public enum TermType implements IEnumTerm<TermType>, Serializable{
         * @see Marker\r
         */\r
        @XmlEnumValue("MarkerType")\r
-       MarkerType(UUID.fromString("d28a1bf8-95ed-483a-8f02-3515b14998e0"), "MarkerType", "MAT", null),\r
+       MarkerType(UUID.fromString("d28a1bf8-95ed-483a-8f02-3515b14998e0"), "MarkerType", "MKT", null),\r
        \r
        //7\r
        /**\r
@@ -261,9 +261,27 @@ public enum TermType implements IEnumTerm<TermType>, Serializable{
        StatisticalMeasure(UUID.fromString("a22d19cd-a342-4af2-b156-d688a7aa8a6b"), "Statistical measure", "SM", null),\r
 \r
        //23\r
-       @XmlEnumValue("PreservationMethod")\r
-       PreservationMethod(UUID.fromString("9cadbee4-22b5-40f5-bb37-e4f5340d246e"), "Preservation method", "PRM"),\r
+       @XmlEnumValue("MaterialOrMethod")\r
+       MaterialOrMethod(UUID.fromString("285a1406-a606-46b9-b0a4-717748296e50"), "Material or Method", "MOM"),\r
 \r
+       //23a\r
+       @XmlEnumValue("Material")\r
+       Material(UUID.fromString("58499bc1-9808-4e03-861c-4325ca889515"), "Material", "MAT", MaterialOrMethod),\r
+\r
+       //23b\r
+       @XmlEnumValue("Method")\r
+       Method(UUID.fromString("527fc141-7fdf-43c1-9d46-20be13c2590c"), "Method", "MET", MaterialOrMethod),\r
+\r
+       \r
+//     //23c TODO required??\r
+//     @XmlEnumValue("PreservationMethod")   --> Method\r
+//     PreservationMethod(UUID.fromString("9cadbee4-22b5-40f5-bb37-e4f5340d246e"), "Preservation method", "PRM", MaterialOrMethod),\r
+//\r
+//     //23d TODO required??  --> Material\r
+//     @XmlEnumValue("PreservationMedium") \r
+//     PreservationMedium(UUID.fromString("c6269a06-6954-4838-a7a7-7f94ba372f3d"), "Preservation medium", "PME", MaterialOrMethod),\r
+\r
+       \r
        //24\r
        /**\r
         * This type represents possible modulations for the validity of\r