Revision c2a446b0
Added by Katja Luther over 4 years ago
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java | ||
---|---|---|
166 | 166 |
// if (dbPref != null && !isAdminPage){ |
167 | 167 |
// defaultValue = Boolean.valueOf(dbPref.getValue()); |
168 | 168 |
// }else{ |
169 |
// defaultValue = (Boolean)predicate.getDefaultValue(); |
|
169 |
boolean defaultValue = (Boolean)predicate.getDefaultValue(); |
|
170 |
String defaultString; |
|
171 |
if (defaultValue){ |
|
172 |
defaultString = " ("+textTrue+")"; |
|
173 |
}else{ |
|
174 |
defaultString = " ("+textFalse+")"; |
|
175 |
} |
|
170 | 176 |
// } |
171 | 177 |
// if (defaultValue){ |
172 |
booleanCombo.add(Messages.Preference_Use_Default); |
|
178 |
booleanCombo.add(Messages.Preference_Use_Default + defaultString);
|
|
173 | 179 |
booleanCombo.add(textTrue); |
174 | 180 |
booleanCombo.add(textFalse); |
175 | 181 |
// }else{ |
... | ... | |
190 | 196 |
|
191 | 197 |
Combo booleanCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY); |
192 | 198 |
|
193 |
// CdmPreference dbPref = PreferencesUtil.getPreferenceFromDB(predicate); |
|
194 |
// String defaultValue = null; |
|
195 |
// if (dbPref != null && !isAdminPage){ |
|
196 |
// defaultValue = dbPref.getValue() != null? dbPref.getValue().toString():null ; |
|
197 |
// }else{ |
|
198 |
// Object defaultObject = predicate.getDefaultValue(); |
|
199 |
// if (defaultObject != null){ |
|
200 |
// if (defaultObject instanceof IKeyLabel){ |
|
201 |
// defaultValue = ((IKeyLabel)defaultObject).getKey(); |
|
202 |
// }else{ |
|
203 |
// defaultValue = predicate.getDefaultValue().toString(); |
|
204 |
// } |
|
205 |
// } |
|
206 |
// |
|
207 |
// } |
|
208 |
booleanCombo.add(Messages.Preference_Use_Default);; |
|
199 |
|
|
200 |
String defaultValue = null; |
|
201 |
|
|
202 |
Object defaultObject = predicate.getDefaultValue(); |
|
203 |
if (defaultObject != null){ |
|
204 |
if (defaultObject instanceof IKeyLabel){ |
|
205 |
defaultValue = ((IKeyLabel)defaultObject).getKey(); |
|
206 |
}else{ |
|
207 |
defaultValue = predicate.getDefaultValue().toString(); |
|
208 |
} |
|
209 |
} |
|
210 |
|
|
211 |
booleanCombo.add(Messages.Preference_Use_Default + " ("+defaultValue+")");; |
|
209 | 212 |
for (IKeyLabel value: enumValues){ |
210 | 213 |
booleanCombo.add(value.getLabel()); |
211 | 214 |
} |
Also available in: Unified diff
ref #8385: fixes in preferences - getDefaults() for all pages