Merge branch 'release/5.11.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / name / NameDetailElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
index 7c4c986ec0ac8d13881c6b6e85d51526af66ad1e..0bed8dc37f08988714ea883faa4241a03eee2700 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
@@ -98,7 +98,7 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<I
 
                };
                }
-           if (!config.isSimpleDetailsViewActivated()){
+           if (config == null){
                toggleable_cache = formFactory.createToggleableTextField(this, "Name Cache", nonViralName.getNameCache(), nonViralName.isProtectedNameCache(), style);
 
                combo_rank = formFactory.createDefinedTermComboElement(TermType.Rank, this, "Rank", nonViralName.getRank(), style, comparator);
@@ -158,7 +158,7 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<I
                if (toggleable_cache != null){
                    toggleable_cache.setEnabled(getEntity().isProtectedNameCache());
 
-               if (!config.isSimpleDetailsViewActivated()){
+               if (config == null){
                        if(isIrrelevant()){
                                setIrrelevant(isIrrelevant());
                        }else{
@@ -179,7 +179,7 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<I
                                createBotanicalNameParts(formElement, nonViralName, style);
                                break;
                        case Fungi :
-                               if (!config.isSimpleDetailsViewActivated()){
+                               if (config == null){
                                        createFungusNameParts(formElement, nonViralName, style);
                                }
                                break;
@@ -230,7 +230,7 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<I
        private void createZoologicalNameParts(ICdmFormElement formElement, INonViralName nonViralName, int style){
                IZoologicalName zoologicalName = (IZoologicalName) nonViralName;
 
-               if (!config.isSimpleDetailsViewActivated()){
+               if (config == null){
                    text_breed = formFactory.createTextWithLabelElement(formElement, "Breed", zoologicalName.getBreed(), style);
                }
        }