Merge branch 'release/5.8.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / databaseAdmin / preferencePage / GeneralAdminPreferencePage.java

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 292cca06eeffe223e186cab7cf838f5c105dd5db..c5b08b2e146b83733a66f4687bdd8876d37bf9fd 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
@@ -35,7 +35,9 @@ public class GeneralAdminPreferencePage extends GeneralPreferencePage implements
     @Override
     public boolean performOk() {
 
-
+        if (!isApply()){
+            return true;
+        }
        if (controller != null){
            IPreferenceService service = controller.getPreferenceService();
 
@@ -110,12 +112,27 @@ public class GeneralAdminPreferencePage extends GeneralPreferencePage implements
     @Override
     protected void performDefaults() {
         isShowIOMenu = Boolean.valueOf(PreferencePredicate.ShowImportExportMenu.getDefaultValue().toString());
-        showIOMenuButton.setSelection(isShowIOMenu);
+        if (isShowIOMenu){
+            showIOMenuButton.select(0);
+        }else{
+            showIOMenuButton.select(1);
+        }
         isShowCheckListPerspective = Boolean.valueOf(PreferencePredicate.ShowChecklistPerspective.getDefaultValue().toString());
-        showChecklistPerspectiveButton.setSelection(isShowCheckListPerspective);
+        if (isShowCheckListPerspective){
+            showChecklistPerspectiveButton.select(0);
+        }else{
+            showChecklistPerspectiveButton.select(1);
+        }
+
         isShowTaxonNodeWizard = Boolean.valueOf(PreferencePredicate.ShowTaxonNodeWizard.getDefaultValue().toString());
-        showTaxonNodeWizardButton.setSelection(isShowTaxonNodeWizard);
+        if (isShowTaxonNodeWizard){
+            showTaxonNodeWizardButton.select(0);
+        }else{
+            showTaxonNodeWizardButton.select(1);
+        }
+
         isAllowOverrideShowIOMenu = true;
+
         allowOverrideShowIOMenuButton.setSelection(isAllowOverrideShowIOMenu);
         isAllowOverrideShowCheckListPerspective = true;
         allowOverrideShowChecklistButton.setSelection(isAllowOverrideShowCheckListPerspective);