Project

General

Profile

« Previous | Next » 

Revision cec27740

Added by Katja Luther about 5 years ago

ref #7849: fix problems with preferences

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
52 52

  
53 53
    @Override
54 54
    protected Control createContents(Composite parent) {
55

  
55
        getValues();
56 56
        if (isAllowOverride || isAdminPreference ){
57 57

  
58 58
            final CLabel description = new CLabel(parent, SWT.NULL);
59 59
            description.setText(Messages.NameDetailsViewConfiguration_description);
60 60

  
61 61
            Composite title  = createComposite(parent);
62
            nameDetailsConfig = PreferencesUtil.getPreferredNameDetailsConfiguration(!isAdminPreference);
62
//            nameDetailsConfig = PreferencesUtil.getPreferredNameDetailsConfiguration(!isAdminPreference);
63 63
            if (nameDetailsConfig == null){
64 64
                nameDetailsConfig = new NameDetailsConfigurator(false);
65 65
            }
......
130 130
                  }
131 131
             });
132 132

  
133
            showSecDetail = new Button(dbSettings, SWT.CHECK);
134
            showSecDetail.setText(Messages.NameDetailsViewComposite_Show_SecDetail);
135 133

  
136
            isSecDetailsActivated = nameDetailsConfig.isSecDetailsActivated();
137
            showSecDetail.setSelection(isSecDetailsActivated);
138
            showSecDetail.addSelectionListener(new SelectionAdapter(){
139
                 @Override
140
                 public void widgetSelected(SelectionEvent e) {
141
                     setApply(true);
142
                     isSecDetailsActivated = showSecDetail.getSelection();
143
                     nameDetailsConfig.setSecDetailsActivated(isSecDetailsActivated);
144
                  }
145
             });
146 134

  
147 135
            secEnabled = new Button(dbSettings, SWT.CHECK);
148 136
            secEnabled.setText(Messages.NameDetailsViewComposite_SecEnabled);
......
157 145
                     nameDetailsConfig.setSecEnabled(isSecEnabled);
158 146
                  }
159 147
             });
148
            showSecDetail = new Button(dbSettings, SWT.CHECK);
149
            showSecDetail.setText(Messages.NameDetailsViewComposite_Show_SecDetail);
160 150

  
151
            isSecDetailsActivated = nameDetailsConfig.isSecDetailsActivated();
152
            showSecDetail.setSelection(isSecDetailsActivated);
153
            showSecDetail.addSelectionListener(new SelectionAdapter(){
154
                 @Override
155
                 public void widgetSelected(SelectionEvent e) {
156
                     setApply(true);
157
                     isSecDetailsActivated = showSecDetail.getSelection();
158
                     nameDetailsConfig.setSecDetailsActivated(isSecDetailsActivated);
159
                  }
160
             });
161 161

  
162 162
            final Button showLsid = new Button(dbSettings, SWT.CHECK);
163 163
            showLsid.setText(Messages.NameDetailsViewComposite_Show_LSID);
......
372 372
    public boolean performOk() {
373 373
        if (nameDetailsConfig != null){
374 374
            PreferencesUtil.setStringValue(PreferencePredicate.NameDetailsView.getKey(), nameDetailsConfig.toString());
375
            PreferencesUtil.setBooleanValue(IPreferenceKeys.OVERRIDE_NAME_DETAILS, isOverride);
375
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.NameDetailsView.getKey()), isOverride);
376 376
        }
377 377

  
378 378
        return true;
......
380 380
    }
381 381

  
382 382
    @Override
383
    public void init(){
383
    public void getValues(){
384 384
        CdmPreference nameDetailsPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.NameDetailsView);
385 385
        isAdminPreference = false;
386 386
        isAllowOverride = true;
387 387
        if (nameDetailsPref != null){
388 388
            isAllowOverride = nameDetailsPref.isAllowOverride();
389

  
389 390
        }
390
        isOverride = PreferencesUtil.getBooleanValue(IPreferenceKeys.OVERRIDE_NAME_DETAILS);
391
        isOverride = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.NameDetailsView.getKey()));
392
        nameDetailsConfig = PreferencesUtil.getPreferredNameDetailsConfiguration(true);
391 393
    }
392 394

  
393 395
}

Also available in: Unified diff