Project

General

Profile

« Previous | Next » 

Revision f15b2642

Added by Katja Luther over 5 years ago

do not save cdm preference which are not changed

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/AbcdImportPreference.java
46 46
    private Combo nomenclaturalCodeSelectionCombo;
47 47

  
48 48
    private boolean allowOverride = true;
49
    CdmPreference preference = null;
49 50

  
50 51
    /**
51 52
     * {@inheritDoc}
......
60 61
        ICdmRepository controller;
61 62
        controller = CdmStore.getCurrentApplicationConfiguration();
62 63
        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.AbcdImportConfig);
63
        CdmPreference preference = null;
64

  
64 65
        if (controller == null){
65 66
            return null;
66 67
        }
......
68 69

  
69 70
        if (preference != null ){
70 71
            allowOverride = preference.isAllowOverride();
72
        }else{
73
            preference = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AbcdImportConfig, configurator.toString());
71 74
        }
72 75

  
73 76
        if (preference != null){
......
312 315

  
313 316
    @Override
314 317
    public boolean performOk() {
318
        if (preference == null){
319
            return true;
320
        }
315 321
        if (configurator != null){
316 322
            String configString = configurator.toString();
317 323

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralPreference.java
46 46
    boolean isShowTitle;
47 47
    String displayString;
48 48
    Composite child ;
49
    CdmPreference pref = null;
49 50

  
50 51
    @Override
51 52
    protected Control createContents(Composite parent) {
52 53

  
53 54
        Composite composite = new Composite(parent, SWT.NULL);
54 55
        composite.setLayout(new GridLayout());
55
        CdmPreference pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DistributionEditorActivated);
56
        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DistributionEditorActivated);
56 57
        if (pref != null){
57 58
            isEditorActivated = Boolean.valueOf(pref.getValue());
58 59
            allowOverride = pref.isAllowOverride();
......
236 237

  
237 238
    @Override
238 239
    public boolean performOk() {
240
        if (pref == null){
241
            return true;
242
        }
239 243
        ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
240 244
        if (controller == null){
241 245
            return false;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/DistributionAdminPreferences.java
32 32
public class DistributionAdminPreferences extends CdmPreferencePage implements IE4AdminPreferencePage {
33 33

  
34 34
    boolean allowOverride;
35
    CdmPreference pref = null;
35 36

  
36 37
    @Override
37 38
    protected Control createContents(Composite parent) {
......
39 40
        composite.setLayout(new GridLayout());
40 41

  
41 42

  
42
        CdmPreference pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaVocabularies);
43
        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaVocabularies);
43 44
        if (pref != null){
44 45
            allowOverride = pref.isAllowOverride();
45 46
        }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
39 39
    boolean isShowMediaView = true;
40 40
    boolean isShowCheckListPerspective = false;
41 41
    boolean isShowTaxonNodeWizard = true;
42
    ICdmRepository controller = null;
42 43
    /**
43 44
     * {@inheritDoc}
44 45
     */
......
48 49

  
49 50
        GridLayout gridLayout = new GridLayout();
50 51
        composite.setLayout(gridLayout);
51
        ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
52
        controller = CdmStore.getCurrentApplicationConfiguration();
52 53
        if (controller != null){
53 54
            IPreferenceService service = controller.getPreferenceService();
54 55
            PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowImportExportMenu);
......
137 138

  
138 139
    @Override
