Merge branch 'release/5.8.0'

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

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 b6af9e481f1c4807c5d9c4b7a64bcee9f5ac4d53..3b808062c4a42826f834dd83d9a1586e1b64c1f0 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
@@ -18,15 +18,17 @@ import org.eclipse.swt.SWT;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;

-import eu.etaxonomy.cdm.model.reference.ISourceable;

 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;

+import eu.etaxonomy.cdm.model.description.DescriptionElementBase;

 import eu.etaxonomy.cdm.model.media.IdentifiableMediaEntity;
 import eu.etaxonomy.cdm.model.media.IdentifiableMediaEntity;

+import eu.etaxonomy.cdm.model.reference.ISourceable;

 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
 import eu.etaxonomy.taxeditor.model.IElementHasDetails;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
 import eu.etaxonomy.taxeditor.model.IElementHasDetails;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;

+import eu.etaxonomy.taxeditor.store.StoreUtil;

 import eu.etaxonomy.taxeditor.ui.element.RootElement;
 import eu.etaxonomy.taxeditor.ui.section.media.MediaSection;
 import eu.etaxonomy.taxeditor.ui.section.supplemental.AnnotationSection;
 import eu.etaxonomy.taxeditor.ui.element.RootElement;
 import eu.etaxonomy.taxeditor.ui.section.media.MediaSection;
 import eu.etaxonomy.taxeditor.ui.section.supplemental.AnnotationSection;


@@ -88,7 +90,7 @@ public class SupplementalDataViewerE4 extends AbstractCdmDataViewerE4 {
                if(input instanceof IdentifiableEntity){
                        createIdentifiableSections(rootElement);
                }
                if(input instanceof IdentifiableEntity){
                        createIdentifiableSections(rootElement);
                }

-               if(input instanceof ISourceable && !(input instanceof IdentifiableEntity)){
+               if(input instanceof ISourceable && !(input instanceof IdentifiableEntity) && !(input instanceof DescriptionElementBase)){

             createSourceSection(rootElement);
         }
                //4. Identifiable media entity
             createSourceSection(rootElement);
         }
                //4. Identifiable media entity


@@ -113,18 +115,18 @@ public class SupplementalDataViewerE4 extends AbstractCdmDataViewerE4 {
        }
 
        private void createSourceSection(RootElement parent){
        }
 
        private void createSourceSection(RootElement parent){

-           int expandStyle = getSectionStyle(SourceSection.class, false);
+           int expandStyle = StoreUtil.getSectionStyle(SourceSection.class, getInput().getClass().getCanonicalName(), false);

         SourceSection sourceSection =  formFactory.createSourceSection(getConversationHolder(), parent, expandStyle);
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);
         addPart(sourceSection);
     }
 
     private void createAnnotationSections(RootElement parent) {
         SourceSection sourceSection =  formFactory.createSourceSection(getConversationHolder(), parent, expandStyle);
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);
         addPart(sourceSection);
     }
 
     private void createAnnotationSections(RootElement parent) {

-        int expandStyle = getSectionStyle(AnnotationSection.class, false);
+        int expandStyle = StoreUtil.getSectionStyle(AnnotationSection.class, getInput().getClass().getCanonicalName(), false);

         AnnotationSection annotationSection = formFactory.createAnnotationSection(getConversationHolder(), parent, expandStyle);
 
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);
         AnnotationSection annotationSection = formFactory.createAnnotationSection(getConversationHolder(), parent, expandStyle);
 
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);

-        expandStyle = getSectionStyle(MarkerSection.class, false);
+        expandStyle = StoreUtil.getSectionStyle(MarkerSection.class, getInput().getClass().getCanonicalName(), false);

         MarkerSection markerSection = formFactory.createMarkerSection(getConversationHolder(), parent, expandStyle);
 
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);
         MarkerSection markerSection = formFactory.createMarkerSection(getConversationHolder(), parent, expandStyle);
 
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);


