ref #9818: keep collapsable elements expandable when details are disabled

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
index 048e83ad95e39ff4a0c5994b6cf3073cc7901547..677b8bb75545de5bec4c408c6aa711a1e0c8034c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
@@ -3405,10 +3405,9 @@ public class CdmFormFactory extends FormToolkit {
 
         if (entity instanceof CategoricalData) {
             detailedDescriptionElement = new CategoricalDataDetailElement(this, parentElement,
-                    (CategoricalData) entity, style);
+                    (CategoricalData) entity, enabled, style);
         } else if (entity instanceof CommonTaxonName) {
-            detailedDescriptionElement = new CommonNameDetailElement(this, parentElement, (CommonTaxonName) entity,
-                    style);
+            detailedDescriptionElement = new CommonNameDetailElement(this, parentElement, (CommonTaxonName) entity, enabled, style);
         } else if (entity instanceof Distribution && !enabled) {
             detailedDescriptionElement = new DistributionDetailElement(this, parentElement, (Distribution) entity,
                     enabled, style);
@@ -3417,22 +3416,22 @@ public class CdmFormFactory extends FormToolkit {
                     true, style);
         }else if (entity instanceof IndividualsAssociation) {
             detailedDescriptionElement = new IndividualsAssociationDetailElement(this, parentElement,
-                    (IndividualsAssociation) entity, style);
+                    (IndividualsAssociation) entity, enabled, style);
         } else if (entity instanceof QuantitativeData) {
             detailedDescriptionElement = new QuantitativeDataDetailElement(this, parentElement,
-                    (QuantitativeData) entity, style);
+                    (QuantitativeData) entity, enabled, style);
         } else if (entity instanceof TaxonInteraction) {
             detailedDescriptionElement = new TaxonInteractionDetailElement(this, parentElement,
-                    (TaxonInteraction) entity, style);
+                    (TaxonInteraction) entity, enabled, style);
         } else if (entity instanceof TemporalData) {
-            detailedDescriptionElement = new TemporalDataDetailElement(this, parentElement, (TemporalData) entity, style);
+            detailedDescriptionElement = new TemporalDataDetailElement(this, parentElement, (TemporalData) entity, enabled, style);
         } else if (entity instanceof TextData) {
-            detailedDescriptionElement = new TextDataDetailElement(this, parentElement, (TextData) entity, style);
+            detailedDescriptionElement = new TextDataDetailElement(this, parentElement, (TextData) entity, enabled, style);
         }
         else {
             throw new IllegalStateException("There is no interface for the given description element");
         }
-        detailedDescriptionElement.setEnabled(enabled);
+//        detailedDescriptionElement.setEnabled(enabled);
         adapt(detailedDescriptionElement);
         parentElement.addElement(detailedDescriptionElement);
         return detailedDescriptionElement;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CheckboxElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CheckboxElement.java
index 70101c9d0dce8c8ba7f46d59a90d1836c66d5846..aa233721d04879f46f3493051cfa81198a9939df 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CheckboxElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CheckboxElement.java
@@ -92,7 +92,9 @@ public class CheckboxElement
        @Override
     public void setEnabled(boolean enabled) {
                checkbox.setEnabled(enabled);
-               label.setEnabled(enabled);
+               if (label != null){
+                       label.setEnabled(enabled);
+               }
        }
 
        @Override

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionElement.java
index 57f94cfc04415df18a5f85da1b16f0c7629135b3..bff0fa6561fc81e5d937eee62a17f1481ea363df 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionElement.java
@@ -29,6 +29,7 @@ import eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
 import eu.etaxonomy.taxeditor.ui.element.IEntityElement;
 import eu.etaxonomy.taxeditor.ui.element.ISelectable;
 import eu.etaxonomy.taxeditor.ui.element.LabelElement;
@@ -46,7 +47,7 @@ import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
 public abstract class AbstractEntityCollectionElement<ENTITY>
         extends AbstractCdmFormElement
         implements IEntityElement<ENTITY>, SelectionListener,
-              IConversationEnabled {
+              IConversationEnabled, IEnableableFormElement {
 
        protected ENTITY entity;
 
@@ -56,6 +57,10 @@ public abstract class AbstractEntityCollectionElement<ENTITY>
         * Composite "around" the actual content. Is used for control action like e.g. remove button
         */
        private final Composite box;
+       
+       private boolean isEnabled;
+
+       
 
        private Button btnRemove;
     protected Button btnChooseEntity;
@@ -106,6 +111,7 @@ public abstract class AbstractEntityCollectionElement<ENTITY>
                        btnRemove.setToolTipText("Remove");
 
                        btnRemove.addSelectionListener(removeListener);
+                       btnRemove.setEnabled(isEnabled);
                }
 
                createControls(this, style);
@@ -250,4 +256,26 @@ public abstract class AbstractEntityCollectionElement<ENTITY>
             warnForReferencedObjects.setVisible(isVisible);
         }
     }
