ref #5655, ref #5640 unspecific 'non' NameRelationshipType added

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationshipType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationshipType.java
index c33975039a6332114119f3e8e8bb08282fbf5ac0..99e4b988d99a97d156603cfd58d1664525833ae7 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationshipType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationshipType.java
@@ -85,6 +85,7 @@ public class NameRelationshipType extends RelationshipTermBase<NameRelationshipT
        private static final UUID uuidLaterValidatedByName = UUID.fromString("a25ee4c1-863a-4dab-9499-290bf9b89639");
        private static final UUID uuidBlockingNameFor = UUID.fromString("1dab357f-2e12-4511-97a4-e5153589e6a6");
        private static final UUID uuidLaterIsonym = UUID.fromString("29ab238d-598d-45b9-addd-003cf39ccc3e");
+       private static final UUID uuidNonUnspecific = UUID.fromString("78360e2a-159d-4e2f-893e-8666805840fa");
 
 
        public static NameRelationshipType NewInstance(String term, String label, String labelAbbrev, boolean symmetric, boolean transitive) {
@@ -545,6 +546,27 @@ public class NameRelationshipType extends RelationshipTermBase<NameRelationshipT
          return  findTermByUuid(uuidBlockingNameFor);
        }
 
+       /**
+     * Returns the unspecific 'non' name relationship type. Name A in this
+     * relationship is unspecificly marked as not being name B.
+     * This relationship should only be used if in the given
+     * context no further information exists to more specifically
+     * define what kind of non-relationship is meant.
+     * <BR>
+     * When cleaning data this relationship type should be replaced
+     * by one of the below mentioned more specific relationship types.
+     *
+     * This type is neither symmetric nor transitive.
+     *
+     * @see     #LATER_HOMONYM()
+     * @see     #TREATED_AS_LATER_HOMONYM()
+     * @see     #BLOCKING_NAME_FOR()
+     */
+       //#5655, #5640
+    public static final NameRelationshipType UNSPECIFIC_NON(){
+      return findTermByUuid(uuidNonUnspecific);
+    }
+
        @Override
        protected void setDefaultTerms(TermVocabulary<NameRelationshipType> termVocabulary) {
                termMap = new HashMap<UUID, NameRelationshipType>();

diff --git a/cdmlib-model/src/main/resources/terms/NameRelationshipType.csv b/cdmlib-model/src/main/resources/terms/NameRelationshipType.csv
index bb3c45ec6b3e6aef9c1e17049aba4520d563968f..c95acc3af49befda3be200e629e7d0e842bcfb8f 100644 (file)
--- a/cdmlib-model/src/main/resources/terms/NameRelationshipType.csv
+++ b/cdmlib-model/src/main/resources/terms/NameRelationshipType.csv
@@ -12,4 +12,5 @@
 "e6439f95-bcac-4ebb-a8b5-69fa5ce79e6a",,"is conserved against","is conserved against","","is rejected in favour of","is rejected in favour of","",FALSE,FALSE,"VA","OD"
 "a176c9ad-b4c2-4c57-addd-90373f8270eb",,"is validated by","is validated by","","is validating","is validating","",FALSE,FALSE,"NO","NO"
 "a25ee4c1-863a-4dab-9499-290bf9b89639",,"is later validated by","is later validated by","","is later validating","is later validating","",FALSE,FALSE,"NO","NO"
-"1dab357f-2e12-4511-97a4-e5153589e6a6",,"is blocking name for","is blocking name for","","is new combination blocked by","is new combination blocked by","",FALSE,FALSE,"NO","NO"
\ No newline at end of file
+"1dab357f-2e12-4511-97a4-e5153589e6a6",,"is blocking name for","is blocking name for","","is new combination blocked by","is new combination blocked by","",FALSE,FALSE,"NO","NO"
+"78360e2a-159d-4e2f-893e-8666805840fa",,"'non' (has no relation with)","a not further defined 'non' relationship between name A and name B","","has an unilateral 'non' relation from","has an unilateral 'non' relation from","","FALSE","FALSE","NO","NO"
\ No newline at end of file