Project

General

Profile

« Previous | Next » 

Revision fa9caef2

Added by Katja Luther over 5 years ago

use NewTaxEditorInstance for CdmPreferences in TaxEditor and fix representation handling in namerelationType combobox

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
51 51
        ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
52 52
        if (controller != null){
53 53
            IPreferenceService service = controller.getPreferenceService();
54
            PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.ShowImportExportMenu);
54
            PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowImportExportMenu);
55 55
            CdmPreference isShowSpecimenPref = service.find(key);
56 56
            if (isShowSpecimenPref != null){
57 57
                this.isShowIOMenu = Boolean.valueOf(isShowSpecimenPref.getValue());
58 58
            }
59 59

  
60
            key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.ShowMediaView);
60
            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowMediaView);
61 61
            CdmPreference isShowMediaViewPref = service.find(key);
62 62
            if (isShowMediaViewPref != null){
63 63
                this.isShowMediaView = Boolean.valueOf(isShowMediaViewPref.getValue());
64 64
            }
65 65

  
66
            key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.ShowChecklistPerspective);
66
            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowChecklistPerspective);
67 67
            CdmPreference isShowChecklistPref = service.find(key);
68 68
            if (isShowChecklistPref != null){
69 69
                this.isShowCheckListPerspective = Boolean.valueOf(isShowChecklistPref.getValue());
70 70
            }
71 71

  
72
            key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.ShowTaxonNodeWizard);
72
            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowTaxonNodeWizard);
73 73
            CdmPreference isShowTaxonNodeWizardPref = service.find(key);
74 74
            if (isShowTaxonNodeWizardPref != null){
75 75
                this.isShowTaxonNodeWizard = Boolean.valueOf(isShowTaxonNodeWizardPref.getValue());
......
141 141
       if (controller != null){
142 142
           IPreferenceService service = controller.getPreferenceService();
143 143

  
144
           CdmPreference pref = CdmPreference.NewDatabaseInstance(PreferencePredicate.ShowImportExportMenu, Boolean.toString(this.isShowIOMenu));
144
           CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowImportExportMenu, Boolean.toString(this.isShowIOMenu));
145 145
           pref.setAllowOverride(false);
146 146
           service.set(pref);
147
           pref = CdmPreference.NewDatabaseInstance(PreferencePredicate.ShowMediaView, Boolean.toString(this.isShowMediaView));
147
           pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowMediaView, Boolean.toString(this.isShowMediaView));
148 148
           pref.setAllowOverride(false);
149 149
           service.set(pref);
150
           pref = CdmPreference.NewDatabaseInstance(PreferencePredicate.ShowChecklistPerspective, Boolean.toString(this.isShowCheckListPerspective));
150
           pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowChecklistPerspective, Boolean.toString(this.isShowCheckListPerspective));
151 151
           pref.setAllowOverride(false);
152 152
           service.set(pref);
153
           pref = CdmPreference.NewDatabaseInstance(PreferencePredicate.ShowTaxonNodeWizard, Boolean.toString(this.isShowTaxonNodeWizard));
153
           pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowTaxonNodeWizard, Boolean.toString(this.isShowTaxonNodeWizard));
154 154
           pref.setAllowOverride(false);
155 155
           service.set(pref);
156 156
           PreferencesUtil.updateDBPreferences();

Also available in: Unified diff