ref #7849: minor

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 1021b64f1439b44aefdc0c01853780a2b09dd666..19c1de67bc12ccf182b7cf8e014459ed2e1842c8 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
@@ -84,6 +84,8 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
 
     protected CdmPreference areaVocPref = null;
     protected CdmPreference statusPref = null;
+    private CommandHandlerButton button_openSelectAreas;
+    private CommandHandlerButton button_openStatusWizard;
 
     @Override
     protected Control createContents(Composite parent) {
@@ -413,7 +415,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
             labelStatus.setText(Messages.DistributionAdminPreferences_SELECT_STATUS);
             labelStatus.setLayoutData(textGrid);
 
-            final CommandHandlerButton button_openStatusWizard = new CommandHandlerButton(child, SWT.PUSH,
+            button_openStatusWizard = new CommandHandlerButton(child, SWT.PUSH,
                     commandHandlerStringStatus);
 
             button_openStatusWizard.setText(Messages.Distribution_status_selection);
@@ -433,7 +435,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
             label.setText(Messages.ChecklistEditorGeneralPreference_open_wizard);
             label.setLayoutData(textGrid);
 
-            final CommandHandlerButton button_openSelectAreas = new CommandHandlerButton(child, SWT.PUSH,
+            button_openSelectAreas = new CommandHandlerButton(child, SWT.PUSH,
                       commandHandlerString);
             button_openSelectAreas.setText(Messages.ChecklistEditorGeneralPreference_open_distribution_selection);
 
@@ -447,8 +449,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
 //            }
             if (!isAdminPreference){
                 PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);
-            }
-            if (!isAdminPreference){
+
                 if (!allowOverrideAreaVoc){
                     button_openSelectAreas.setButtonEnabled(false);
                  }
@@ -780,6 +781,32 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
 
         this.statusPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionStatus, null);
         this.areaVocPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionAreaVocabularies, null);
+        if (!isAdminPreference){
+            PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);
+
+            if (!allowOverrideAreaVoc){
+                button_openSelectAreas.setButtonEnabled(false);
+             }
+            if (!allowOverrideStatus){
+                button_openStatusWizard.setButtonEnabled(false);
+            }
+            if (!allowOverrideRank){
+                activateRankButton.setEnabled(false);
+                allowOverrideRankButton.setEnabled(false);
+            }
+            if (!allowOverrideOrderAreas){
+                areaOrderSelectionCombo.setEnabled(false);
+                allowOverrideOrderAreasButton.setEnabled(false);
+            }
+            if (!allowOverrideAreaDisplay){
+
+                allowOverrideAreaDisplayButton.setEnabled(false);
+            }
+            if (!allowOverrideStatusDisplay){
+
+                allowOverrideStatusDisplayButton.setEnabled(false);
+            }
+         }
         super.performDefaults();
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionStatusAdminWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionStatusAdminWizard.java
index fb4e5f45008a8db07d71fb1e2a744e82334fbc9a..f97d1b22741fba56667d29a88d697e3ecd407f6b 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionStatusAdminWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionStatusAdminWizard.java
@@ -87,6 +87,7 @@ public class AvailableDistributionStatusAdminWizard extends Wizard implements IC
     @Override
     public boolean performFinish() {
         Object[] checkedElements = aPage.getViewer().getCheckedElements();
+
         pref = aPage.getPreference();
 
         List<UUID> listUIIDChecked = new ArrayList<>();
@@ -105,11 +106,6 @@ public class AvailableDistributionStatusAdminWizard extends Wizard implements IC
         CdmPreference savePref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionStatus, saveCheckedElements);
         savePref.setAllowOverride(pref.isAllowOverride());
         PreferencesUtil.setPreferenceToDB(savePref);
-
-
-//      aPage.getVocabularies().get(0).getTerms()
-//      .forEach(dto -> terms.add(CdmStore.getService(ITermService.class).load(dto.getUuid())));
-
         PreferencesUtil.firePreferencesChanged(this.getClass());
         return true;
     }