merge-update from trunk

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractIdentifiableEntityDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractIdentifiableEntityDetailElement.java
index 776d6835084c8c8ca1ce443940f8da3a72b968ec..544bc6ea37b0a187bb1c769c6cbb573c05e57d78 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractIdentifiableEntityDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractIdentifiableEntityDetailElement.java
@@ -6,9 +6,9 @@ package eu.etaxonomy.taxeditor.ui.section;
 import java.util.Arrays;
 
 import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.ui.forms.ToggleableTextElement;
+import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement;
 
 /**
  * @author n.hoffmann
@@ -23,7 +23,13 @@ public abstract class AbstractIdentifiableEntityDetailElement<T extends IIdentif
                        ICdmFormElement formElement) {
                super(formFactory, formElement);
        }
-
+       
+       public void updateToggleableCacheField(){
+               if(! getEntity().isProtectedTitleCache()){
+                       toggleable_cache.setText(getEntity().generateTitle());
+               }
+       }
+       
        protected void handleToggleableCacheField(){
                boolean pushedState = toggleable_cache.getState();
                
@@ -31,8 +37,6 @@ public abstract class AbstractIdentifiableEntityDetailElement<T extends IIdentif
                                pushedState);
                setIrrelevant(pushedState,
                                Arrays.asList(new Object[] { toggleable_cache }));
-               if(! pushedState){
-                       toggleable_cache.setText(getEntity().generateTitle());
-               }
+               updateToggleableCacheField();
        }       
 }