ref #9033: adapt labels

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
index cbd20ce1886e718c6b1940bc2744a7e8eede655e..a8ad27ae7e8ef0ec15b25ec0ddc0d5dd2abbe6bf 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
@@ -227,7 +227,7 @@ public class EnumComboElement<T extends IEnumTerm<T>> extends
         } else if(enumType.equals(NomenclaturalCodeEdition.class)) {
             return "Code Edition";
         }else if(enumType.equals(TaxonNodeStatus.class)) {
-            return "Status";
+            return "Placement status";
         }
                return "No Label";
        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
index be990632f7c0dee84f44d2fbcf6d2f151bb63bd2..2f03223663eefebf42ff54e4913745968037d658 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
@@ -103,19 +103,19 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
 
 
     public boolean isExcluded() {
-        return status.isKindOf(TaxonNodeStatus.EXCLUDED);
+        return status.equals(TaxonNodeStatus.EXCLUDED);
     }
 
 
 
     public boolean isUnplaced() {
-        return status.isKindOf(TaxonNodeStatus.UNPLACED);
+        return status.equals(TaxonNodeStatus.UNPLACED);
     }
 
 
 
     public boolean isPlacementDoubtful() {
-        return status.isKindOf(TaxonNodeStatus.DOUBTFUL);
+        return status.equals(TaxonNodeStatus.DOUBTFUL);
     }
 
     public Reference getRef() {
@@ -252,7 +252,7 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
 
 
            multiLanguageTextStatusNotes = formFactory.createMultiLanguageTextElement(formElement, "Status Notes", entity.getStatusNote(), 50, style);
-           multiLanguageTextStatusNotes.setEnabled(entity.isExcluded());
+           multiLanguageTextStatusNotes.setEnabled(entity.getStatus() != null);
 
                if (!isCreateNew()){
                    selectionNodeAgentRelation = formFactory.createTaxonNodeAgentRelationCollectionSection(formElement, getConversationHolder(), StoreUtil.getSectionStyle(TaxonNodeAgentRelationCollectionSection.class, entity.getClass().getCanonicalName()));