ref #7849: fix correct saving in common name area selection

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VocabularyAdminPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VocabularyAdminPreferences.java
index f5bfe6420f6fa2f6e417e883abac5f6bdb95c6e9..43ca16068214567972142f0b0ed92114c283d064 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VocabularyAdminPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VocabularyAdminPreferences.java
@@ -10,10 +10,7 @@ package eu.etaxonomy.taxeditor.databaseAdmin.preferencePage;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
@@ -55,24 +52,24 @@ public class VocabularyAdminPreferences extends CdmPreferencePage implements IE4
                 "eu.etaxonomy.taxeditor.store.open.OpenCommonNameAreaWizardAdminHandler"); //$NON-NLS-1$
 
         button_opencommonNameAreaWizard.setText(Messages.GeneralPreference_open_common_name_area_selection);
-        final Button allowOverrideCommonNameAreaCheckButton = createAllowOverrideButton(composite);
-
-        if (pref != null){
-            allowOverride = pref.isAllowOverride();
-            allowOverrideCommonNameAreaCheckButton.setSelection(allowOverride);
-        }
-        else{
-            allowOverrideCommonNameAreaCheckButton.setSelection(true);
-        }
-
-        allowOverrideCommonNameAreaCheckButton.addSelectionListener(new SelectionAdapter(){
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                setApply(true);
-                allowOverride = allowOverrideCommonNameAreaCheckButton.getSelection();
-
-            }
-        });
+//        final Button allowOverrideCommonNameAreaCheckButton = createAllowOverrideButton(composite);
+//
+//        if (pref != null){
+//            allowOverride = pref.isAllowOverride();
+//            allowOverrideCommonNameAreaCheckButton.setSelection(allowOverride);
+//        }
+//        else{
+//            allowOverrideCommonNameAreaCheckButton.setSelection(true);
+//        }
+//
+//        allowOverrideCommonNameAreaCheckButton.addSelectionListener(new SelectionAdapter(){
+//            @Override
+//            public void widgetSelected(SelectionEvent e) {
+//                setApply(true);
+//                allowOverride = allowOverrideCommonNameAreaCheckButton.getSelection();
+//
+//            }
+//        });
 
         return composite;
     }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableVocabularyWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableVocabularyWizard.java
index 7c35de04cabb3b35bd4d924c30fcc1acbb164d27..c82d70ec19324a50678059726ccff232fb57657b 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableVocabularyWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableVocabularyWizard.java
@@ -18,6 +18,8 @@ import org.eclipse.jface.wizard.Wizard;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.model.metadata.CdmPreference;
+import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
+import eu.etaxonomy.cdm.model.metadata.PreferenceSubject;
 import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.l10n.Messages;
@@ -94,17 +96,14 @@ public class AvailableVocabularyWizard extends Wizard implements IConversationEn
         if (pref != null){
             predicate = pref.getPredicate();
         }
+
 //        if (!localPref){
-//            CdmPreference savePref = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.getByKey(predicate), saveCheckedElements);
-//            savePref.setAllowOverride(pref.isAllowOverride());
-//            PreferencesUtil.setPreferenceToDB(savePref);
-//
-//            PreferencesUtil.updateDBPreferences();
-//        }else{
-            PreferencesUtil.setPreferredVocabulariesForDistributionEditor(saveCheckedElements,localPref, pref.isAllowOverride());
+            CdmPreference savePref = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.getByKey(predicate), saveCheckedElements);
+            savePref.setAllowOverride(pref.isAllowOverride());
+            PreferencesUtil.setPreferenceToDB(savePref);
 
+            PreferencesUtil.updateDBPreferences();
 
-//        }
         return true;
     }