139 140
    public boolean performOk() {
140
       ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
141
       //ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
141 142
       if (controller != null){
142 143
           IPreferenceService service = controller.getPreferenceService();
143 144

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewConfiguration.java
46 46
    boolean isShowNameRelationship;
47 47
    boolean isShowHybrid;
48 48
    boolean isShowNameApprobiation;
49

  
49
    NameDetailsConfigurator nameDetailsConfig = null;
50 50

  
51 51
    @Override
52 52
    protected Control createContents(Composite parent) {
53 53
        final CLabel description = new CLabel(parent, SWT.NULL);
54 54
        description.setText(Messages.NameDetailsViewConfiguration_description);
55
        NameDetailsConfigurator nameDetailsConfig = PreferencesUtil.getPreferredNameDetailsConfiguration(false);
55
        nameDetailsConfig = PreferencesUtil.getPreferredNameDetailsConfiguration(false);
56 56
        if (nameDetailsConfig == null){
57 57
            nameDetailsConfig = new NameDetailsConfigurator(false);
58 58
        }
......
328 328

  
329 329
    @Override
330 330
    public boolean performOk() {
331
        if (nameDetailsConfig == null){
332
            return true;
333
        }
331 334
        ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
332 335
        if (controller == null){
333 336
            return false;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NomenclaturalCodePreferences.java
45 45
 */
46 46
public class NomenclaturalCodePreferences extends CdmPreferencePage implements IE4AdminPreferencePage{
47 47

  
48
    String actualCode;
48
    String actualCode = null;
49 49
    Map<String, String>  labelAndValues;
50 50
    Map<String, Integer> keyAndIndex;
51 51
    Combo nomenclaturalCode;
......
140 140
	@Override
141 141
	 public boolean performOk() {
142 142

  
143
		boolean result = super.performOk();
144
		PreferencesUtil.setPreferredNomenclaturalCode(actualCode, false);
143
	    if (actualCode != null){
144
	        PreferencesUtil.setPreferredNomenclaturalCode(actualCode, false);
145
	    }
145 146

  
146
        return result;
147
        return true;
147 148
    }
148 149

  
149 150
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/PublishFlagPreference.java
41 41
   String do_not_publish = "DO NOT PUBLISH";
42 42
   String inherit_from_parent = "PARENT";
43 43
   String publish = "PUBLISH";
44
   CdmPreference pref = null;
44 45

  
45 46
   @Override
46 47
   public void init() {
47 48
       super.init();
48
       CdmPreference pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DefaultBehaviourForPublishFlag);
49
       pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DefaultBehaviourForPublishFlag);
49 50
       if (pref != null){
50 51
           if (pref.getValue().equals(IPreferenceKeys.DO_NOT_PUBLISH)){
51 52
               setNotPublish = true;
......
122 123

  
123 124
    @Override
124 125
    public boolean performOk() {
126
        if (pref == null){
127
            return true;
128
        }
125 129
        String preferenceValue = null;
126 130
        if (setPublish){
127 131
            preferenceValue = publish;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SpecimenAdminPreferences.java
46 46
    boolean isShowLifeForm;
47 47
    boolean isUseLocalPreference;
48 48
    Composite composite;
49
    CdmPreference isShowSpecimenPref = null;
49 50

  
50 51
    @Override
51 52
    protected Control createContents(Composite parent) {
......
164 165
        if (controller != null){
165 166
            IPreferenceService service = controller.getPreferenceService();
166 167
            PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowSpecimen);
167
            CdmPreference isShowSpecimenPref = service.find(key);
168
            isShowSpecimenPref = service.find(key);
168 169
            if (isShowSpecimenPref != null){
169 170
                this.isShowSpecimenRelatedIssues = Boolean.valueOf(isShowSpecimenPref.getValue());
170 171
            }else{
......
187 188
            CdmPreference isShowTaxonAssociationPref = service.find(key);
188 189
            if (isShowTaxonAssociationPref != null){
189 190
                this.isShowTaxonAssociation = Boolean.valueOf(isShowTaxonAssociationPref.getValue());
190
                isUseLocalPreference = isShowTaxonAssociationPref.isAllowOverride();
191
               // isUseLocalPreference = isShowTaxonAssociationPref.isAllowOverride();
191 192
            }
192 193

  
193 194
            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowLifeForm);
......
204 205

  
205 206
    @Override
206 207
     public boolean performOk() {
208
        if (isShowSpecimenPref == null){
209
            return true;
210
        }
207 211
        ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
208 212
        if (controller != null){
209 213
            IPreferenceService service = controller.getPreferenceService();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VokabularyAdminPreferences.java
32 32
public class VokabularyAdminPreferences extends CdmPreferencePage implements IE4AdminPreferencePage {
33 33

  
34 34
    boolean allowOverride;
35

  
35
    CdmPreference pref = null;
36 36

  
37 37

  
38 38
    @Override
......
41 41
        Composite composite = new Composite(parent, SWT.NULL);
42 42
        composite.setLayout(new GridLayout());
43 43

  
44
        CdmPreference pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.CommonNameAreaVocabularies);
44
        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.CommonNameAreaVocabularies);
45 45

  
46 46
        if (pref != null){
47 47
            allowOverride = pref.isAllowOverride();

Also available in: Unified diff