ref #8389: disable allowOverride when 'use default' is selected

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
index 759ad6172031f53c75d8da65a86ac2296aa99282..005f2570bf4acae40f6abe7eb280cd0751844ea8 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
@@ -123,22 +123,17 @@ public class GeneralAdminPreferencePage extends GeneralPreferencePage implements
     @Override
     protected void performDefaults() {
         isShowIOMenu = null;
-        showIOMenuButton.select(0);
-
         isShowCheckListPerspective = null;
-        showChecklistPerspectiveButton.select(0);
-
-
         isShowTaxonNodeWizard = null;
-        showTaxonNodeWizardButton.select(0);
+
 
         isAllowOverrideShowIOMenu = true;
 
-        allowOverrideShowIOMenuButton.setSelection(isAllowOverrideShowIOMenu);
+
         isAllowOverrideShowCheckListPerspective = true;
-        allowOverrideShowChecklistButton.setSelection(isAllowOverrideShowCheckListPerspective);
+
         isAllowOverrideShowTaxonNodeWizard = true;
-        allowOverrideShowTaxonNodeWizardButton.setSelection(isAllowOverrideShowTaxonNodeWizard);
+        setSelections();
         super.performDefaults();
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbcdImportPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbcdImportPreference.java
index 7b496308a7dd99d667ce6e3fc9fb1d5ef8a7f3a4..19b7e4c1ff7ccb7c2e9cc59e5b4145cf008f5bec 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbcdImportPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbcdImportPreference.java
@@ -393,6 +393,11 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4Prefer
         }
         if (isAdminPreference){
             checkAllowOverride.setSelection(allowOverride || preference == null);
+            if (preference == null){
+                checkAllowOverride.setEnabled(false);
+            }else{
+                checkAllowOverride.setEnabled(true);
+            }
         }else{
             checkAllowOverride.setSelection(override);
         }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