@@ -134,23 +136,23 @@ public class SupplementalDataViewerE4 extends AbstractCdmDataViewerE4 {
     }
 
     private void createIdentifiableSections(RootElement parent) {
     }
 
     private void createIdentifiableSections(RootElement parent) {

-        int expandStyle = getSectionStyle(SourceSection.class, false);
+        int expandStyle = StoreUtil.getSectionStyle(SourceSection.class, getInput().getClass().getCanonicalName(), false);

         SourceSection sourceSection = formFactory.createSourceSection(getConversationHolder(), parent, expandStyle);
 
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);
         SourceSection sourceSection = formFactory.createSourceSection(getConversationHolder(), parent, expandStyle);
 
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);

-        expandStyle =  getSectionStyle(IdentifierSection.class, false);
+        expandStyle =  StoreUtil.getSectionStyle(IdentifierSection.class, getInput().getClass().getCanonicalName(), false);

         IdentifierSection identifierSection = formFactory.createIdentifierDetailSection(getConversationHolder(), parent, expandStyle);
 
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);
         IdentifierSection identifierSection = formFactory.createIdentifierDetailSection(getConversationHolder(), parent, expandStyle);
 
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);

-        expandStyle =  getSectionStyle(ExtensionSection.class, false);
+        expandStyle =  StoreUtil.getSectionStyle(ExtensionSection.class, getInput().getClass().getCanonicalName(), false);

         ExtensionSection extensionSection = formFactory.createExtensionSection(getConversationHolder(), parent, expandStyle);
 
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);
         ExtensionSection extensionSection = formFactory.createExtensionSection(getConversationHolder(), parent, expandStyle);
 
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);

-        expandStyle =  getSectionStyle(CreditSection.class, false);
+        expandStyle =  StoreUtil.getSectionStyle(CreditSection.class, getInput().getClass().getCanonicalName(), false);

         CreditSection creditSection = formFactory.createCreditSection(getConversationHolder(), parent, expandStyle);
 
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);
         CreditSection creditSection = formFactory.createCreditSection(getConversationHolder(), parent, expandStyle);
 
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);

-        expandStyle =  getSectionStyle(RightsSection.class, false);
+        expandStyle =  StoreUtil.getSectionStyle(RightsSection.class, getInput().getClass().getCanonicalName(), false);

         RightsSection rightsSection = formFactory.createRightsSection(getConversationHolder(), parent, expandStyle);
 
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);
         RightsSection rightsSection = formFactory.createRightsSection(getConversationHolder(), parent, expandStyle);
 
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);


@@ -164,7 +166,7 @@ public class SupplementalDataViewerE4 extends AbstractCdmDataViewerE4 {
        }
 
     private void createIdentifiableMediaSections(RootElement parent) {
        }
 
     private void createIdentifiableMediaSections(RootElement parent) {

-        int expandStyle = getSectionStyle(MediaSection.class, false);
+        int expandStyle = StoreUtil.getSectionStyle(MediaSection.class, getInput().getClass().getCanonicalName(), false);

         MediaSection mediaSection = formFactory.createMediaSection(getConversationHolder(), parent, expandStyle);
 
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);
         MediaSection mediaSection = formFactory.createMediaSection(getConversationHolder(), parent, expandStyle);
 
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);


@@ -173,13 +175,12 @@ public class SupplementalDataViewerE4 extends AbstractCdmDataViewerE4 {
     }
 
        private void createVersionSection(RootElement parent){
     }
 
        private void createVersionSection(RootElement parent){

-               VersionSection versionSection = formFactory.createVersionSection(parent, ExpandableComposite.NO_TITLE | ExpandableComposite.EXPANDED);
+               VersionSection versionSection = formFactory.createVersionSection(parent, ExpandableComposite.NO_TITLE);

                addPart(versionSection);
        }
 
        private void createCdmBaseSection(RootElement parent) {
                addPart(versionSection);
        }
 
        private void createCdmBaseSection(RootElement parent) {

-
-               CdmBaseSection cdmBaseSection = formFactory.createCdmBaseSection(parent, ExpandableComposite.NO_TITLE | ExpandableComposite.EXPANDED);
+               CdmBaseSection cdmBaseSection = formFactory.createCdmBaseSection(parent, ExpandableComposite.NO_TITLE);

                addPart(cdmBaseSection);
        }
 
                addPart(cdmBaseSection);
        }