Revision 660c3f90
Added by Patrick Plitzner almost 5 years ago
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 |
} |
Also available in: Unified diff
ref #8294 Swap showIdInSource and ShowIdNamespace