index aa706e0555d25a2823faf75d6bd083feb820f4b4..3ddc31da511a7f626eaa3ae89891488f72ef0b72 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
@@ -135,6 +135,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
             if (isAdminPreference) {\r
                 allowOverrideActivatedButton = createAllowOverrideButton(activateComp);\r
                 allowOverrideActivatedButton.setSelection(this.distributionEditorPref != null? this.distributionEditorPref.isAllowOverride(): true);\r
+                allowOverrideActivatedButton.setEnabled(this.distributionEditorPref != null);\r
                 allowOverrideActivatedButton.addSelectionListener(new SelectionAdapter() {\r
                     @Override\r
                     public void widgetSelected(SelectionEvent e) {\r
@@ -181,6 +182,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
             if (isAdminPreference) {\r
                 allowOverrideRankButton = createAllowOverrideButton(child);\r
                 allowOverrideRankButton.setSelection(prefRank != null? prefRank.isAllowOverride():true);\r
+                allowOverrideRankButton.setEnabled(prefRank != null);\r
                 allowOverrideRankButton.addSelectionListener(new SelectionAdapter() {\r
                     @Override\r
                     public void widgetSelected(SelectionEvent e) {\r
@@ -214,6 +216,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
             if (isAdminPreference) {\r
                 allowOverrideOrderAreasButton = createAllowOverrideButton(child);\r
                 allowOverrideOrderAreasButton.setSelection(prefAreaSort != null? prefAreaSort.isAllowOverride(): true);\r
+                allowOverrideOrderAreasButton.setEnabled(prefAreaSort != null);\r
                 allowOverrideOrderAreasButton.addSelectionListener(new SelectionAdapter() {\r
                     @Override\r
                     public void widgetSelected(SelectionEvent e) {\r
@@ -249,6 +252,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
             if (isAdminPreference) {\r
                 allowOverrideAreaDisplayButton = createAllowOverrideButton(child);\r
                 allowOverrideAreaDisplayButton.setSelection(prefAreaDisplay != null? prefAreaDisplay.isAllowOverride(): true);\r
+                allowOverrideAreaDisplayButton.setEnabled(prefAreaDisplay != null);\r
                 allowOverrideAreaDisplayButton.addSelectionListener(new SelectionAdapter() {\r
                     @Override\r
                     public void widgetSelected(SelectionEvent e) {\r
@@ -283,6 +287,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
             if (isAdminPreference) {\r
                 allowOverrideStatusDisplayButton = createAllowOverrideButton(child);\r
                 allowOverrideStatusDisplayButton.setSelection(prefStatusDisplay != null ? prefStatusDisplay.isAllowOverride(): true);\r
+                allowOverrideStatusDisplayButton.setEnabled(prefStatusDisplay != null);\r
                 allowOverrideStatusDisplayButton.addSelectionListener(new SelectionAdapter() {\r
                     @Override\r
                     public void widgetSelected(SelectionEvent e) {\r
@@ -317,6 +322,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
             if (isAdminPreference) {\r
                 allowOverrideStatusDisplayInComboButton = createAllowOverrideButton(child);\r
                 allowOverrideStatusDisplayInComboButton.setSelection(prefStatusDisplayInCombo != null ? prefStatusDisplayInCombo.isAllowOverride(): true);\r
+                allowOverrideStatusDisplayInComboButton.setEnabled(prefStatusDisplayInCombo != null);\r
                 allowOverrideStatusDisplayInComboButton.addSelectionListener(new SelectionAdapter() {\r
                     @Override\r
                     public void widgetSelected(SelectionEvent e) {\r
@@ -334,7 +340,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
 \r
             if (!isAdminPreference) {\r
 \r
-                //PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);\r
+\r
                 if (distributionEditorPref != null && !distributionEditorPref.isAllowOverride()){\r
                     activateComp.setEnabled(false);\r
                 }\r
@@ -345,7 +351,6 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                 }\r
                 if (prefAreaSort != null && !prefAreaSort.isAllowOverride()) {\r
                     areaOrderSelectionCombo.setEnabled(false);\r
-                    //allowOverrideOrderAreasButton.setEnabled(false);\r
                 }\r
                 if (prefAreaDisplay != null && !prefAreaDisplay.isAllowOverride()) {\r
                     areaDisplaySelectionCombo.setEnabled(false);\r
@@ -387,10 +392,6 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                     PreferencesUtil.prefOverrideKey(PreferencePredicate.AreasSortedInDistributionEditor.getKey()),\r
                     override);\r
 \r
-\r
-\r
-\r
-\r
             override = false;\r
             if (isShowRank != null ) {\r
                 override = true;\r
@@ -430,13 +431,6 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                     PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), override);\r
 \r
 \r
-\r
-\r
-//            PreferencesUtil.setOwnDescriptionForChecklistEditor(ownDescriptionForDistributionEditor);\r
-//            PreferencesUtil.setBooleanValue(\r
-//                    PreferencesUtil.prefOverrideKey(PreferencePredicate.OwnDescriptionForDistributionEditor.getKey()),\r
-//                    true);\r
-\r
             PreferencesUtil.firePreferencesChanged(this.getClass());\r
 \r
         return true;\r
@@ -455,10 +449,12 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                 if(isAdminPreference){\r
                     prefStatusDisplay.setAllowOverride(true);\r
                     allowOverrideStatusDisplayButton.setSelection(true);\r
+                    allowOverrideStatusDisplayButton.setEnabled(false);\r
                 }\r
 \r
                 return;\r
             }\r
+            allowOverrideStatusDisplayButton.setEnabled(true);\r
             for (TermDisplayEnum display : TermDisplayEnum.values()) {\r
                 if (text.startsWith(display.getLabel())) {\r
                     displayStatus = display;\r
@@ -474,10 +470,12 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                 if(isAdminPreference){\r
                     prefStatusDisplayInCombo.setAllowOverride(true);\r
                     allowOverrideStatusDisplayInComboButton.setSelection(true);\r
+                    allowOverrideStatusDisplayInComboButton.setEnabled(false);\r
                 }\r
 \r
                 return;\r
             }\r
+            allowOverrideStatusDisplayInComboButton.setEnabled(true);\r
             for (TermComboEnum display : TermComboEnum.values()) {\r
                 if (text.startsWith(display.getLabel())) {\r
                     displayStatusCombo = display;\r
@@ -493,9 +491,11 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                 if (isAdminPreference){\r
                     prefAreaDisplay.setAllowOverride(true);\r
                     allowOverrideAreaDisplayButton.setSelection(true);\r
+                    allowOverrideAreaDisplayButton.setEnabled(false);\r
                 }\r
                 return;\r
             }\r
+            allowOverrideAreaDisplayButton.setEnabled(true);\r
             for (TermDisplayEnum display : TermDisplayEnum.values()) {\r
                 if (text.startsWith(display.getLabel())) {\r
                     displayArea = display;\r
@@ -510,9 +510,11 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                 if (isAdminPreference){\r
                     prefAreaSort.setAllowOverride(true);\r
                     allowOverrideOrderAreasButton.setSelection(true);\r
+                    allowOverrideOrderAreasButton.setEnabled(false);\r
                 }\r
                 return;\r
             }\r
+            allowOverrideOrderAreasButton.setEnabled(true);\r
             for (TermOrder display : TermOrder.values()) {\r
                 if (text.startsWith(display.getLabel())) {\r
                     orderAreas = display;\r
@@ -527,9 +529,11 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                 if (isAdminPreference){\r
                     prefRank.setAllowOverride(true);\r
                     allowOverrideRankButton.setSelection(true);\r
+                    allowOverrideRankButton.setEnabled(false);\r
                 }\r
                 return;\r
             }\r
+            allowOverrideRankButton.setEnabled(true);\r
             if (text.equals(SHOW_RANK)){\r
                 isShowRank = true;\r
             }else{\r
@@ -547,9 +551,11 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                     }\r
                     distributionEditorPref.setAllowOverride(true);\r
                     allowOverrideActivatedButton.setSelection(true);\r
+                    allowOverrideActivatedButton.setEnabled(false);\r
                 }\r
                 return;\r
             }\r
+            allowOverrideActivatedButton.setEnabled(true);\r
             if (text.equals(ENABLE)){\r
                 isEditorActivated = true;\r
             }else{\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java
index 7f97e605760e987b3620ea5a67f1c30cbd8acd5f..caa9bcca39a79469f4b76d603e165e5de99fc6e1 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java
@@ -234,9 +234,11 @@ public class GeneralPreferencePage extends CdmPreferencePage implements Selectio
             if (text.startsWith(Messages.Preference_Use_Default)){
                 isOverrideShowIOMenu = false;
                 isShowIOMenu = null;
+                isAllowOverrideShowIOMenu = true;
             }else if (text.equals(SHOW)){
                 isShowIOMenu = true;
                 isOverrideShowIOMenu = true;
+
             }else{
                 isShowIOMenu = false;
                 isOverrideShowIOMenu = true;
@@ -247,6 +249,7 @@ public class GeneralPreferencePage extends CdmPreferencePage implements Selectio
             if (text.startsWith(Messages.Preference_Use_Default)){
                 isOverrideShowCheckListPerspective = false;
                 isShowCheckListPerspective = null;
+                isAllowOverrideShowCheckListPerspective = true;
             }else if (text.equals(SHOW)){
                 isShowCheckListPerspective = true;
                 isOverrideShowCheckListPerspective = true;
@@ -260,6 +263,7 @@ public class GeneralPreferencePage extends CdmPreferencePage implements Selectio
             if (text.startsWith(Messages.Preference_Use_Default)){
                 isOverrideShowTaxonNodeWizard = false;
                 isShowTaxonNodeWizard = null;
+                isAllowOverrideShowTaxonNodeWizard = true;
             }else if (text.equals(SHOW)){
                 isShowTaxonNodeWizard = true;
                 isOverrideShowTaxonNodeWizard = true;
@@ -268,6 +272,7 @@ public class GeneralPreferencePage extends CdmPreferencePage implements Selectio
                 isOverrideShowTaxonNodeWizard = true;
             }
         }
+        this.setSelections();
         this.setApply(true);
 
 
@@ -301,26 +306,50 @@ public class GeneralPreferencePage extends CdmPreferencePage implements Selectio
     protected void setSelections(){
         if (isShowIOMenu == null || (!isOverrideShowIOMenu && !isAdminPreference)){
             showIOMenuButton.select(0);
-        }else if (isShowIOMenu){
-            showIOMenuButton.select(1);
+            if (isAdminPreference){
+                allowOverrideShowIOMenuButton.setEnabled(false);
+            }
         }else{
-            showIOMenuButton.select(2);
+            if (isAdminPreference){
+                allowOverrideShowIOMenuButton.setEnabled(true);
+            }
+            if (isShowIOMenu){
+                showIOMenuButton.select(1);
+            }else{
+                showIOMenuButton.select(2);
+            }
         }
 
         if (isShowCheckListPerspective == null || (!isOverrideShowCheckListPerspective && !isAdminPreference)){
             showChecklistPerspectiveButton.select(0);
-        }else if (isShowCheckListPerspective){
-            showChecklistPerspectiveButton.select(1);
+            if (isAdminPreference){
+                allowOverrideShowChecklistButton.setEnabled(false);
+            }
         }else{
-            showChecklistPerspectiveButton.select(2);
+            if (isAdminPreference){
+                allowOverrideShowChecklistButton.setEnabled(true);
+            }
+            if (isShowCheckListPerspective){
+                showChecklistPerspectiveButton.select(1);
+            }else{
+                showChecklistPerspectiveButton.select(2);
+            }
         }
 
         if (isShowTaxonNodeWizard == null || (!isOverrideShowTaxonNodeWizard && !isAdminPreference)){
             showTaxonNodeWizardButton.select(0);
-        }else if (isShowTaxonNodeWizard){
-            showTaxonNodeWizardButton.select(1);
+            if (isAdminPreference){
+                allowOverrideShowTaxonNodeWizardButton.setEnabled(false);
+            }
         }else{
-            showTaxonNodeWizardButton.select(2);
+            if (isAdminPreference){
+                allowOverrideShowTaxonNodeWizardButton.setEnabled(true);
+            }
+            if (isShowTaxonNodeWizard){
+                showTaxonNodeWizardButton.select(1);
+            }else{
+                showTaxonNodeWizardButton.select(2);
+            }
         }
 
         if (isAdminPreference){

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
index 784e729cd385e5866867da2e6ddb9413e86be002..b238346c97b6813a7c90baf8922c9a50abafe7be 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
@@ -458,6 +458,7 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage implements S
         activateCheckButton.select(index);
         if (isAdminPreference){
             allowLocalPreference.setSelection(isAllowOverride);
+            allowLocalPreference.setEnabled(isSimpleDetailsViewActivated != null);
         }
         showTaxon.setSelection(isShowTaxon);
         showLsid.setSelection(isShowLSID);
@@ -545,6 +546,7 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage implements S
               showSecDetail.setEnabled(isShowTaxon);
               secEnabled.setEnabled(isShowTaxon);
             }
+            setButtonSelections();
             setApply(true);
         }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishFlagLocalPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishFlagLocalPreference.java
index 4028e6f5dda9e1d6f762f20335f3539cdf66f36e..9af62517230eae08bc6fbb9a2bd788f4cce86081 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishFlagLocalPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishFlagLocalPreference.java
@@ -92,10 +92,16 @@ public class PublishFlagLocalPreference extends CdmPreferencePage {
             public void widgetSelected(SelectionEvent e) {
                 setApply(true);
                 if (!publishFlagBehaviour.getText().startsWith(Messages.Preference_Use_Default)){
-
                     publishBehaviour = (PublishEnum)publishFlagBehaviour.getData(publishFlagBehaviour.getText());
-                }
+                }else{
+                    publishBehaviour = null;
+                    allowOverride = true;
 
+                }
+                if (isAdminPreference){
+                    allowOverrideButton.setEnabled(publishBehaviour != null);
+                    allowOverrideButton.setSelection(allowOverride);
+                }
             }
 
             @Override
@@ -108,6 +114,7 @@ public class PublishFlagLocalPreference extends CdmPreferencePage {
             allowOverrideButton = createAllowOverrideButton(composite);
             allowOverrideButton.setText(Messages.GeneralPreference_override);
             allowOverrideButton.setSelection(allowOverride);
+            allowOverrideButton.setEnabled(publishBehaviour != null);
             allowOverrideButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -189,6 +196,7 @@ public class PublishFlagLocalPreference extends CdmPreferencePage {
             index++;
         }
         allowOverrideButton.setSelection(allowOverride);
+        allowOverrideButton.setEnabled(pref != null);
         super.performDefaults();
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchDialogPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchDialogPreferences.java
index 9278b0d853d7db36230332372f62882cac13a8ff..6fc86491176b561b76cdcc3c9c19eef607ff4e1b 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchDialogPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchDialogPreferences.java
@@ -108,9 +108,13 @@ public class SearchDialogPreferences extends CdmPreferencePage implements Select
                 if (isAdminPreference){
                     showIdInSelectionDialogPref.setAllowOverride(true);
                     allowOverrideIsShowIdInSelectionDialogButton.setSelection(true);
+                    allowOverrideIsShowIdInSelectionDialogButton.setEnabled(false);
                 }
                 return;
             }
+            if (isAdminPreference){
+                allowOverrideIsShowIdInSelectionDialogButton.setEnabled(true);
+            }
             if (text.equals(Messages.GeneralPreference_yes)){
                 showIdInSelectionDialog = true;
             }else{
@@ -125,9 +129,13 @@ public class SearchDialogPreferences extends CdmPreferencePage implements Select
                 if (isAdminPreference){
                     searchForIdentifierAsDefaultPref.setAllowOverride(true);
                     allowOverrideSearchForIdentifierAsDefaultButton.setSelection(true);
+                    allowOverrideSearchForIdentifierAsDefaultButton.setEnabled(false);
                 }
                 return;
             }
+            if (isAdminPreference){
+                allowOverrideSearchForIdentifierAsDefaultButton.setEnabled(true);
+            }
             if (text.equals(Messages.GeneralPreference_yes)){
                 searchForIdentifierAsDefault = true;
             }else{
@@ -142,9 +150,13 @@ public class SearchDialogPreferences extends CdmPreferencePage implements Select
                 if (isAdminPreference){
                     searchForIdentifierAndTitleCachePref.setAllowOverride(true);
                     allowOverridesSearchForIdentifierAndTitleCacheButton.setSelection(true);
+                    allowOverridesSearchForIdentifierAndTitleCacheButton.setEnabled(false);
                 }
                 return;
             }
+            if (isAdminPreference){
+                allowOverridesSearchForIdentifierAndTitleCacheButton.setEnabled(true);
+            }
             if (text.equals(Messages.GeneralPreference_yes)){
                 searchForIdentifierAndTitleCache = true;
             }else{
@@ -159,9 +171,13 @@ public class SearchDialogPreferences extends CdmPreferencePage implements Select
                 if (isAdminPreference){
                     sortTaxaByRankAndNamePref.setAllowOverride(true);
                     allowOverrideIsSortTaxaByRankAndNameButton.setSelection(true);
+                    allowOverrideIsSortTaxaByRankAndNameButton.setEnabled(false);
                 }
                 return;
             }
+            if (isAdminPreference){
+                allowOverrideIsSortTaxaByRankAndNameButton.setEnabled(true);
+            }
             if (text.equals(Messages.GeneralPreference_yes)){
                 sortTaxaByRankAndName = true;
             }else{
@@ -176,9 +192,13 @@ public class SearchDialogPreferences extends CdmPreferencePage implements Select
                 if (isAdminPreference){
                     filterCommonNameReferencesPref.setAllowOverride(true);
                     allowOverrideFilterCommonNameReferencesButton.setSelection(true);
+                    allowOverrideFilterCommonNameReferencesButton.setEnabled(false);
                 }
                 return;
             }
+            if (isAdminPreference){
+                allowOverrideFilterCommonNameReferencesButton.setEnabled(true);
+            }
             if (text.equals(Messages.GeneralPreference_yes)){
                 filterCommonNameReferences = true;
             }else{
@@ -216,6 +236,7 @@ public class SearchDialogPreferences extends CdmPreferencePage implements Select
         if (isAdminPreference){
             allowOverrideIsShowIdInSelectionDialogButton = createAllowOverrideButton(titleComp);
             allowOverrideIsShowIdInSelectionDialogButton.setSelection(showIdInSelectionDialogPref != null? showIdInSelectionDialogPref.isAllowOverride(): true);
+            allowOverrideIsShowIdInSelectionDialogButton.setEnabled(showIdInSelectionDialog != null);
             allowOverrideIsShowIdInSelectionDialogButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -242,6 +263,7 @@ public class SearchDialogPreferences extends CdmPreferencePage implements Select
         if (isAdminPreference){
             allowOverrideSearchForIdentifierAsDefaultButton = createAllowOverrideButton(composite);
             allowOverrideSearchForIdentifierAsDefaultButton.setSelection(searchForIdentifierAsDefaultPref != null?searchForIdentifierAsDefaultPref.isAllowOverride(): true);
+            allowOverrideSearchForIdentifierAsDefaultButton.setEnabled(searchForIdentifierAsDefault != null);
             allowOverrideSearchForIdentifierAsDefaultButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -267,6 +289,7 @@ public class SearchDialogPreferences extends CdmPreferencePage implements Select
         if (isAdminPreference){
             allowOverridesSearchForIdentifierAndTitleCacheButton = createAllowOverrideButton(composite);
             allowOverridesSearchForIdentifierAndTitleCacheButton.setSelection(searchForIdentifierAndTitleCachePref != null?searchForIdentifierAndTitleCachePref.isAllowOverride():true);
+            allowOverridesSearchForIdentifierAndTitleCacheButton.setEnabled(searchForIdentifierAndTitleCache != null);
             allowOverridesSearchForIdentifierAndTitleCacheButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -291,6 +314,7 @@ public class SearchDialogPreferences extends CdmPreferencePage implements Select
         if (isAdminPreference){
             allowOverrideIsSortTaxaByRankAndNameButton = createAllowOverrideButton(composite);
             allowOverrideIsSortTaxaByRankAndNameButton.setSelection(sortTaxaByRankAndNamePref != null? sortTaxaByRankAndNamePref.isAllowOverride(): true);
+            allowOverrideIsSortTaxaByRankAndNameButton.setEnabled(sortTaxaByRankAndName != null);
             allowOverrideIsSortTaxaByRankAndNameButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -314,6 +338,7 @@ public class SearchDialogPreferences extends CdmPreferencePage implements Select
         if (isAdminPreference){
             allowOverrideFilterCommonNameReferencesButton = createAllowOverrideButton(composite);
             allowOverrideFilterCommonNameReferencesButton.setSelection(filterCommonNameReferencesPref != null? filterCommonNameReferencesPref.isAllowOverride():true);
+            allowOverrideFilterCommonNameReferencesButton.setEnabled(filterCommonNameReferences != null);
             allowOverrideFilterCommonNameReferencesButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -337,30 +362,35 @@ public class SearchDialogPreferences extends CdmPreferencePage implements Select
         showIdInSelectionDialog = null;
         if (isAdminPreference){
             allowOverrideIsShowIdInSelectionDialogButton.setSelection(true);
+            allowOverrideIsShowIdInSelectionDialogButton.setEnabled(false);
             showIdInSelectionDialogPref.setAllowOverride(true);
         }
         searchForIdentifierAsDefaultButton.select(0);
         searchForIdentifierAsDefault = null;
         if (isAdminPreference){
             allowOverrideSearchForIdentifierAsDefaultButton.setSelection(true);
+            allowOverrideSearchForIdentifierAsDefaultButton.setEnabled(false);
             searchForIdentifierAsDefaultPref.setAllowOverride(true);
         }
         searchForIdentifierAndTitleCacheButton.select(0);
         searchForIdentifierAndTitleCache = null;
         if (isAdminPreference){
             allowOverridesSearchForIdentifierAndTitleCacheButton.setSelection(true);
+            allowOverridesSearchForIdentifierAndTitleCacheButton.setEnabled(false);
             searchForIdentifierAndTitleCachePref.setAllowOverride(true);
         }
         sortTaxaByRankAndNameButton.select(0);
         sortTaxaByRankAndName = null;
         if (isAdminPreference){
             allowOverrideIsSortTaxaByRankAndNameButton.setSelection(true);
+            allowOverrideIsSortTaxaByRankAndNameButton.setEnabled(false);
             sortTaxaByRankAndNamePref.setAllowOverride(true);
         }
         filterCommonNameReferenceButton.select(0);
         filterCommonNameReferences = null;
         if (isAdminPreference){
             allowOverrideFilterCommonNameReferencesButton.setSelection(true);
+            allowOverrideFilterCommonNameReferencesButton.setEnabled(false);
             filterCommonNameReferencesPref.setAllowOverride(true);
         }
         setApply(true);

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 10112fd8e884f42c14ec53edb5c7964569d1890a..aa45b80906bd0a78dffb904fc16b94725616a6d6 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
@@ -95,9 +95,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
 
             if (showSpecimenPref != null){
                 if (!showSpecimenPref.isAllowOverride() ){
-
                     isEditingAllowed = false;
-
                 }
             }
         }
@@ -140,6 +138,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
         if (isAdminPreference){
             allowOverrideIsShowSpecimenRelatedIssuesButton = createAllowOverrideButton(titleComp);
             allowOverrideIsShowSpecimenRelatedIssuesButton.setSelection(allowOverrideShowSpecimenRelatedIssues);
+            allowOverrideIsShowSpecimenRelatedIssuesButton.setEnabled(isShowSpecimenRelatedIssues != null);
             allowOverrideIsShowSpecimenRelatedIssuesButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -178,6 +177,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
         if (isAdminPreference){
             allowOverrideShowCollectingAreaButton = createAllowOverrideButton(composite);
             allowOverrideShowCollectingAreaButton.setSelection(allowOverrideShowCollectingAreaInGeneralSection);
+            allowOverrideShowCollectingAreaButton.setEnabled(isShowCollectingAreaInGeneralSection != null);
             allowOverrideShowCollectingAreaButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -220,6 +220,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
         if (isAdminPreference){
             allowOverridesDeterminationOnlyForFieldUnitsButton = createAllowOverrideButton(composite);
             allowOverridesDeterminationOnlyForFieldUnitsButton.setSelection(allowOverrideDeterminationOnlyForFieldUnits);
+            allowOverridesDeterminationOnlyForFieldUnitsButton.setEnabled(showDeterminationOnlyForFieldUnits != null);
             allowOverridesDeterminationOnlyForFieldUnitsButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -257,6 +258,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
         if (isAdminPreference){
             allowOverrideIsShowTaxonAssociationButton = createAllowOverrideButton(composite);
             allowOverrideIsShowTaxonAssociationButton.setSelection(allowOverrideShowTaxonAssociation);
+            allowOverrideIsShowTaxonAssociationButton.setEnabled(showTaxonAssociation != null);
             allowOverrideIsShowTaxonAssociationButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -293,6 +295,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
         if (isAdminPreference){
             allowOverrideShowLifeFormButton = createAllowOverrideButton(composite);
             allowOverrideShowLifeFormButton.setSelection(allowOverrideShowLifeForm);
+            allowOverrideShowLifeFormButton.setEnabled(showLifeForm != null);
             allowOverrideShowLifeFormButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -571,9 +574,13 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
                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{
@@ -586,11 +593,14 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
            if(text.startsWith(Messages.Preference_Use_Default)){
                isShowCollectingAreaInGeneralSection = null;
                if (isAdminPreference){
-                   //showCollectingAreaInGeneralSection.setAllowOverride(true);
                    allowOverrideShowCollectingAreaButton.setSelection(true);
+                   allowOverrideShowCollectingAreaButton.setEnabled(false);
                }
                return;
            }
+           if (isAdminPreference){
+               allowOverrideShowCollectingAreaButton.setEnabled(true);
+           }
            if (text.equals(Messages.GeneralPreference_yes)){
                isShowCollectingAreaInGeneralSection = true;
            }else{
@@ -603,11 +613,14 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
            if(text.startsWith(Messages.Preference_Use_Default)){
                isDeterminationOnlyForFieldUnits = null;
                if (isAdminPreference){
-                   //showDeterminationOnlyForFieldUnits.setAllowOverride(true);
                    allowOverridesDeterminationOnlyForFieldUnitsButton.setSelection(true);
+                   allowOverridesDeterminationOnlyForFieldUnitsButton.setEnabled(false);
                }
                return;
            }
+           if (isAdminPreference){
+               allowOverridesDeterminationOnlyForFieldUnitsButton.setEnabled(true);
+           }
            if (text.equals(Messages.GeneralPreference_yes)){
                isDeterminationOnlyForFieldUnits = true;
            }else{
@@ -622,8 +635,11 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
                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;
@@ -637,11 +653,14 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
            if(text.startsWith(Messages.Preference_Use_Default)){
                isShowLifeForm = null;
                if (isAdminPreference){
-                   //showLifeForm.setAllowOverride(true);
                    allowOverrideShowLifeFormButton.setSelection(true);
+                   allowOverrideShowLifeFormButton.setEnabled(false);
                }
                return;
            }
+           if (isAdminPreference){
+               allowOverrideShowLifeFormButton.setEnabled(true);
+           }
            if (text.equals(Messages.GeneralPreference_yes)){
                isShowLifeForm = true;
            }else{

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SupplementalDataSourcePreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SupplementalDataSourcePreferences.java
index 85e997625cc59bfafb203f1ac5e679fbbef54c86..2a0330fa0319d97cdd948258e59b9dd361bb4cb2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SupplementalDataSourcePreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SupplementalDataSourcePreferences.java
@@ -75,6 +75,7 @@ public class SupplementalDataSourcePreferences extends CdmPreferencePage impleme
         if (isAdminPreference){
             allowOverrideIDSourceButton = createAllowOverrideButton(composite);
             allowOverrideIDSourceButton.setSelection(isAllowOverrideShowIDSource);
+            allowOverrideIDSourceButton.setEnabled(isShowIDSource != null);
             allowOverrideIDSourceButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -100,6 +101,7 @@ public class SupplementalDataSourcePreferences extends CdmPreferencePage impleme
             allowOverrideShowIDNamespaceButton = createAllowOverrideButton(composite);
 
             allowOverrideShowIDNamespaceButton.setSelection(isAllowOverrideShowIDNamespace);
+            allowOverrideShowIDNamespaceButton.setEnabled(isShowIDNamespace != null);
             allowOverrideShowIDNamespaceButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -165,30 +167,36 @@ public class SupplementalDataSourcePreferences extends CdmPreferencePage impleme
         if (e.getSource().equals(this.showIDNamespaceButton)) {
             String text = showIDNamespaceButton.getText();
            // text = text.replace(Messages.Preference_Use_Default, "");
-            if (text.equals(Messages.Preference_Use_Default)){
+            if (text.startsWith(Messages.Preference_Use_Default)){
+                isShowIDNamespace = null;
                 isOverrideShowIDNamespace = false;
             }else{
                 isOverrideShowIDNamespace = true;
-            }
-            if (text.equals(SHOW)){
-                isShowIDNamespace = true;
+                if (text.equals(SHOW)){
+                    isShowIDNamespace = true;
 
-            }else{
-                isShowIDNamespace = false;
+                }else{
+                    isShowIDNamespace = false;
+                }
             }
+
+            allowOverrideShowIDNamespaceButton.setEnabled(isShowIDNamespace != null);
         }
         if (e.getSource().equals(this.showIDSourceButton)) {
             String text = showIDSourceButton.getText();
-            if (text.equals(Messages.Preference_Use_Default)){
+            if (text.startsWith(Messages.Preference_Use_Default)){
+                isShowIDSource = null;
                 isOverrideShowIDSource = false;
             }else{
                 isOverrideShowIDSource = true;
+                if (text.equals(SHOW)){
+                    isShowIDSource = true;
+                }else{
+                    isShowIDSource = false;
+                }
             }
-            if (text.equals(SHOW)){
-                isShowIDSource = true;
-            }else{
-                isShowIDSource = false;
-            }
+
+            allowOverrideIDSourceButton.setEnabled(isShowIDSource != null);
         }
 
         this.setApply(true);
@@ -208,6 +216,8 @@ public class SupplementalDataSourcePreferences extends CdmPreferencePage impleme
         if (isAdminPreference){
             allowOverrideIDSourceButton.setSelection(true);
             allowOverrideShowIDNamespaceButton.setSelection(true);
+            allowOverrideIDSourceButton.setEnabled(false);
+            allowOverrideShowIDNamespaceButton.setEnabled(false);
         }
 
         showIDSourceButton.select(0);