Project

General

Profile

« Previous | Next » 

Revision 660c3f90

Added by Patrick Plitzner almost 5 years ago

ref #8294 Swap showIdInSource and ShowIdNamespace

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SupplementalDataSourceAdminPreference.java
21 21
public class SupplementalDataSourceAdminPreference extends SupplementalDataSourcePreferences implements IE4AdminPreferencePage{
22 22

  
23 23
    private CdmPreference prefShowIdNamespace;
24
    private CdmPreference prefShowNamespace;
24
    private CdmPreference prefShowIdInSource;
25 25

  
26 26
    @Override
27 27
    public boolean performOk() {
......
29 29
            return true;
30 30
        }
31 31
        boolean setToDefault = false;
32
        if (isShowIDNamspace == null){
32
        if (isShowIDSource== null){
33 33
            setToDefault = true;
34
            isShowIDNamspace = true;
34
            isShowIDSource= true;
35 35
        }
36
        CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowIdInSource, Boolean.toString(this.isShowIDNamspace));
37
        pref.setAllowOverride(isAllowOverrideShowIDNamspace);
36
        CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowIdInSource, Boolean.toString(this.isShowIDSource));
37
        pref.setAllowOverride(isAllowOverrideShowIDSource);
38 38
        PreferencesUtil.setPreferencesToDB(pref, setToDefault);
39 39

  
40
        if (isShowIDSource == null){
40
        if (isShowIDNamespace== null){
41 41
            setToDefault = true;
42
            isShowIDSource = true;
42
            isShowIDNamespace = true;
43 43
        }
44
        pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowNamespaceInSource, Boolean.toString(this.isShowIDSource));
45
        pref.setAllowOverride(isAllowOverrideShowIDSource);
44
        pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowNamespaceInSource, Boolean.toString(this.isShowIDNamespace));
45
        pref.setAllowOverride(isAllowOverrideShowIDNamespace);
46 46
        PreferencesUtil.setPreferencesToDB(pref, setToDefault);
47 47

  
48 48
        PreferencesUtil.updateDBPreferences();
......
53 53
    protected void getValues(){
54 54
        isAdminPreference = true;
55 55

  
56
        prefShowIdNamespace = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.ShowIdInSource);
56
        prefShowIdNamespace = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.ShowNamespaceInSource);
57 57
        if (prefShowIdNamespace == null){
58
            prefShowIdNamespace = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowIdInSource, null);
58
            prefShowIdNamespace = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowNamespaceInSource, null);
59 59
            prefShowIdNamespace.setAllowOverride(true);
60 60
        }
61
        isShowIDNamspace = prefShowIdNamespace.getValue()!= null? Boolean.parseBoolean(prefShowIdNamespace.getValue()): null;
62
        isAllowOverrideShowIDNamspace = prefShowIdNamespace.isAllowOverride();
63

  
61
        isShowIDNamespace = prefShowIdNamespace.getValue()!= null? Boolean.parseBoolean(prefShowIdNamespace.getValue()): null;
62
        isAllowOverrideShowIDNamespace = prefShowIdNamespace.isAllowOverride();
64 63

  
65
        prefShowNamespace = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.ShowNamespaceInSource);
66
        if (prefShowNamespace == null){
67
            prefShowNamespace = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowNamespaceInSource, null);
68
            prefShowNamespace.setAllowOverride(true);
64
        prefShowIdInSource = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.ShowIdInSource);
65
        if (prefShowIdInSource == null){
66
            prefShowIdInSource = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowIdInSource, null);
67
            prefShowIdInSource.setAllowOverride(true);
69 68
        }
70
        isShowIDSource = prefShowNamespace.getValue()!= null? Boolean.parseBoolean(prefShowNamespace.getValue()): null;
71
        isAllowOverrideShowIDSource = prefShowNamespace.isAllowOverride();
69
        isShowIDSource = prefShowIdInSource.getValue()!= null? Boolean.parseBoolean(prefShowIdInSource.getValue()): null;
70
        isAllowOverrideShowIDSource = prefShowIdInSource.isAllowOverride();
72 71
    }
73 72
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SupplementalDataSourcePreferences.java
33 33
 */
