ref #6746 Fix some titleCache problems

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CreateFeatureTreeHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CreateFeatureTreeHandler.java
index 54175d8ba46e8c63a75dda8e57467d8c45863c1c..9aa47ed854e4363802c5b76d46c96db165d9df72 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CreateFeatureTreeHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CreateFeatureTreeHandler.java
@@ -31,6 +31,7 @@ public class CreateFeatureTreeHandler {
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart thisPart){
         FeatureTree tree = FeatureTree.NewInstance();
+        tree.setTitleCache("New feature tree", true);
         FeatureTreeEditor editor = (FeatureTreeEditor) thisPart.getObject();
         List<FeatureTree> trees = (List<FeatureTree>) editor.getViewer().getInput();
         trees.add(tree);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureTreeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureTreeDetailElement.java
index bc08951512b740aa84a1df150a87505ad78eb4d3..32686f6da5f07469c7a3a94a590366d06a8eae04 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureTreeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureTreeDetailElement.java
@@ -11,8 +11,7 @@ package eu.etaxonomy.taxeditor.ui.section.feature;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
-import eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement;
-import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement;
 
 /**
  *
@@ -20,30 +19,34 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
  * @since Dec 21, 2017
  *
  */
-public class FeatureTreeDetailElement extends AbstractCdmDetailElement<FeatureTree> {
-
-    private ToggleableTextElement toggleableText_titleCache;
+public class FeatureTreeDetailElement extends AbstractIdentifiableEntityDetailElement<FeatureTree> {
 
        public FeatureTreeDetailElement(CdmFormFactory formFactory,
                        ICdmFormElement formElement) {
                super(formFactory, formElement);
        }
 
+
        @Override
        protected void createControls(ICdmFormElement formElement, FeatureTree entity, int style) {
-           toggleableText_titleCache = formFactory.createToggleableTextField(
+           toggleable_cache = formFactory.createToggleableTextField(
                 formElement, "Title Cache", entity.getTitleCache(),
                 entity.isProtectedTitleCache(), style);
     }
 
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       protected void updateControlStates() {
+           super.updateControlStates();
+           toggleable_cache.setEnabled(getEntity().isProtectedTitleCache());
+       }
+
        @Override
        public void handleEvent(Object eventSource) {
-           if (eventSource == toggleableText_titleCache) {
-            getEntity().setTitleCache(toggleableText_titleCache.getText(),
-                    toggleableText_titleCache.getState());
-        }
-        if (eventSource != toggleableText_titleCache) {
-            toggleableText_titleCache.setText(getEntity().getTitleCache());
+           if (eventSource == toggleable_cache) {
+                   handleToggleableCacheField();
         }
        }