+    
+    @Override
+       public void setEnabled(boolean enabled) {
+               this.isEnabled = enabled;
+               if (btnRemove != null){
+                       btnRemove.setEnabled(enabled);
+               }
+               if (btnChooseEntity != null){
+                       btnChooseEntity.setEnabled(enabled);
+               }
+               
+               for (ICdmFormElement element:this.getElements()){
+                       if (element instanceof IEnableableFormElement){
+                               ((IEnableableFormElement)element).setEnabled(enabled);
+                       }
+               }
+       }
+
+       @Override
+       public boolean isEnabled() {
+               return isEnabled;
+       }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java
index 1db44967b60f269b77169ee8f6b593bcdd7e94ca..70add212d2b8711a50e02fb06ae8fe49eb26e3f1 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java
@@ -51,6 +51,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
 
 /**
  * This class visualizes an CDM entity of type ENTITY and additionally provides
@@ -63,7 +64,7 @@ import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
  */
 public abstract class AbstractEntityCollectionSection<ENTITY, ELEMENT>
         extends AbstractFormSection<ENTITY>
-        implements IExpansionListener, Observer {
+        implements IExpansionListener, Observer, IEnableableFormElement {
 
     private static final EnumSet<CRUD> UPDATE = EnumSet.of(CRUD.UPDATE);
 
@@ -74,13 +75,15 @@ public abstract class AbstractEntityCollectionSection<ENTITY, ELEMENT>
        private String title;
 
     private AbstractEntityCollectionElement<ENTITY> entityCollectionElement;
+    
+    private boolean isEnabled = true;
 
        public AbstractEntityCollectionSection(CdmFormFactory formFactory, ConversationHolder conversation, ICdmFormElement parentElement, String title, int style) {
                super(formFactory, parentElement, ExpandableComposite.CLIENT_INDENT | style);
                this.title = title;
                this.setText(getTitleString());
                updateToolbar();
-
+               layout();
                addExpansionListener(this);
 
                CdmStore.getLoginManager().addObserver(this);
@@ -277,6 +280,7 @@ public abstract class AbstractEntityCollectionSection<ENTITY, ELEMENT>
         */
        protected void createElementComposite(ELEMENT element, SelectionListener removeListener, Color backgroundColor){
                entityCollectionElement = formFactory.createEntityCollectionElement(this, element, removeListener, backgroundColor, SWT.NULL);
+               entityCollectionElement.setEnabled(isEnabled);
        }
 
        @Override
@@ -339,7 +343,7 @@ public abstract class AbstractEntityCollectionSection<ENTITY, ELEMENT>
        }
 
     protected void updateToolbar() {
-        if( !(getEntity() instanceof CdmBase) || (getEntity() != null && CdmStore.currentAuthentiationHasPermission(StoreUtil.getCdmEntity(getEntity()), UPDATE)) ){
+        if( !(getEntity() instanceof CdmBase) || (getEntity() != null && CdmStore.currentAuthentiationHasPermission(StoreUtil.getCdmEntity(getEntity()), UPDATE)) && isEnabled){
             showToolbar();
         } else {
             removeToolbar();
@@ -417,4 +421,22 @@ public abstract class AbstractEntityCollectionSection<ENTITY, ELEMENT>
         * @return String to display when hovering the add button
         */
        protected abstract String getTooltipString();
+       
+       public boolean isEnabled(){
+               return isEnabled;
+       }
+       
+       public void setEnabled(boolean enabled){
+               isEnabled=enabled;
+               if (!isEnabled){
+                       removeToolbar();
+               }
+               
+               for (ICdmFormElement element: getElements()){
+                       if (element instanceof IEnableableFormElement){
+                               ((IEnableableFormElement)element).setEnabled(isEnabled);
+                       }
+               }
+               
+       }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailElement.java
index 6f44906435f06a6244b48409b7988201b5c407db..9a044ea82655010d0b39d73cd07cedaf991f4ebe 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailElement.java
@@ -47,6 +47,8 @@ public class DescriptionElementDetailElement extends
        /** {@inheritDoc} */
        @Override
        protected void createControls(ICdmFormElement formElement, DescriptionElementBase entity, int style) {
+       
+               setEnabled(!((getEntity().getInDescription() != null && (getEntity().getInDescription().isComputed() || getEntity().getInDescription().isCloneForSource())&& PreferencesUtil.isComputedDesciptionHandlingDisabled()) || (getEntity() instanceof Distribution && AbstractUtility.getActivePart() instanceof IDistributionEditorPart)));
                formFactory.createDetailedDescriptionDetailElement(formElement, entity, style, isEnabled());
        }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailSection.java
index 6baab4939181602a77c942b66810bfd2ceee0551..db066148025bcd3b9e0489eac564a7a3dcd6ed3e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailSection.java
@@ -29,8 +29,10 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
 import eu.etaxonomy.taxeditor.ui.section.description.operation.ChangeDescriptionElementType;
 import eu.etaxonomy.taxeditor.view.e4.details.DetailsPartE4;
 
@@ -145,11 +147,10 @@ public class DescriptionElementDetailSection extends
     public void setEntity(DescriptionElementBase entity) {
         super.setEntity(entity);
         boolean isEnabled = true;
-        if (entity.getInDescription().isComputed() && PreferencesUtil.isComputedDesciptionHandlingDisabled() ){
+        if ((entity.getInDescription().isComputed() || entity.getInDescription().isCloneForSource())&& PreferencesUtil.isComputedDesciptionHandlingDisabled() ){
             isEnabled = false;
         }
         setEnabled(isEnabled);
-//        this.getDetailElement().setEnabled(isEnabled);
 
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java
index 5272d7d770fd700e4907fe9f380d93d3f0bc26d2..c762cfad82d1f331d5b76e858017888b6362435c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java
@@ -35,7 +35,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
  * @created Sep 15, 2010
  */
 public class StatisticalMeasurementValueElement extends
-               AbstractEntityCollectionElement<StatisticalMeasurementValue> implements IEnableableFormElement{
+               AbstractEntityCollectionElement<StatisticalMeasurementValue> {
 
        private BigDecimalWithLabelElement number_value;
        private TermComboElement<StatisticalMeasure> combo_type;
@@ -91,15 +91,15 @@ public class StatisticalMeasurementValueElement extends
                }
        }
 
-       @Override
-       public void setEnabled(boolean enabled) {
-               combo_type.setEnabled(enabled);
-               number_value.setEnabled(enabled);
-               section_modifiers.setEnabled(enabled);
-       }
-
-       @Override
-       public boolean isEnabled() {            
-               return combo_type.isEnabled();
-       }
+//     @Override
+//     public void setEnabled(boolean enabled) {
+//             combo_type.setEnabled(enabled);
+//             number_value.setEnabled(enabled);
+//             section_modifiers.setEnabled(enabled);
+//     }
+//
+//     @Override
+//     public boolean isEnabled() {            
+//             return combo_type.isEnabled();
+//     }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/AbstractDetailedDescriptionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/AbstractDetailedDescriptionDetailElement.java
index 28bbb1d93a3d1735eafb6e8837f874bb08226a94..44790206e9c4d403555f5bbf6cdeedffa65c1907 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/AbstractDetailedDescriptionDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/AbstractDetailedDescriptionDetailElement.java
@@ -45,17 +45,24 @@ public abstract class AbstractDetailedDescriptionDetailElement<T extends Descrip
         * @param style a int.
         * @param <T> a T object.
         */
+       public AbstractDetailedDescriptionDetailElement(CdmFormFactory formFactory,
+                       ICdmFormElement formElement, T entity, boolean enabled, int style) {
+               super(formFactory, formElement);
+               setEntity(entity);
+               setEnabled(enabled);
+       }
        public AbstractDetailedDescriptionDetailElement(CdmFormFactory formFactory,
                        ICdmFormElement formElement, T entity, int style) {
                super(formFactory, formElement);
                setEntity(entity);
+               
        }
 
 
     protected void createTimePeriod(ICdmFormElement formElement, DescriptionElementBase entity,
             int style) {
            timePeriod = formFactory.createTimePeriodElement(this, "Time scope", entity.getTimeperiod(), SWT.WRAP);
-
+           timePeriod.setEnabled(enabled);
     }
 
     protected void createModifier(ICdmFormElement formElement, DescriptionElementBase entity,
@@ -65,12 +72,14 @@ public abstract class AbstractDetailedDescriptionDetailElement<T extends Descrip
             section_modifiers = formFactory.createModifierSection(getConversationHolder(), this, StoreUtil.getSectionStyle(ModifierSection.class, entity.getClass().getCanonicalName(), true));
             section_modifiers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
             section_modifiers.setEntity(entity);
+            section_modifiers.setEnabled(enabled);
         }
         if (PreferencesUtil.getBooleanValue(PreferencePredicate.ShowModifierFreeText.getKey())){
             text_modifyingText = formFactory.createTextWithLabelElement(this, "Modifying Text", null, style);
             if(getEntity().getModifyingText().get(CdmStore.getDefaultLanguage()) != null) {
                 text_modifyingText.setText(getEntity().getModifyingText().get(CdmStore.getDefaultLanguage()).getText());
             }
+            text_modifyingText.setEnabled(enabled);
         }
     }
 
@@ -81,6 +90,7 @@ public abstract class AbstractDetailedDescriptionDetailElement<T extends Descrip
             if(getEntity().getModifyingText().get(CdmStore.getDefaultLanguage()) != null) {
                 text_modifyingText.setText(getEntity().getModifyingText().get(CdmStore.getDefaultLanguage()).getText());
             }
+            text_modifyingText.setEnabled(enabled);
         }
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java
index e348c51d1f9c91bb36d507f0076c59d4283c2075..2492acc6a58c9fc16e474bf7ea27faedda6e0310 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java
@@ -30,8 +30,9 @@ public class CategoricalDataDetailElement extends AbstractDetailedDescriptionDet
         * @param style a int.
         */
        public CategoricalDataDetailElement(CdmFormFactory formFactory,
-                       ICdmFormElement formElement, CategoricalData entity, int style) {
-               super(formFactory, formElement, entity, style);
+                       ICdmFormElement formElement, CategoricalData entity, boolean enabled, int style) {
+               super(formFactory, formElement, entity, enabled, style);
+               
        }
 
        @Override
@@ -42,6 +43,7 @@ public class CategoricalDataDetailElement extends AbstractDetailedDescriptionDet
                section_stateData = formFactory.createStateDataSection(getConversationHolder(), formElement, StoreUtil.getSectionStyle(StateDataSection.class, entity.getClass().getCanonicalName(), true));
                section_stateData.setEntity(entity);
                section_stateData.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
+               section_stateData.setEnabled(enabled);
                createTimePeriod(formElement, entity, style);
                if (entity.getFeature().getRecommendedModifierEnumeration() != null && !entity.getFeature().getRecommendedModifierEnumeration().isEmpty()){
                    createModifier(formElement, entity, style);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java
index 557291d7497a83711e461855a191f85268a936f7..805ad92ad9f4cfc0898226eb658e7964c6a3bcd9 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java
@@ -50,8 +50,8 @@ public class CommonNameDetailElement extends AbstractDetailedDescriptionDetailEl
         * @param style a int.
         */
        public CommonNameDetailElement(CdmFormFactory formFactory,
-                       ICdmFormElement formElement, CommonTaxonName entity, int style) {
-               super(formFactory, formElement, entity, style);
+                       ICdmFormElement formElement, CommonTaxonName entity, boolean enabled, int style) {
+               super(formFactory, formElement, entity, enabled, style);
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/DistributionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/DistributionDetailElement.java
index 4e12178bd424df879c520f02fa4a9ca6f6feedf9..566d97975b77a68a3afef99c4614f2656d941cb3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/DistributionDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/DistributionDetailElement.java
@@ -47,8 +47,8 @@ public class DistributionDetailElement extends
 
        public DistributionDetailElement(CdmFormFactory formFactory,
                        ICdmFormElement formElement, Distribution entity, boolean enabled, int style) {
-               super(formFactory, formElement, entity, style);
-               setEnabled(enabled);
+               super(formFactory, formElement, entity, enabled, style);
+               
        }
 
        @Override

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java
index 4ae6151f3accb01d47c71b7753995037f9c9d827..c5d19a73ffb8de0b84ef58b5acded8fc5fc28140 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java
@@ -34,9 +34,9 @@ public class IndividualsAssociationDetailElement extends
        private EntitySelectionElement<SpecimenOrObservationBase> selection_derivedUnit;
 
        public IndividualsAssociationDetailElement(CdmFormFactory formFactory,
-                       ICdmFormElement formElement, IndividualsAssociation entity,
+                       ICdmFormElement formElement, IndividualsAssociation entity, boolean enabled, 
                        int style) {
-               super(formFactory, formElement, entity, style);
+               super(formFactory, formElement, entity, enabled, style);
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java
index 98de82f34b28cb193f26d5a9acd243232ce235cb..5033828574f5b41819009857d88e963fcde91fc2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java
@@ -35,8 +35,8 @@ public class QuantitativeDataDetailElement extends
         * @param style a int.
         */
        public QuantitativeDataDetailElement(CdmFormFactory formFactory,
-                       ICdmFormElement formElement, QuantitativeData entity, int style) {
-               super(formFactory, formElement, entity, style);
+                       ICdmFormElement formElement, QuantitativeData entity, boolean enabled, int style) {
+               super(formFactory, formElement, entity, enabled, style);
        }
 
        @Override

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java
index fa310f3a599e29e4c69a2950a5feb079cec8ff69..7989ac4956205499d0c2d443495b3b0e86f568b8 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java
@@ -55,8 +55,8 @@ public class TaxonInteractionDetailElement extends
         *            a int.
         */
        public TaxonInteractionDetailElement(CdmFormFactory formFactory,
-                       ICdmFormElement formElement, TaxonInteraction entity, int style) {
-               super(formFactory, formElement, entity, style);
+                       ICdmFormElement formElement, TaxonInteraction entity, boolean enabled, int style) {
+               super(formFactory, formElement, entity, enabled, style);
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TemporalDataDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TemporalDataDetailElement.java
index dbd538565f1b64d1b6a95b2347ec70e0bfa2f740..28c85f7728c2c857023838795bf2f6d3e88f2131 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TemporalDataDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TemporalDataDetailElement.java
@@ -28,9 +28,9 @@ public class TemporalDataDetailElement extends AbstractDetailedDescriptionDetail
      * @param entity
      * @param style
      */
-    public TemporalDataDetailElement(CdmFormFactory formFactory, ICdmFormElement formElement, TemporalData entity,
+    public TemporalDataDetailElement(CdmFormFactory formFactory, ICdmFormElement formElement, TemporalData entity, boolean enabled,
             int style) {
-        super(formFactory, formElement, entity, style);
+        super(formFactory, formElement, entity, enabled, style);
 
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TextDataDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TextDataDetailElement.java
index e0b8d7191a929e1278ecd24d5c579ed45dc01cd0..e20132c16aed5f15a82bfc5d3b9a91bf3a98d5f5 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TextDataDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TextDataDetailElement.java
@@ -39,8 +39,8 @@ public class TextDataDetailElement extends AbstractDetailedDescriptionDetailElem
         * @param style a int.
         */
        public TextDataDetailElement(CdmFormFactory formFactory,
-                       ICdmFormElement formElement, TextData entity, int style) {
-               super(formFactory, formElement, entity, style);
+                       ICdmFormElement formElement, TextData entity, boolean enabled, int style) {
+               super(formFactory, formElement, entity, enabled, style);
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java
index cb806b8ed665216b0061d37575f4dbbfa3a34d1f..375b1680b494de7d397dd41ce56bb7876f0584a8 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java
@@ -81,6 +81,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.store.UsageTermCollection;
 import eu.etaxonomy.taxeditor.termtree.e4.ICharacterEditor;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
 import eu.etaxonomy.taxeditor.ui.element.RootElement;
 import eu.etaxonomy.taxeditor.ui.section.agent.PersonDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.agent.TeamDetailSection;
@@ -644,7 +645,7 @@ public class DetailsViewerE4 extends AbstractCdmDataViewer {
         }else{
             descriptionElementSourceSection = formFactory.createDescriptionElementSourceSection(getConversationHolder(), parent, StoreUtil.getSectionStyle(DescriptionElementSourceSection.class, getInput().getClass().getCanonicalName()) );
             descriptionElementSourceSection.setEnabled(this.detailsEnabled);
-            descriptionElementDetailSection.setEnabled(this.detailsEnabled);
+
         }
 
 

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..226688b3365bb3d452f51e807e8958c1f5fdd20c 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()){

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataViewerE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataViewerE4.java
index ca25923c1e81f9023de69186442904e6a6a809e2..20fff4d48a1c2110e33e68e20615981158c62dbb 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataViewerE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataViewerE4.java
@@ -134,6 +134,7 @@ public class SupplementalDataViewerE4 extends AbstractCdmDataViewer {
 
         addPart(annotationSection);
         addPart(markerSection);
+        
     }
 
     private void createIdentifiableSections(RootElement parent) {