Revision a0aeb474
Added by Katja Luther over 4 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DistributionStatusPreferencePage.java | ||
|---|---|---|
| 66 | 66 |
private Composite composite; |
| 67 | 67 |
|
| 68 | 68 |
private Map<UUID, NamedArea> namedAreaUUIDMap = new HashMap(); |
| 69 |
CdmPreferenceCache cache; |
|
| 69 | 70 |
|
| 70 | 71 |
|
| 71 | 72 |
/** |
| ... | ... | |
| 323 | 324 |
|
| 324 | 325 |
dialog.open(); |
| 325 | 326 |
thisButton.setData(CdmPreferenceCache.instance().findBestMatching(pref.getKey())); |
| 327 |
refresh(); |
|
| 326 | 328 |
|
| 327 | 329 |
|
| 328 | 330 |
} |
| ... | ... | |
| 340 | 342 |
public void getValues() {
|
| 341 | 343 |
isAdminPreference = false; |
| 342 | 344 |
type = TermType.NamedArea; |
| 343 |
CdmPreferenceCache cache = CdmPreferenceCache.instance();
|
|
| 345 |
cache = CdmPreferenceCache.instance(); |
|
| 344 | 346 |
cache.getAllTaxEditorDBPreferences(); |
| 345 | 347 |
PrefKey defaultPref = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionStatus); |
| 346 | 348 |
this.pref = cache.get(defaultPref); |
| ... | ... | |
| 363 | 365 |
if (table != null){
|
| 364 | 366 |
table.removeAll(); |
| 365 | 367 |
disposeTableEditors(); |
| 368 |
cache.getAllTaxEditorDBPreferences(); |
|
| 369 |
prefStatus = cache.getAllForPredicate(PreferencePredicate.AvailableDistributionStatus.getKey()); |
|
| 366 | 370 |
for (CdmPreference pref:prefStatus){
|
| 367 | 371 |
if (pref != null){
|
| 368 | 372 |
createTableRow(pref); |
| ... | ... | |
| 398 | 402 |
for (CdmPreference pref: prefStatus){
|
| 399 | 403 |
try{
|
| 400 | 404 |
String lastPart = getUUIDFromSubject(pref); |
| 401 |
UUID uuid = UUID.fromString(lastPart); |
|
| 402 |
uuids.add(uuid); |
|
| 405 |
if (lastPart != null){
|
|
| 406 |
UUID uuid = UUID.fromString(lastPart); |
|
| 407 |
uuids.add(uuid); |
|
| 408 |
} |
|
| 409 |
|
|
| 403 | 410 |
}catch (IllegalArgumentException e){
|
| 404 | 411 |
// no uuid in subject |
| 405 | 412 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractAdminTermSelectionWizardPage.java | ||
|---|---|---|
| 48 | 48 |
|
| 49 | 49 |
/** |
| 50 | 50 |
* {@inheritDoc}
|
| 51 |
* @return |
|
| 51 | 52 |
*/ |
| 52 | 53 |
|
| 53 |
protected void createAllowOverrideButton(Composite parent) {
|
|
| 54 |
final Button activateCheckButton = new Button(parent, SWT.CHECK); |
|
| 54 |
@Override |
|
| 55 |
protected Button createAllowOverrideButton(Composite parent) {
|
|
| 56 |
Button activateCheckButton = new Button(parent, SWT.CHECK); |
|
| 55 | 57 |
if (localPref){
|
| 56 | 58 |
activateCheckButton.setText("Override");
|
| 57 |
activateCheckButton.setSelection(override); |
|
| 59 |
|
|
| 58 | 60 |
}else{
|
| 59 | 61 |
activateCheckButton.setText("Allow Override");
|
| 60 |
activateCheckButton.setSelection(pref.isAllowOverride()); |
|
| 61 |
} |
|
| 62 | 62 |
|
| 63 |
} |
|
| 63 | 64 |
|
| 65 |
activateCheckButton.setSelection(override); |
|
| 64 | 66 |
|
| 65 | 67 |
activateCheckButton.addSelectionListener(new SelectionAdapter(){
|
| 66 | 68 |
@Override |
| ... | ... | |
| 70 | 72 |
|
| 71 | 73 |
} |
| 72 | 74 |
}); |
| 75 |
return activateCheckButton; |
|
| 73 | 76 |
} |
| 74 | 77 |
|
| 75 | 78 |
// public boolean isLocalPrefExist() {
|
| ... | ... | |
| 80 | 83 |
// this.localPrefExist = localPrefExist; |
| 81 | 84 |
// } |
| 82 | 85 |
|
| 86 |
@Override |
|
| 83 | 87 |
public CdmPreference getPreference(){
|
| 84 | 88 |
return pref; |
| 85 | 89 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractTermSelectionWizardPage.java | ||
|---|---|---|
| 135 | 135 |
*/ |
| 136 | 136 |
protected abstract List<T> getTermsFromStringValues(List<String> listValue); |
| 137 | 137 |
|
| 138 |
protected void createAllowOverrideButton(Composite parent) {
|
|
| 139 |
final Button activateCheckButton = new Button(parent, SWT.CHECK);
|
|
| 138 |
protected Button createAllowOverrideButton(Composite parent) {
|
|
| 139 |
Button activateCheckButton = new Button(parent, SWT.CHECK); |
|
| 140 | 140 |
if (localPref){
|
| 141 | 141 |
activateCheckButton.setText("Override");
|
| 142 | 142 |
activateCheckButton.setSelection(override); |
| 143 | 143 |
}else{
|
| 144 | 144 |
activateCheckButton.setText("Allow Override");
|
| 145 |
activateCheckButton.setSelection(pref.isAllowOverride());
|
|
| 145 |
activateCheckButton.setSelection(override);
|
|
| 146 | 146 |
} |
| 147 | 147 |
|
| 148 | 148 |
|
| ... | ... | |
| 155 | 155 |
|
| 156 | 156 |
} |
| 157 | 157 |
}); |
| 158 |
return activateCheckButton; |
|
| 158 | 159 |
} |
| 159 | 160 |
|
| 160 | 161 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPerAreaStatusPage.java | ||
|---|---|---|
| 16 | 16 |
import org.eclipse.jface.util.IPropertyChangeListener; |
| 17 | 17 |
import org.eclipse.jface.util.PropertyChangeEvent; |
| 18 | 18 |
import org.eclipse.swt.SWT; |
| 19 |
import org.eclipse.swt.events.SelectionAdapter; |
|
| 19 | 20 |
import org.eclipse.swt.events.SelectionEvent; |
| 20 | 21 |
import org.eclipse.swt.events.SelectionListener; |
| 21 | 22 |
import org.eclipse.swt.layout.GridData; |
| ... | ... | |
| 93 | 94 |
|
| 94 | 95 |
super.createControl(parent); |
| 95 | 96 |
|
| 97 |
|
|
| 98 |
|
|
| 96 | 99 |
} |
| 100 |
@Override |
|
| 101 |
protected Button createAllowOverrideButton(Composite parent) {
|
|
| 102 |
Button activateCheckButton = new Button(parent, SWT.CHECK); |
|
| 103 |
if (localPref){
|
|
| 104 |
activateCheckButton.setText("Override");
|
|
| 105 |
activateCheckButton.setSelection(override); |
|
| 106 |
}else{
|
|
| 107 |
activateCheckButton.setText("Allow Override");
|
|
| 108 |
activateCheckButton.setSelection(override); |
|
| 109 |
} |
|
| 97 | 110 |
|
| 111 |
activateCheckButton.addSelectionListener(new SelectionAdapter(){
|
|
| 112 |
@Override |
|
| 113 |
public void widgetSelected(SelectionEvent e) {
|
|
| 114 |
actualPref.setAllowOverride(overrideButton.getSelection()); |
|
| 115 |
override = overrideButton.getSelection(); |
|
| 116 |
|
|
| 117 |
} |
|
| 118 |
}); |
|
| 119 |
return activateCheckButton; |
|
| 120 |
} |
|
| 98 | 121 |
|
| 99 | 122 |
protected void createAreaSelectionCombo(Composite parent) {
|
| 100 | 123 |
|
| ... | ... | |
| 144 | 167 |
actualPref = CdmPreference.NewInstance(key, null); |
| 145 | 168 |
perAreaPreferences.add(actualPref); |
| 146 | 169 |
} |
| 170 |
override = actualPref.isAllowOverride(); |
|
| 147 | 171 |
}else{
|
| 148 | 172 |
actualPref = null; |
| 149 | 173 |
} |
| ... | ... | |
| 213 | 237 |
PrefKey key = newAreaSpecificStatusPreference(); |
| 214 | 238 |
actualPref = PreferenceResolver.resolve(perAreaPreferences, key); |
| 215 | 239 |
areaText.setText(actualArea.getLabel()); |
| 240 |
override = actualPref.isAllowOverride(); |
|
| 216 | 241 |
}else{
|
| 217 | 242 |
actualPref = null; |
| 218 | 243 |
} |
| ... | ... | |
| 237 | 262 |
} |
| 238 | 263 |
} |
| 239 | 264 |
checkedValues = actualPref.getValue(); |
| 265 |
override = actualPref.isAllowOverride(); |
|
| 240 | 266 |
} |
| 241 | 267 |
|
| 242 | 268 |
return checkedValues; |
| ... | ... | |
| 277 | 303 |
perAreaPreferences.remove(actualPref); |
| 278 | 304 |
} |
| 279 | 305 |
perAreaPreferences.add(savePref); |
| 306 |
savePref.setAllowOverride(override); |
|
| 280 | 307 |
actualPref = savePref; |
| 281 | 308 |
|
| 282 | 309 |
} |
| ... | ... | |
| 299 | 326 |
|
| 300 | 327 |
|
| 301 | 328 |
public void setActualPreference(CdmPreference pref){
|
| 302 |
|
|
| 303 | 329 |
this.actualPref = pref; |
| 304 |
|
|
| 305 |
|
|
| 330 |
override = actualPref.isAllowOverride(); |
|
| 306 | 331 |
} |
| 307 | 332 |
|
| 308 | 333 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionStatusPage.java | ||
|---|---|---|
| 10 | 10 |
|
| 11 | 11 |
import java.util.List; |
| 12 | 12 |
|
| 13 |
import org.eclipse.swt.widgets.Button; |
|
| 13 | 14 |
import org.eclipse.swt.widgets.Composite; |
| 14 | 15 |
|
| 15 | 16 |
import eu.etaxonomy.cdm.model.metadata.CdmPreference; |
| ... | ... | |
| 28 | 29 |
*/ |
| 29 | 30 |
public class AvailableDistributionStatusPage extends TermSelectionWizardPage {
|
| 30 | 31 |
|
| 31 |
|
|
| 32 |
Button overrideButton; |
|
| 32 | 33 |
|
| 33 | 34 |
public AvailableDistributionStatusPage(String pageName, CdmPreference pref, boolean localPref) {
|
| 34 | 35 |
super(pageName, TermType.PresenceAbsenceTerm); |
| ... | ... | |
| 40 | 41 |
public void createControl(Composite parent) {
|
| 41 | 42 |
setTitle(Messages.AvailableDistributionStatusPage_PAGE_TITLE); |
| 42 | 43 |
setDescription(Messages.AvailableDistributionStatusPage_PAGE_DESCRIPTION); |
| 43 |
//if (!localPref){
|
|
| 44 |
override = PreferencesUtil.getBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.AvailableDistributionStatus.getKey())); |
|
| 45 |
createAllowOverrideButton(parent); |
|
| 46 |
//} |
|
| 44 |
if (localPref){
|
|
| 45 |
override = PreferencesUtil.getBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.AvailableDistributionStatus.getKey())); |
|
| 46 |
} |
|
| 47 |
overrideButton = createAllowOverrideButton(parent); |
|
| 48 |
|
|
| 47 | 49 |
super.createControl(parent); |
| 48 | 50 |
|
| 49 | 51 |
} |
Also available in: Unified diff
ref #8562: fix allow override handling in admin distribution status