From c50a3625df62432e3e7984b5f24707aadcbd6faa Mon Sep 17 00:00:00 2001
From: Katja Luther <k.luther@bgbm.org>
Date: Thu, 7 Feb 2019 13:03:45 +0100
Subject: [PATCH] ref #7849: correct enabling/disabling of override buttons

---
 .../ChecklistEditorGeneralPreference.java     | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

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 ac0d6aeeb..6983f2036 100644
--- 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
@@ -320,28 +320,28 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                 }
             }
             areaDisplaySelectionCombo.addSelectionListener(this);
-            Button allowOverrideOrderAreaDisplayButton = createAllowOverrideButton(child);
+            Button allowOverrideAreaDisplayButton = createAllowOverrideButton(child);
             if (isAdminPreference){
-                allowOverrideOrderAreaDisplayButton.setSelection(allowOverrideAreaDisplay);
-                allowOverrideOrderAreaDisplayButton.addSelectionListener(new SelectionAdapter(){
+                allowOverrideAreaDisplayButton.setSelection(allowOverrideAreaDisplay);
+                allowOverrideAreaDisplayButton.addSelectionListener(new SelectionAdapter(){
                     @Override
                     public void widgetSelected(SelectionEvent e) {
                         setApply(true);
-                        allowOverrideAreaDisplay = allowOverrideOrderAreaDisplayButton.getSelection();
+                        allowOverrideAreaDisplay = allowOverrideAreaDisplayButton.getSelection();
                     }
                 });
             }else{
-                allowOverrideOrderAreaDisplayButton.setSelection(overrideAreaDisplay);
-                allowOverrideOrderAreaDisplayButton.addSelectionListener(new SelectionAdapter(){
+                allowOverrideAreaDisplayButton.setSelection(overrideAreaDisplay);
+                allowOverrideAreaDisplayButton.addSelectionListener(new SelectionAdapter(){
                     @Override
                     public void widgetSelected(SelectionEvent e) {
                         setApply(true);
-                        overrideAreaDisplay = allowOverrideOrderAreaDisplayButton.getSelection();
+                        overrideAreaDisplay = allowOverrideAreaDisplayButton.getSelection();
                     }
                 });
                 if (!allowOverrideAreaDisplay){
                     areaDisplaySelectionCombo.setEnabled(false);
-                    allowOverrideOrderAreaDisplayButton.setEnabled(false);
+                    allowOverrideAreaDisplayButton.setEnabled(false);
                 }
             }
 
@@ -370,28 +370,28 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
             }
 
             statusDisplaySelectionCombo.addSelectionListener(this);
-            Button allowOverrideOrderStatusDisplayButton = createAllowOverrideButton(child);
+            Button allowOverrideStatusDisplayButton = createAllowOverrideButton(child);
             if (isAdminPreference){
-                allowOverrideOrderStatusDisplayButton.setSelection(allowOverrideStatusDisplay);
-                allowOverrideOrderStatusDisplayButton.addSelectionListener(new SelectionAdapter(){
+                allowOverrideStatusDisplayButton.setSelection(allowOverrideStatusDisplay);
+                allowOverrideStatusDisplayButton.addSelectionListener(new SelectionAdapter(){
                     @Override
                     public void widgetSelected(SelectionEvent e) {
                         setApply(true);
-                        allowOverrideStatusDisplay = allowOverrideOrderStatusDisplayButton.getSelection();
+                        allowOverrideStatusDisplay = allowOverrideStatusDisplayButton.getSelection();
                     }
                 });
             }else{
-                allowOverrideOrderStatusDisplayButton.setSelection(overrideStatusDisplay);
-                allowOverrideOrderStatusDisplayButton.addSelectionListener(new SelectionAdapter(){
+                allowOverrideStatusDisplayButton.setSelection(overrideStatusDisplay);
+                allowOverrideStatusDisplayButton.addSelectionListener(new SelectionAdapter(){
                     @Override
                     public void widgetSelected(SelectionEvent e) {
                         setApply(true);
-                        overrideStatusDisplay = allowOverrideOrderStatusDisplayButton.getSelection();
+                        overrideStatusDisplay = allowOverrideStatusDisplayButton.getSelection();
                     }
                 });
                 if (!allowOverrideStatusDisplay){
                     statusDisplaySelectionCombo.setEnabled(false);
-                    allowOverrideOrderStatusDisplayButton.setEnabled(false);
+                    allowOverrideStatusDisplayButton.setEnabled(false);
                 }
             }
 
@@ -450,6 +450,14 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                     areaOrderSelectionCombo.setEnabled(false);
                     allowOverrideOrderAreasButton.setEnabled(false);
                 }
+                if (!allowOverrideAreaDisplay){
+
+                    allowOverrideAreaDisplayButton.setEnabled(false);
+                }
+                if (!allowOverrideStatusDisplay){
+
+                    allowOverrideStatusDisplayButton.setEnabled(false);
+                }
              }
         }
 
-- 
2.34.1