minor

[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..759ad6172031f53c75d8da65a86ac2296aa99282 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,22 +35,35 @@ public class GeneralAdminPreferencePage extends GeneralPreferencePage implements
     @Override
     public boolean performOk() {
 
-
+        if (!isApply()){
+            return true;
+        }
        if (controller != null){
            IPreferenceService service = controller.getPreferenceService();
-
-           CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowImportExportMenu, Boolean.toString(this.isShowIOMenu));
-           pref.setAllowOverride(isAllowOverrideShowIOMenu);
-           service.set(pref);
-//           pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowMediaView, Boolean.toString(this.isShowMediaView));
-//           pref.setAllowOverride(isAllowOverrideShowMediaView);
-//           service.set(pref);
-           pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowChecklistPerspective, Boolean.toString(this.isShowCheckListPerspective));
-           pref.setAllowOverride(isAllowOverrideShowCheckListPerspective);
-           service.set(pref);
-           pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowTaxonNodeWizard, Boolean.toString(this.isShowTaxonNodeWizard));
-           pref.setAllowOverride(isAllowOverrideShowTaxonNodeWizard);
-           service.set(pref);
+           CdmPreference pref;
+           if (isShowIOMenu == null){
+               service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowImportExportMenu));
+           }else{
+               pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowImportExportMenu, Boolean.toString(this.isShowIOMenu));
+               pref.setAllowOverride(isAllowOverrideShowIOMenu);
+               service.set(pref);
+           }
+
+           if(isShowCheckListPerspective == null){
+               service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowChecklistPerspective));
+           }else{
+               pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowChecklistPerspective, Boolean.toString(this.isShowCheckListPerspective));
+               pref.setAllowOverride(isAllowOverrideShowCheckListPerspective);
+               service.set(pref);
+           }
+
+           if(isShowTaxonNodeWizard == null){
+               service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowTaxonNodeWizard));
+           }else{
+               pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowTaxonNodeWizard, Boolean.toString(this.isShowTaxonNodeWizard));
+               pref.setAllowOverride(isAllowOverrideShowTaxonNodeWizard);
+               service.set(pref);
+           }
            PreferencesUtil.updateDBPreferences();
 
 
@@ -70,7 +83,7 @@ public class GeneralAdminPreferencePage extends GeneralPreferencePage implements
               isShowIOMenu = Boolean.valueOf(pref.getValue());
               isAllowOverrideShowIOMenu = pref.isAllowOverride();
           }else{
-              isShowIOMenu = Boolean.valueOf(PreferencePredicate.ShowImportExportMenu.getDefaultValue().toString());
+              isShowIOMenu = null;
               isAllowOverrideShowIOMenu = true;
           }
 
@@ -90,7 +103,7 @@ public class GeneralAdminPreferencePage extends GeneralPreferencePage implements
               isShowCheckListPerspective = Boolean.valueOf(pref.getValue());
               isAllowOverrideShowCheckListPerspective = pref.isAllowOverride();
           }else{
-              isShowCheckListPerspective = Boolean.valueOf(PreferencePredicate.ShowChecklistPerspective.getDefaultValue().toString());
+              isShowCheckListPerspective = null;
               isAllowOverrideShowCheckListPerspective = true;
           }
 
@@ -100,7 +113,7 @@ public class GeneralAdminPreferencePage extends GeneralPreferencePage implements
               isShowTaxonNodeWizard = Boolean.valueOf(pref.getValue());
               isAllowOverrideShowTaxonNodeWizard = pref.isAllowOverride();
           }else{
-              isShowTaxonNodeWizard = Boolean.valueOf(PreferencePredicate.ShowTaxonNodeWizard.getDefaultValue().toString());
+              isShowTaxonNodeWizard = null;
               isAllowOverrideShowTaxonNodeWizard = true;
           }
       }
@@ -109,13 +122,18 @@ public class GeneralAdminPreferencePage extends GeneralPreferencePage implements
 
     @Override
     protected void performDefaults() {
-        isShowIOMenu = Boolean.valueOf(PreferencePredicate.ShowImportExportMenu.getDefaultValue().toString());
-        showIOMenuButton.setSelection(isShowIOMenu);
-        isShowCheckListPerspective = Boolean.valueOf(PreferencePredicate.ShowChecklistPerspective.getDefaultValue().toString());
-        showChecklistPerspectiveButton.setSelection(isShowCheckListPerspective);
-        isShowTaxonNodeWizard = Boolean.valueOf(PreferencePredicate.ShowTaxonNodeWizard.getDefaultValue().toString());
-        showTaxonNodeWizardButton.setSelection(isShowTaxonNodeWizard);
+        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);