#781: Name Type Designation module should reflect current NameTypeDesignation in...

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypeDesignationPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypeDesignationPropertySource.java
index 5a75112c2408735863cdc56b704956770f24cfa5..1e4cd96c587bf27f996dcfe74f7d7409185f43e9 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypeDesignationPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypeDesignationPropertySource.java
@@ -71,8 +71,11 @@ public class TypeDesignationPropertySource implements ICdmBasePropertySource {
                } else {\r
                        str = "UNDEFINED";\r
                }\r
+               if (typeDesignation instanceof NameTypeDesignation && ((NameTypeDesignation) typeDesignation).isNotDesignated()) {\r
+                       return str + " [not designated]";\r
+               }\r
                if (typeDesignation.getTypeStatus() != null) {\r
-                       str += " [" + typeDesignation.getTypeStatus().getLabel() + "]";\r
+                       return str + " [" + typeDesignation.getTypeStatus().getLabel() + "]";\r
                }\r
                return str;\r
        }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ListTypeWizardPage.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ListTypeWizardPage.java
index fe94a1f92c43b6e11ebc2810d88a314a4605e78b..f2e39609083bcc77747d5dc4a573204325ea1505 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ListTypeWizardPage.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ListTypeWizardPage.java
@@ -206,8 +206,11 @@ public class ListTypeWizardPage extends WizardPage {
                } else {\r
                        str = "UNDEFINED";\r
                }\r
+               if (typeDesignation instanceof NameTypeDesignation && ((NameTypeDesignation) typeDesignation).isNotDesignated()) {\r
+                       return str + " [not designated]";\r
+               }\r
                if (typeDesignation.getTypeStatus() != null) {\r
-                       str += " [" + typeDesignation.getTypeStatus().getLabel() + "]";\r
+                       return str + " [" + typeDesignation.getTypeStatus().getLabel() + "]";\r
                }\r
                \r
                return str;\r