Project

General

Profile

« Previous | Next » 

Revision f13fa7a2

Added by Katja Luther over 5 years ago

check if vocabulary preference page was opened

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VokabularyAdminPreferences.java
35 35
public class VokabularyAdminPreferences extends CdmPreferencePage implements IE4AdminPreferencePage {
36 36

  
37 37
    boolean allowOverride;
38
    CdmPreference pref = null;
38 39

  
39 40
    @Override
40 41
    protected Control createContents(Composite parent) {
......
42 43
        Composite composite = new Composite(parent, SWT.NULL);
43 44
        composite.setLayout(new GridLayout());
44 45

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

  
47 48
        if (pref != null){
48 49
            allowOverride = pref.isAllowOverride();
......
71 72

  
72 73
    @Override
73 74
    public boolean performOk() {
75
        if (pref == null){
76
            return true;
77
        }
74 78
        ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
75 79

  
76 80
        if(controller!=null){

Also available in: Unified diff