layout issues in name details view preference

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / preference / SpecimenOrObservationPreferences.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
index aa45b80906bd0a78dffb904fc16b94725616a6d6..799b6831a5e193dbac5b1cbcc3f22d2c0f464602 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
@@ -138,7 +138,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
         if (isAdminPreference){
             allowOverrideIsShowSpecimenRelatedIssuesButton = createAllowOverrideButton(titleComp);
             allowOverrideIsShowSpecimenRelatedIssuesButton.setSelection(allowOverrideShowSpecimenRelatedIssues);
-            allowOverrideIsShowSpecimenRelatedIssuesButton.setEnabled(isShowSpecimenRelatedIssues != null);
+//            allowOverrideIsShowSpecimenRelatedIssuesButton.setEnabled(isShowSpecimenRelatedIssues != null);
             allowOverrideIsShowSpecimenRelatedIssuesButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -177,7 +177,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
         if (isAdminPreference){
             allowOverrideShowCollectingAreaButton = createAllowOverrideButton(composite);
             allowOverrideShowCollectingAreaButton.setSelection(allowOverrideShowCollectingAreaInGeneralSection);
-            allowOverrideShowCollectingAreaButton.setEnabled(isShowCollectingAreaInGeneralSection != null);
+//            allowOverrideShowCollectingAreaButton.setEnabled(isShowCollectingAreaInGeneralSection != null);
             allowOverrideShowCollectingAreaButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -220,7 +220,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
         if (isAdminPreference){
             allowOverridesDeterminationOnlyForFieldUnitsButton = createAllowOverrideButton(composite);
             allowOverridesDeterminationOnlyForFieldUnitsButton.setSelection(allowOverrideDeterminationOnlyForFieldUnits);
-            allowOverridesDeterminationOnlyForFieldUnitsButton.setEnabled(showDeterminationOnlyForFieldUnits != null);
+//            allowOverridesDeterminationOnlyForFieldUnitsButton.setEnabled(showDeterminationOnlyForFieldUnits != null);
             allowOverridesDeterminationOnlyForFieldUnitsButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -258,7 +258,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
         if (isAdminPreference){
             allowOverrideIsShowTaxonAssociationButton = createAllowOverrideButton(composite);
             allowOverrideIsShowTaxonAssociationButton.setSelection(allowOverrideShowTaxonAssociation);
-            allowOverrideIsShowTaxonAssociationButton.setEnabled(showTaxonAssociation != null);
+//            allowOverrideIsShowTaxonAssociationButton.setEnabled(showTaxonAssociation != null);
             allowOverrideIsShowTaxonAssociationButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -295,7 +295,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
         if (isAdminPreference){
             allowOverrideShowLifeFormButton = createAllowOverrideButton(composite);
             allowOverrideShowLifeFormButton.setSelection(allowOverrideShowLifeForm);
-            allowOverrideShowLifeFormButton.setEnabled(showLifeForm != null);
+//            allowOverrideShowLifeFormButton.setEnabled(showLifeForm != null);
             allowOverrideShowLifeFormButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -557,7 +557,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
             allowOverrideShowLifeForm = true;
             allowOverrideShowLifeFormButton.setSelection(allowOverrideShowSpecimenRelatedIssues);
         }
-
+        setApply(true);
 
         super.performDefaults();
     }
@@ -572,15 +572,9 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
            String text = showSpecimenButton.getText();
            if(text.startsWith(Messages.Preference_Use_Default)){
                isShowSpecimenRelatedIssues = null;
-               if (isAdminPreference){
-                   allowOverrideIsShowSpecimenRelatedIssuesButton.setSelection(true);
-                   allowOverrideIsShowSpecimenRelatedIssuesButton.setEnabled(false);
-               }
                return;
            }
-           if (isAdminPreference){
-               allowOverrideIsShowSpecimenRelatedIssuesButton.setEnabled(true);
-           }
+
            if (text.equals(Messages.GeneralPreference_yes)){
                isShowSpecimenRelatedIssues = true;
            }else{
@@ -592,15 +586,9 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
            String text = showCollectingAreaInGeneralSectionButton.getText();
            if(text.startsWith(Messages.Preference_Use_Default)){
                isShowCollectingAreaInGeneralSection = null;
-               if (isAdminPreference){
-                   allowOverrideShowCollectingAreaButton.setSelection(true);
-                   allowOverrideShowCollectingAreaButton.setEnabled(false);
-               }
                return;
            }
-           if (isAdminPreference){
-               allowOverrideShowCollectingAreaButton.setEnabled(true);
-           }
+
            if (text.equals(Messages.GeneralPreference_yes)){
                isShowCollectingAreaInGeneralSection = true;
            }else{
@@ -612,15 +600,8 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
            String text = determinationOnlyForFieldUnitsButton.getText();
            if(text.startsWith(Messages.Preference_Use_Default)){
                isDeterminationOnlyForFieldUnits = null;
-               if (isAdminPreference){
-                   allowOverridesDeterminationOnlyForFieldUnitsButton.setSelection(true);
-                   allowOverridesDeterminationOnlyForFieldUnitsButton.setEnabled(false);
-               }
                return;
            }
-           if (isAdminPreference){
-               allowOverridesDeterminationOnlyForFieldUnitsButton.setEnabled(true);
-           }
            if (text.equals(Messages.GeneralPreference_yes)){
                isDeterminationOnlyForFieldUnits = true;
            }else{
@@ -632,15 +613,9 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
            String text = showTaxonAssociationButton.getText();
            if(text.startsWith(Messages.Preference_Use_Default)){
                isShowTaxonAssociation = null;
-               if (isAdminPreference){
-                   //showTaxonAssociation.setAllowOverride(true);
-                   allowOverrideIsShowTaxonAssociationButton.setSelection(true);
-                   allowOverrideIsShowTaxonAssociationButton.setEnabled(false);
-               }
                return;
-           }if (isAdminPreference){
-               allowOverrideIsShowTaxonAssociationButton.setEnabled(true);
            }
+
            if (text.equals(Messages.GeneralPreference_yes)){
                isShowTaxonAssociation = true;
            }else{
@@ -652,15 +627,9 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
            String text = showLifeFormButton.getText();
            if(text.startsWith(Messages.Preference_Use_Default)){
                isShowLifeForm = null;
-               if (isAdminPreference){
-                   allowOverrideShowLifeFormButton.setSelection(true);
-                   allowOverrideShowLifeFormButton.setEnabled(false);
-               }
                return;
            }
-           if (isAdminPreference){
-               allowOverrideShowLifeFormButton.setEnabled(true);
-           }
+
            if (text.equals(Messages.GeneralPreference_yes)){
                isShowLifeForm = true;
            }else{