Revision 4e6f2196
Added by Katja Luther over 5 years ago
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/AbcdImportPreference.java | ||
---|---|---|
323 | 323 |
if (configurator != null){ |
324 | 324 |
String configString = configurator.toString(); |
325 | 325 |
|
326 |
CdmPreference pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.AbcdImportConfig, configString);
|
|
326 |
CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AbcdImportConfig, configString);
|
|
327 | 327 |
pref.setAllowOverride(allowOverride); |
328 | 328 |
|
329 | 329 |
ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration(); |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/AbcdImportProvider.java | ||
---|---|---|
64 | 64 |
if (biocaseProviderList != null){ |
65 | 65 |
providerList = biocaseProviderList.createAllProviderString(); |
66 | 66 |
|
67 |
CdmPreference pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.BioCaseProvider, providerList);
|
|
67 |
CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.BioCaseProvider, providerList);
|
|
68 | 68 |
pref.setAllowOverride(true); |
69 | 69 |
|
70 | 70 |
ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration(); |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NomenclaturalCodePreferences.java | ||
---|---|---|
54 | 54 |
@Override |
55 | 55 |
protected Control createContents(Composite parent) { |
56 | 56 |
// PreferencesUtil.setPreferredNomenclaturalCode(null, false); |
57 |
|
|
57 |
ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration(); |
|
58 |
if (controller != null){ |
|
59 |
IPreferenceService service = controller.getPreferenceService(); |
|
60 |
PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.NomenclaturalCode); |
|
61 |
CdmPreference pref = service.find(key); |
|
62 |
if (pref != null){ |
|
63 |
actualCode = pref.getValue(); |
|
64 |
|
|
65 |
}else{ |
|
66 |
actualCode = PreferencesUtil.getPreferenceKey(PreferencesUtil.getPreferredNomenclaturalCode()); |
|
67 |
} |
|
68 |
} |
|
58 | 69 |
Composite composite = new Composite(parent, SWT.NULL); |
59 | 70 |
composite.setLayout(new GridLayout()); |
60 | 71 |
final CLabel description = new CLabel(composite, SWT.NULL); |
... | ... | |
123 | 134 |
if(!CdmStore.isActive()){ |
124 | 135 |
return; |
125 | 136 |
} |
126 |
ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration(); |
|
127 |
if (controller != null){ |
|
128 |
IPreferenceService service = controller.getPreferenceService(); |
|
129 |
PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.NomenclaturalCode); |
|
130 |
CdmPreference pref = service.find(key); |
|
131 |
if (pref != null){ |
|
132 |
actualCode = pref.getValue(); |
|
133 |
|
|
134 |
}else{ |
|
135 |
actualCode = PreferencesUtil.getPreferenceKey(PreferencesUtil.getPreferredNomenclaturalCode()); |
|
136 |
} |
|
137 |
} |
|
137 |
|
|
138 | 138 |
|
139 | 139 |
|
140 | 140 |
} |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/PublishFlagPreference.java | ||
---|---|---|
46 | 46 |
@Override |
47 | 47 |
public void init() { |
48 | 48 |
super.init(); |
49 |
pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DefaultBehaviourForPublishFlag); |
|
50 |
if (pref != null){ |
|
51 |
if (pref.getValue().equals(IPreferenceKeys.DO_NOT_PUBLISH)){ |
|
52 |
setNotPublish = true; |
|
53 |
setPublish = false; |
|
54 |
inheritFromParent = false; |
|
55 |
} |
|
56 |
|
|
57 |
if (pref.getValue().equals(IPreferenceKeys.INHERIT_FROM_PARENT)){ |
|
58 |
setNotPublish = false; |
|
59 |
setPublish = false; |
|
60 |
inheritFromParent = true; |
|
61 |
} |
|
62 |
|
|
63 |
if (pref.getValue().equals(IPreferenceKeys.PUBLISH)){ |
|
64 |
setNotPublish = false; |
|
65 |
setPublish = true; |
|
66 |
inheritFromParent = false; |
|
67 |
} |
|
68 |
}else{ |
|
69 |
setNotPublish = false; |
|
70 |
setPublish = true; |
|
71 |
inheritFromParent = false; |
|
72 |
} |
|
49 |
|
|
73 | 50 |
|
74 | 51 |
} |
75 | 52 |
/** |
... | ... | |
77 | 54 |
*/ |
78 | 55 |
@Override |
79 | 56 |
protected Control createContents(Composite parent) { |
57 |
pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DefaultBehaviourForPublishFlag); |
|
58 |
if (pref == null){ |
|
59 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DefaultBehaviourForPublishFlag, IPreferenceKeys.PUBLISH); |
|
60 |
} |
|
61 |
|
|
62 |
if (pref.getValue().equals(IPreferenceKeys.DO_NOT_PUBLISH)){ |
|
63 |
setNotPublish = true; |
|
64 |
setPublish = false; |
|
65 |
inheritFromParent = false; |
|
66 |
} |
|
67 |
|
|
68 |
if (pref.getValue().equals(IPreferenceKeys.INHERIT_FROM_PARENT)){ |
|
69 |
setNotPublish = false; |
|
70 |
setPublish = false; |
|
71 |
inheritFromParent = true; |
|
72 |
} |
|
73 |
|
|
74 |
if (pref.getValue().equals(IPreferenceKeys.PUBLISH)){ |
|
75 |
setNotPublish = false; |
|
76 |
setPublish = true; |
|
77 |
inheritFromParent = false; |
|
78 |
} |
|
80 | 79 |
final Composite composite = new Composite(parent, SWT.NULL); |
81 | 80 |
|
82 | 81 |
GridLayout gridLayout = new GridLayout(); |
... | ... | |
143 | 142 |
} |
144 | 143 |
IPreferenceService service = controller.getPreferenceService(); |
145 | 144 |
service.set(pref); |
145 |
PreferencesUtil.updateDBPreferences(); |
|
146 | 146 |
|
147 | 147 |
return true; |
148 | 148 |
} |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SpecimenAdminPreferences.java | ||
---|---|---|
169 | 169 |
if (isShowSpecimenPref != null){ |
170 | 170 |
this.isShowSpecimenRelatedIssues = Boolean.valueOf(isShowSpecimenPref.getValue()); |
171 | 171 |
}else{ |
172 |
isShowSpecimenPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowSpecimen, Boolean.toString(true)); |
|
172 | 173 |
this.isShowSpecimenRelatedIssues = true; |
173 | 174 |
} |
174 | 175 |
|
... | ... | |
205 | 206 |
|
206 | 207 |
@Override |
207 | 208 |
public boolean performOk() { |
209 |
if (isShowSpecimenPref == null){ |
|
210 |
return true; |
|
211 |
} |
|
208 | 212 |
ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration(); |
209 | 213 |
if (controller != null){ |
210 | 214 |
IPreferenceService service = controller.getPreferenceService(); |
Also available in: Unified diff
fix save of db preferences not available in db before