Revision 8fecfdbd
Added by Katja Luther over 4 years ago
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java | ||
---|---|---|
152 | 152 |
if (isShowCheckListPerspective != null){ |
153 | 153 |
PreferencesUtil.setBooleanValue(PreferencePredicate.ShowChecklistPerspective.getKey(), isShowCheckListPerspective); |
154 | 154 |
} |
155 |
PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowChecklistPerspective.getKey()), false);
|
|
155 |
PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowChecklistPerspective.getKey()), isOverrideShowCheckListPerspective);
|
|
156 | 156 |
|
157 | 157 |
|
158 | 158 |
} |
... | ... | |
178 | 178 |
isAdminPreference = false; |
179 | 179 |
|
180 | 180 |
CdmPreferenceCache cache = CdmPreferenceCache.instance(); |
181 |
isShowIOMenu = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowImportExportMenu.getKey(), true); |
|
182 |
|
|
183 | 181 |
isOverrideShowIOMenu = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowImportExportMenu.getKey()), true) != null? |
184 | 182 |
PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowImportExportMenu.getKey()), true): false; |
183 |
if (isOverrideShowIOMenu){ |
|
184 |
isShowIOMenu = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowImportExportMenu.getKey(), true); |
|
185 |
} |
|
186 |
|
|
187 |
|
|
185 | 188 |
PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowImportExportMenu); |
186 | 189 |
CdmPreference pref = cache.findBestMatching(key); |
187 | 190 |
if (pref != null){ |
... | ... | |
190 | 193 |
isAllowOverrideShowIOMenu = true; |
191 | 194 |
} |
192 | 195 |
|
193 |
isShowCheckListPerspective = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowChecklistPerspective.getKey(), true); |
|
194 |
|
|
195 | 196 |
isOverrideShowCheckListPerspective = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowChecklistPerspective.getKey()), true) != null? PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowChecklistPerspective.getKey()), true): false; |
197 |
if (isOverrideShowCheckListPerspective){ |
|
198 |
isShowCheckListPerspective = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowChecklistPerspective.getKey(), true); |
|
199 |
} |
|
200 |
|
|
201 |
|
|
196 | 202 |
key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowChecklistPerspective); |
197 | 203 |
pref = cache.findBestMatching(key); |
198 | 204 |
if (pref != null){ |
... | ... | |
201 | 207 |
isAllowOverrideShowCheckListPerspective = true; |
202 | 208 |
} |
203 | 209 |
|
204 |
isShowTaxonNodeWizard = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowTaxonNodeWizard.getKey(), true); |
|
205 | 210 |
isOverrideShowTaxonNodeWizard = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowTaxonNodeWizard.getKey()), true) != null? PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowTaxonNodeWizard.getKey()), true): false; |
211 |
if (isOverrideShowTaxonNodeWizard){ |
|
212 |
isShowTaxonNodeWizard = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowTaxonNodeWizard.getKey(), true); |
|
213 |
} |
|
214 |
|
|
206 | 215 |
key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowTaxonNodeWizard); |
207 | 216 |
pref = cache.findBestMatching(key); |
208 | 217 |
if (pref != null){ |
... | ... | |
298 | 307 |
showIOMenuButton.select(2); |
299 | 308 |
} |
300 | 309 |
|
301 |
if (isShowCheckListPerspective == null || (!isOverrideShowIOMenu && !isAdminPreference)){
|
|
310 |
if (isShowCheckListPerspective == null || (!isOverrideShowCheckListPerspective && !isAdminPreference)){
|
|
302 | 311 |
showChecklistPerspectiveButton.select(0); |
303 | 312 |
}else if (isShowCheckListPerspective){ |
304 | 313 |
showChecklistPerspectiveButton.select(1); |
... | ... | |
306 | 315 |
showChecklistPerspectiveButton.select(2); |
307 | 316 |
} |
308 | 317 |
|
309 |
if (isShowTaxonNodeWizard == null || (!isOverrideShowIOMenu && !isAdminPreference)){
|
|
318 |
if (isShowTaxonNodeWizard == null || (!isOverrideShowTaxonNodeWizard && !isAdminPreference)){
|
|
310 | 319 |
showTaxonNodeWizardButton.select(0); |
311 | 320 |
}else if (isShowTaxonNodeWizard){ |
312 | 321 |
showTaxonNodeWizardButton.select(1); |
Also available in: Unified diff
ref #8385: fix general prefs and publish flag prefs page