Project

General

Profile

« Previous | Next » 

Revision c50a3625

Added by Katja Luther about 5 years ago

ref #7849: correct enabling/disabling of override buttons

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
320 320
                }
321 321
            }
322 322
            areaDisplaySelectionCombo.addSelectionListener(this);
323
            Button allowOverrideOrderAreaDisplayButton = createAllowOverrideButton(child);
323
            Button allowOverrideAreaDisplayButton = createAllowOverrideButton(child);
324 324
            if (isAdminPreference){
325
                allowOverrideOrderAreaDisplayButton.setSelection(allowOverrideAreaDisplay);
326
                allowOverrideOrderAreaDisplayButton.addSelectionListener(new SelectionAdapter(){
325
                allowOverrideAreaDisplayButton.setSelection(allowOverrideAreaDisplay);
326
                allowOverrideAreaDisplayButton.addSelectionListener(new SelectionAdapter(){
327 327
                    @Override
328 328
                    public void widgetSelected(SelectionEvent e) {
329 329
                        setApply(true);
330
                        allowOverrideAreaDisplay = allowOverrideOrderAreaDisplayButton.getSelection();
330
                        allowOverrideAreaDisplay = allowOverrideAreaDisplayButton.getSelection();
331 331
                    }
332 332
                });
333 333
            }else{
334
                allowOverrideOrderAreaDisplayButton.setSelection(overrideAreaDisplay);
335
                allowOverrideOrderAreaDisplayButton.addSelectionListener(new SelectionAdapter(){
334
                allowOverrideAreaDisplayButton.setSelection(overrideAreaDisplay);
335
                allowOverrideAreaDisplayButton.addSelectionListener(new SelectionAdapter(){
336 336
                    @Override
337 337
                    public void widgetSelected(SelectionEvent e) {
338 338
                        setApply(true);
339
                        overrideAreaDisplay = allowOverrideOrderAreaDisplayButton.getSelection();
339
                        overrideAreaDisplay = allowOverrideAreaDisplayButton.getSelection();
340 340
                    }
341 341
                });
342 342
                if (!allowOverrideAreaDisplay){
343 343
                    areaDisplaySelectionCombo.setEnabled(false);
344
                    allowOverrideOrderAreaDisplayButton.setEnabled(false);
344
                    allowOverrideAreaDisplayButton.setEnabled(false);
345 345
                }
346 346
            }
347 347

  
......
370 370
            }
371 371

  
372 372
            statusDisplaySelectionCombo.addSelectionListener(this);
373
            Button allowOverrideOrderStatusDisplayButton = createAllowOverrideButton(child);
373
            Button allowOverrideStatusDisplayButton = createAllowOverrideButton(child);
374 374
            if (isAdminPreference){
375
                allowOverrideOrderStatusDisplayButton.setSelection(allowOverrideStatusDisplay);
376
                allowOverrideOrderStatusDisplayButton.addSelectionListener(new SelectionAdapter(){
375
                allowOverrideStatusDisplayButton.setSelection(allowOverrideStatusDisplay);
376
                allowOverrideStatusDisplayButton.addSelectionListener(new SelectionAdapter(){
377 377
                    @Override
378 378
                    public void widgetSelected(SelectionEvent e) {
379 379
                        setApply(true);
380
                        allowOverrideStatusDisplay = allowOverrideOrderStatusDisplayButton.getSelection();
380
                        allowOverrideStatusDisplay = allowOverrideStatusDisplayButton.getSelection();
381 381
                    }
382 382
                });
383 383
            }else{
384
                allowOverrideOrderStatusDisplayButton.setSelection(overrideStatusDisplay);
385
                allowOverrideOrderStatusDisplayButton.addSelectionListener(new SelectionAdapter(){
384
                allowOverrideStatusDisplayButton.setSelection(overrideStatusDisplay);
385
                allowOverrideStatusDisplayButton.addSelectionListener(new SelectionAdapter(){
386 386
                    @Override
387 387
                    public void widgetSelected(SelectionEvent e) {
388 388
                        setApply(true);
389
                        overrideStatusDisplay = allowOverrideOrderStatusDisplayButton.getSelection();
389
                        overrideStatusDisplay = allowOverrideStatusDisplayButton.getSelection();
390 390
                    }
391 391
                });
392 392
                if (!allowOverrideStatusDisplay){
393 393
                    statusDisplaySelectionCombo.setEnabled(false);
394
                    allowOverrideOrderStatusDisplayButton.setEnabled(false);
394
                    allowOverrideStatusDisplayButton.setEnabled(false);
395 395
                }
396 396
            }
397 397

  
......
450 450
                    areaOrderSelectionCombo.setEnabled(false);
451 451
                    allowOverrideOrderAreasButton.setEnabled(false);
452 452
                }
453
                if (!allowOverrideAreaDisplay){
454

  
455
                    allowOverrideAreaDisplayButton.setEnabled(false);
456
                }
457
                if (!allowOverrideStatusDisplay){
458

  
459
                    allowOverrideStatusDisplayButton.setEnabled(false);
460
                }
453 461
             }
454 462
        }
455 463

  

Also available in: Unified diff