34 34
public class SupplementalDataSourcePreferences extends CdmPreferencePage implements SelectionListener{
35 35

  
36
    protected Boolean isShowIDNamspace;
36
    protected Boolean isShowIDNamespace;
37 37
    protected Boolean isShowIDSource;
38 38

  
39
    protected boolean isAllowOverrideShowIDNamspace;
39
    protected boolean isAllowOverrideShowIDNamespace;
40 40
    protected boolean isAllowOverrideShowIDSource;
41 41

  
42
    protected boolean isOverrideShowIDNamspace;
42
    protected boolean isOverrideShowIDNamespace;
43 43
    protected boolean isOverrideShowIDSource;
44 44

  
45
    protected Combo showIDNamspaceButton;
46
    protected Button allowOverrideShowIDNamspaceButton;
45
    protected Combo showIDNamespaceButton;
46
    protected Button allowOverrideShowIDNamespaceButton;
47 47
    protected Combo showIDSourceButton;
48 48
    protected Button allowOverrideIDSourceButton;
49 49

  
......
61 61
        separator.setLayoutData(gridData);
62 62
        separator.setVisible(false);
63 63

  
64
        showIDNamspaceButton = createBooleanCombo(composite, SHOW, DO_NOT_SHOW, PreferencePredicate.ShowIdInSource, "Show ID in Namespace in Source",
65
                isAdminPreference);
66

  
67
        showIDNamspaceButton.addSelectionListener(this);
68

  
69
        if (isShowIDNamspace == null || (!isOverrideShowIDNamspace && !isAdminPreference)){
70
            showIDNamspaceButton.select(0);
71
        }else if (isShowIDNamspace){
72
            showIDNamspaceButton.select(1);
73
        }else{
74
            showIDNamspaceButton.select(2);
75
        }
76
        if (isAdminPreference){
77
            allowOverrideShowIDNamspaceButton = createAllowOverrideButton(composite);
78

  
79
            allowOverrideShowIDNamspaceButton.setSelection(isAllowOverrideShowIDNamspace);
80
            allowOverrideShowIDNamspaceButton.addSelectionListener(new SelectionAdapter(){
81
                @Override
82
                public void widgetSelected(SelectionEvent e) {
83
                    isAllowOverrideShowIDNamspace = allowOverrideShowIDNamspaceButton.getSelection();
84
                    setApply(true);
85
                }
86
            });
87
        }
88
        showIDSourceButton = createBooleanCombo(composite, SHOW, DO_NOT_SHOW, PreferencePredicate.ShowNamespaceInSource, "Show ID in Source",
64
        showIDSourceButton = createBooleanCombo(composite, SHOW, DO_NOT_SHOW, PreferencePredicate.ShowIdInSource, "Show ID in Source",
89 65
                isAdminPreference);
90 66
        showIDSourceButton.addSelectionListener(this);
91 67
        if (isShowIDSource == null || (!isOverrideShowIDSource && !isAdminPreference)){
......
107 83
                }
108 84
            });
109 85
        }
110
        if (!isAllowOverrideShowIDNamspace && !isAdminPreference){
111
            showIDNamspaceButton.setEnabled(false);
86

  
87
        showIDNamespaceButton = createBooleanCombo(composite, SHOW, DO_NOT_SHOW, PreferencePredicate.ShowNamespaceInSource, "Show ID Namespace in Source",
88
                isAdminPreference);
89

  
90
        showIDNamespaceButton.addSelectionListener(this);
91

  
92
        if (isShowIDNamespace == null || (!isOverrideShowIDNamespace && !isAdminPreference)){
93
            showIDNamespaceButton.select(0);
94
        }else if (isShowIDNamespace){
95
            showIDNamespaceButton.select(1);
96
        }else{
97
            showIDNamespaceButton.select(2);
98
        }
99
        if (isAdminPreference){
100
            allowOverrideShowIDNamespaceButton = createAllowOverrideButton(composite);
101

  
102
            allowOverrideShowIDNamespaceButton.setSelection(isAllowOverrideShowIDNamespace);
103
            allowOverrideShowIDNamespaceButton.addSelectionListener(new SelectionAdapter(){
104
                @Override
105
                public void widgetSelected(SelectionEvent e) {
106
                    isAllowOverrideShowIDNamespace = allowOverrideShowIDNamespaceButton.getSelection();
107
                    setApply(true);
108
                }
109
            });
110
        }
111

  
112
        if (!isAllowOverrideShowIDNamespace && !isAdminPreference){
113
            showIDNamespaceButton.setEnabled(false);
112 114
        }
113 115
        if (!isAllowOverrideShowIDSource && !isAdminPreference){
114 116
            showIDSourceButton.setEnabled(false);
......
118 120

  
119 121
    @Override
120 122
    public boolean performOk() {
121
        if (isAllowOverrideShowIDNamspace){
122
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowIdInSource.getKey()), isOverrideShowIDNamspace);
123
            PreferencesUtil.setBooleanValue(PreferencePredicate.ShowIdInSource.getKey(), isShowIDNamspace);
124
        }
125 123
        if (isAllowOverrideShowIDSource){
126
            PreferencesUtil.setBooleanValue(PreferencePredicate.ShowNamespaceInSource.getKey(), isShowIDSource);
127
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowNamespaceInSource.getKey()), isOverrideShowIDSource);
124
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowIdInSource.getKey()), isOverrideShowIDSource);
125
            PreferencesUtil.setBooleanValue(PreferencePredicate.ShowIdInSource.getKey(), isShowIDSource);
