Project

General

Profile

« Previous | Next » 

Revision e1dfd329

Added by Katja Luther over 4 years ago

ref #8389: disable allowOverride when 'use default' is selected

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
135 135
            if (isAdminPreference) {
136 136
                allowOverrideActivatedButton = createAllowOverrideButton(activateComp);
137 137
                allowOverrideActivatedButton.setSelection(this.distributionEditorPref != null? this.distributionEditorPref.isAllowOverride(): true);
138
                allowOverrideActivatedButton.setEnabled(this.distributionEditorPref != null);
138 139
                allowOverrideActivatedButton.addSelectionListener(new SelectionAdapter() {
139 140
                    @Override
140 141
                    public void widgetSelected(SelectionEvent e) {
......
181 182
            if (isAdminPreference) {
182 183
                allowOverrideRankButton = createAllowOverrideButton(child);
183 184
                allowOverrideRankButton.setSelection(prefRank != null? prefRank.isAllowOverride():true);
185
                allowOverrideRankButton.setEnabled(prefRank != null);
184 186
                allowOverrideRankButton.addSelectionListener(new SelectionAdapter() {
185 187
                    @Override
186 188
                    public void widgetSelected(SelectionEvent e) {
......
214 216
            if (isAdminPreference) {
215 217
                allowOverrideOrderAreasButton = createAllowOverrideButton(child);
216 218
                allowOverrideOrderAreasButton.setSelection(prefAreaSort != null? prefAreaSort.isAllowOverride(): true);
219
                allowOverrideOrderAreasButton.setEnabled(prefAreaSort != null);
217 220
                allowOverrideOrderAreasButton.addSelectionListener(new SelectionAdapter() {
218 221
                    @Override
219 222
                    public void widgetSelected(SelectionEvent e) {
......
249 252
            if (isAdminPreference) {
250 253
                allowOverrideAreaDisplayButton = createAllowOverrideButton(child);
251 254
                allowOverrideAreaDisplayButton.setSelection(prefAreaDisplay != null? prefAreaDisplay.isAllowOverride(): true);
255
                allowOverrideAreaDisplayButton.setEnabled(prefAreaDisplay != null);
252 256
                allowOverrideAreaDisplayButton.addSelectionListener(new SelectionAdapter() {
253 257
                    @Override
254 258
                    public void widgetSelected(SelectionEvent e) {
......
283 287
            if (isAdminPreference) {
284 288
                allowOverrideStatusDisplayButton = createAllowOverrideButton(child);
285 289
                allowOverrideStatusDisplayButton.setSelection(prefStatusDisplay != null ? prefStatusDisplay.isAllowOverride(): true);
290
                allowOverrideStatusDisplayButton.setEnabled(prefStatusDisplay != null);
286 291
                allowOverrideStatusDisplayButton.addSelectionListener(new SelectionAdapter() {
287 292
                    @Override
288 293
                    public void widgetSelected(SelectionEvent e) {
......
317 322
            if (isAdminPreference) {
318 323
                allowOverrideStatusDisplayInComboButton = createAllowOverrideButton(child);
319 324
                allowOverrideStatusDisplayInComboButton.setSelection(prefStatusDisplayInCombo != null ? prefStatusDisplayInCombo.isAllowOverride(): true);
325
                allowOverrideStatusDisplayInComboButton.setEnabled(prefStatusDisplayInCombo != null);
320 326
                allowOverrideStatusDisplayInComboButton.addSelectionListener(new SelectionAdapter() {
321 327
                    @Override
322 328
                    public void widgetSelected(SelectionEvent e) {
......
334 340

  
335 341
            if (!isAdminPreference) {
336 342

  
337
                //PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);
343

  
338 344
                if (distributionEditorPref != null && !distributionEditorPref.isAllowOverride()){
339 345
                    activateComp.setEnabled(false);
340 346
                }
......
345 351
                }
346 352
                if (prefAreaSort != null && !prefAreaSort.isAllowOverride()) {
347 353
                    areaOrderSelectionCombo.setEnabled(false);
348
                    //allowOverrideOrderAreasButton.setEnabled(false);
349 354
                }
350 355
                if (prefAreaDisplay != null && !prefAreaDisplay.isAllowOverride()) {
351 356
                    areaDisplaySelectionCombo.setEnabled(false);
......
387 392
                    PreferencesUtil.prefOverrideKey(PreferencePredicate.AreasSortedInDistributionEditor.getKey()),
388 393
                    override);
389 394

  
390

  
391

  
392

  
393

  
394 395
            override = false;
395 396
            if (isShowRank != null ) {
396 397
                override = true;
......
430 431
                    PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), override);
431 432

  
432 433

  
433

  
434

  
435
//            PreferencesUtil.setOwnDescriptionForChecklistEditor(ownDescriptionForDistributionEditor);
436
//            PreferencesUtil.setBooleanValue(
437
//                    PreferencesUtil.prefOverrideKey(PreferencePredicate.OwnDescriptionForDistributionEditor.getKey()),
438
//                    true);
439

  
440 434
            PreferencesUtil.firePreferencesChanged(this.getClass());
441 435

  
442 436
        return true;
......
455 449
                if(isAdminPreference){
456 450
                    prefStatusDisplay.setAllowOverride(true);
457 451
                    allowOverrideStatusDisplayButton.setSelection(true);
452
                    allowOverrideStatusDisplayButton.setEnabled(false);
458 453
                }
459 454

  
460 455
                return;
461 456
            }
457
            allowOverrideStatusDisplayButton.setEnabled(true);
462 458
            for (TermDisplayEnum display : TermDisplayEnum.values()) {
463 459
                if (text.startsWith(display.getLabel())) {
464 460
                    displayStatus = display;
......
474 470
                if(isAdminPreference){
475 471
                    prefStatusDisplayInCombo.setAllowOverride(true);
476 472
                    allowOverrideStatusDisplayInComboButton.setSelection(true);
473
                    allowOverrideStatusDisplayInComboButton.setEnabled(false);
477 474
                }
478 475

  
479 476
                return;
480 477
            }
478
            allowOverrideStatusDisplayInComboButton.setEnabled(true);
481 479
            for (TermComboEnum display : TermComboEnum.values()) {
482 480
                if (text.startsWith(display.getLabel())) {
483 481
                    displayStatusCombo = display;
......
493 491
                if (isAdminPreference){
494 492
                    prefAreaDisplay.setAllowOverride(true);
495 493
                    allowOverrideAreaDisplayButton.setSelection(true);
494
                    allowOverrideAreaDisplayButton.setEnabled(false);
496 495
                }
497 496
                return;
498 497
            }
498
            allowOverrideAreaDisplayButton.setEnabled(true);
499 499
            for (TermDisplayEnum display : TermDisplayEnum.values()) {
500 500
                if (text.startsWith(display.getLabel())) {
501 501
                    displayArea = display;
......
510 510
                if (isAdminPreference){
511 511
                    prefAreaSort.setAllowOverride(true);
512 512
                    allowOverrideOrderAreasButton.setSelection(true);
513
                    allowOverrideOrderAreasButton.setEnabled(false);
513 514
                }
514 515
                return;
515 516
            }
517
            allowOverrideOrderAreasButton.setEnabled(true);
516 518
            for (TermOrder display : TermOrder.values()) {
517 519
                if (text.startsWith(display.getLabel())) {
518 520
                    orderAreas = display;
......
527 529
                if (isAdminPreference){
528 530
                    prefRank.setAllowOverride(true);
529 531
                    allowOverrideRankButton.setSelection(true);
532
                    allowOverrideRankButton.setEnabled(false);
530 533
                }
531 534
                return;
532 535
            }
536
            allowOverrideRankButton.setEnabled(true);
533 537
            if (text.equals(SHOW_RANK)){
534 538
                isShowRank = true;
535 539
            }else{
......
547 551
                    }
548 552
                    distributionEditorPref.setAllowOverride(true);
549 553
                    allowOverrideActivatedButton.setSelection(true);
554
                    allowOverrideActivatedButton.setEnabled(false);
550 555
                }
551 556
                return;
552 557
            }
558
            allowOverrideActivatedButton.setEnabled(true);
553 559
            if (text.equals(ENABLE)){
554 560
                isEditorActivated = true;
555 561
            }else{

Also available in: Unified diff