Merge branch 'release/5.28.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / view / e4 / supplementaldata / SupplementalDataPartE4.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java
index 1e12e67710566f8e953d0129d0cafff195640966..565b3c7e42cca8cbd1c07fa9298a166b0a8d482f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java
@@ -67,10 +67,11 @@ public class SupplementalDataPartE4 extends AbstractCdmEditorPartE4 {
            if(activePart==thisPart){
                return;
            }
-           setEnabled(true);
+//         setEnabled(true);
         Object partObject = createPartObject(activePart);
 
            if(partObject instanceof IPartContentHasSupplementalData) {
+               setEnabled(true);
 
                IStructuredSelection structuredSelection = createSelection(selection);
                if(structuredSelection==null || structuredSelection.isEmpty()){
@@ -114,7 +115,7 @@ public class SupplementalDataPartE4 extends AbstractCdmEditorPartE4 {
                else if(structuredSelection.getFirstElement() instanceof DescriptionElementBase ){
                    structuredSelection = new StructuredSelection((structuredSelection.getFirstElement()));
 
-                   if (((DescriptionElementBase)structuredSelection.getFirstElement()).getInDescription() != null && ((DescriptionElementBase)structuredSelection.getFirstElement()).getInDescription().isComputed()){
+                   if (((DescriptionElementBase)structuredSelection.getFirstElement()).getInDescription() != null && (((DescriptionElementBase)structuredSelection.getFirstElement()).getInDescription().isComputed() || ((DescriptionElementBase)structuredSelection.getFirstElement()).getInDescription().isCloneForSource())){
                     if (PreferencesUtil.isComputedDesciptionHandlingDisabled()){
                         setEnabled(false);
                     }else{
@@ -124,7 +125,7 @@ public class SupplementalDataPartE4 extends AbstractCdmEditorPartE4 {
             }
                else if(structuredSelection.getFirstElement() instanceof DescriptionBase ){
 
-                if (((DescriptionBase)structuredSelection.getFirstElement()).isComputed()){
+                if (((DescriptionBase)structuredSelection.getFirstElement()).isComputed() || ((DescriptionBase)structuredSelection.getFirstElement()).isCloneForSource()){
                     if (PreferencesUtil.isComputedDesciptionHandlingDisabled()){
                         setEnabled(false);
                     }else{