126
        }
127
        if (isAllowOverrideShowIDNamespace){
128
            PreferencesUtil.setBooleanValue(PreferencePredicate.ShowNamespaceInSource.getKey(), isShowIDNamespace);
129
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowNamespaceInSource.getKey()), isOverrideShowIDNamespace);
128 130
        }
129 131
       return true;
130 132
   }
......
133 135
        isAdminPreference = false;
134 136

  
135 137
        CdmPreferenceCache cache = CdmPreferenceCache.instance();
136
        isShowIDNamspace = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowIdInSource.getKey(), true);
137
        isOverrideShowIDNamspace = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowIdInSource.getKey()), true) != null?PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowIdInSource.getKey()), true): false;
138
        isShowIDSource = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowIdInSource.getKey(), true);
139
        isOverrideShowIDSource = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowIdInSource.getKey()), true) != null?PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowIdInSource.getKey()), true): false;
138 140
        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowIdInSource);
139 141
        CdmPreference pref = cache.findBestMatching(key);
140 142
        if (pref != null){
141
            isAllowOverrideShowIDNamspace = pref.isAllowOverride();
143
            isAllowOverrideShowIDSource = pref.isAllowOverride();
142 144
        }else{
143
            isAllowOverrideShowIDNamspace = true;
145
            isAllowOverrideShowIDSource = true;
144 146
        }
145 147

  
146
        isShowIDSource = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowNamespaceInSource.getKey(), true);
147
        isOverrideShowIDSource = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowNamespaceInSource.getKey()), true) != null? PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowNamespaceInSource.getKey()), true):false;
148
        isShowIDNamespace = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowNamespaceInSource.getKey(), true);
149
        isOverrideShowIDNamespace = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowNamespaceInSource.getKey()), true) != null? PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowNamespaceInSource.getKey()), true):false;
148 150
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowNamespaceInSource);
149 151
        pref = cache.findBestMatching(key);
150 152
        if (pref != null){
151
            isAllowOverrideShowIDSource = pref.isAllowOverride();
153
            isAllowOverrideShowIDNamespace= pref.isAllowOverride();
152 154
        }else{
153
            isAllowOverrideShowIDSource = true;
155
            isAllowOverrideShowIDNamespace = true;
154 156
        }
155 157
    }
156 158

  
157 159
    @Override
158 160
    public void widgetSelected(SelectionEvent e) {
159
        if (e.getSource().equals(this.showIDNamspaceButton)) {
160
            String text = showIDNamspaceButton.getText();
161
        if (e.getSource().equals(this.showIDNamespaceButton)) {
162
            String text = showIDNamespaceButton.getText();
161 163
           // text = text.replace(Messages.Preference_Use_Default, "");
162 164
            if (text.equals(Messages.Preference_Use_Default)){
163
                isOverrideShowIDNamspace = false;
165
                isOverrideShowIDNamespace = false;
164 166
            }else{
165
                isOverrideShowIDNamspace = true;
167
                isOverrideShowIDNamespace = true;
166 168
            }
167 169
            if (text.equals(SHOW)){
168
                isShowIDNamspace = true;
170
                isShowIDNamespace = true;
169 171

  
170 172
            }else{
171
                isShowIDNamspace = false;
173
                isShowIDNamespace = false;
172 174
            }
173 175
        }
174 176
        if (e.getSource().equals(this.showIDSourceButton)) {

Also available in: Unified diff