Project

General

Profile

« Previous | Next » 

Revision 63732a7c

Added by Katja Luther almost 5 years ago

ref #8045: further implementation for default/explicit value selection preference pages

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
38 38
 */
39 39
public class ChecklistEditorGeneralPreference extends CdmPreferencePage implements SelectionListener {
40 40

  
41
    protected boolean isEditorActivated;
41

  
42

  
43
    protected Boolean isEditorActivated;
42 44

  
43 45
    protected boolean overrideActivated;
44 46
    boolean isUseLocal;
45
    protected boolean isShowRank;
47
    protected Boolean isShowRank;
46 48
    protected String orderAreas;
47 49
    protected String displayStatus;
48 50
    protected String displayArea;
49
    protected boolean ownDescriptionForDistributionEditor;
51
    protected Boolean ownDescriptionForDistributionEditor;
50 52

  
51 53
    protected boolean overrideOwnDescriptionForDistributionEditor;
52 54
    protected boolean overrideAreaVoc;
......
95 97
        getValues();
96 98
        Composite composite = new Composite(parent, SWT.NULL);
97 99
        composite.setLayout(new GridLayout());
98
        if (!isAdminPreference && !distributionEditorPref.isAllowOverride()&& !isEditorActivated ) {
100
        if (!isAdminPreference && distributionEditorPref != null && !distributionEditorPref.isAllowOverride()&& !isEditorActivated ) {
99 101
            Label label = new Label(composite, SWT.NONE);
100 102
            label.setText(
101 103
                    "The CDM settings don't allow to set the preferences for using the distribution editor locally. If you need to make local settings, please ask an administrator.");
......
112 114
            separator.setLayoutData(sepGrid);
113 115

  
114 116
            activateCombo = createBooleanCombo(activateComp, ENABLE, DISABLE, PreferencePredicate.DistributionEditorActivated, Messages.ChecklistEditorGeneralPreference_enable, isAdminPreference);
115
            if (isEditorActivated) {
116
                activateCombo.select(0);
117
            } else {
118
                activateCombo.select(1);
117

  
118
            int index = 0;
119
            for (String itemLabel : activateCombo.getItems()) {
120
                if (isEditorActivated == null && itemLabel.equals(Messages.Preference_Use_Default)) {
121
                    activateCombo.select(index);
122
                    break;
123
                }
124
                if (isEditorActivated != null && itemLabel.equals(ENABLE) && isEditorActivated){
125
                    activateCombo.select(index);
126
                    break;
127
                }
128
                if (isEditorActivated != null && itemLabel.equals(DISABLE) && !isEditorActivated){
129
                    activateCombo.select(index);
130
                    break;
131
                }
132
                index++;
119 133
            }
120 134

  
135

  
121 136
            activateCombo.addSelectionListener(this);
122 137
            if (isAdminPreference) {
123 138
                allowOverrideActivatedButton = createAllowOverrideButton(activateComp);
124
                allowOverrideActivatedButton.setSelection(this.distributionEditorPref.isAllowOverride());
139
                allowOverrideActivatedButton.setSelection(this.distributionEditorPref != null? this.distributionEditorPref.isAllowOverride(): true);
125 140
                allowOverrideActivatedButton.addSelectionListener(new SelectionAdapter() {
126 141
                    @Override
127 142
                    public void widgetSelected(SelectionEvent e) {
128 143
                        setApply(true);
144
                        if (distributionEditorPref == null){
145
                            distributionEditorPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DistributionEditorActivated, PreferencePredicate.DistributionEditorActivated.getDefaultValue() != null ?  PreferencePredicate.DistributionEditorActivated.getDefaultValue().toString(): null);
146
                        }
129 147
                        distributionEditorPref.setAllowOverride(!distributionEditorPref.isAllowOverride());
130 148
                    }
131 149
                });
......
133 151
            child = createComposite(composite);
134 152

  
135 153
            if (!isAdminPreference) {
136
                child.setEnabled(isEditorActivated);
154
                if (isEditorActivated != null){
155
                    child.setEnabled(isEditorActivated);
156
                }else{
157
                    child.setEnabled(Boolean.parseBoolean(distributionEditorPref.getValue().toString()));
158
                }
137 159
            }
138 160
            separator = new Label(child, SWT.HORIZONTAL | SWT.SEPARATOR);
139 161
            sepGrid = createTextGridData();
......
141 163

  
142 164
            activateRankCombo = createBooleanCombo(child, SHOW_RANK, NO_RANK,
143 165
                    PreferencePredicate.ShowRankInDistributionEditor, Messages.ChecklistEditorGeneralPreference_show_rank, isAdminPreference);
144

  
145
            if (isShowRank) {
146
                activateRankCombo.select(0);
147
            } else {
148
                activateRankCombo.select(1);
166
            index = 0;
167
            for (String itemLabel : activateRankCombo.getItems()) {
168
                if (isShowRank == null && itemLabel.equals(Messages.Preference_Use_Default)) {
169
                    activateRankCombo.select(index);
170
                    break;
171
                }
172
                if (isShowRank != null && itemLabel.equals(SHOW_RANK) && isShowRank){
173
                    activateRankCombo.select(index);
174
                    break;
175
                }
176
                if (isShowRank != null && itemLabel.equals(NO_RANK) && !isShowRank){
177
                    activateRankCombo.select(index);
178
                    break;
179
                }
180
                index++;
149 181
            }
150 182
            activateRankCombo.addSelectionListener(this);
151 183
            if (isAdminPreference) {
152 184
                allowOverrideRankButton = createAllowOverrideButton(child);
153
                allowOverrideRankButton.setSelection(prefRank.isAllowOverride());
185
                allowOverrideRankButton.setSelection(prefRank != null? prefRank.isAllowOverride():true);
154 186
                allowOverrideRankButton.addSelectionListener(new SelectionAdapter() {
155 187
                    @Override
156 188
                    public void widgetSelected(SelectionEvent e) {
......
165 197

  
166 198
            areaOrderSelectionCombo = createCombo(child, TermOrder.values(), PreferencePredicate.AreasSortedInDistributionEditor, Messages.ChecklistEditorGeneralPreference_Configure_area_order, isAdminPreference);
167 199

  
168
            int index = 0;
200
            index = 0;
169 201
            TermOrder areaOrder;
170
                try {
171
                    if (orderAreas != null) {
172
                        areaOrder = TermOrder.valueOf(orderAreas);
173
                    } else {
174
                        areaOrder = TermOrder.IdInVoc;
175
                    }
176
                } catch (IllegalArgumentException e) {
202
            try {
203
                if (orderAreas != null) {
204
                    areaOrder = TermOrder.valueOf(orderAreas);
205
                } else {
177 206
                    areaOrder = TermOrder.IdInVoc;
178 207
                }
179
                for (String itemLabel : areaOrderSelectionCombo.getItems()) {
180
                    if (itemLabel.startsWith(areaOrder.getLabel())) {
181
                        areaOrderSelectionCombo.select(index);
182
                        break;
183
                    }
184
                    index++;
208
            } catch (IllegalArgumentException e) {
209
                areaOrder = TermOrder.IdInVoc;
210
            }
211
            for (String itemLabel : areaOrderSelectionCombo.getItems()) {
212
                if (itemLabel.equals(Messages.Preference_Use_Default) && orderAreas.equals(Messages.Preference_Use_Default)){
213
                    areaOrderSelectionCombo.select(index);
214
                    break;
185 215
                }
216
                if (itemLabel.startsWith(areaOrder.getLabel())) {
217
                    areaOrderSelectionCombo.select(index);
218
                    break;
219
                }
220

  
221
                index++;
222
            }
186 223

  
187 224
            areaOrderSelectionCombo.addSelectionListener(this);
188 225

  
189 226
            if (isAdminPreference) {
190 227
                allowOverrideOrderAreasButton = createAllowOverrideButton(child);
191
                allowOverrideOrderAreasButton.setSelection(prefAreaSort.isAllowOverride());
228
                allowOverrideOrderAreasButton.setSelection(prefAreaSort != null? prefAreaSort.isAllowOverride(): true);
192 229
                allowOverrideOrderAreasButton.addSelectionListener(new SelectionAdapter() {
193 230
                    @Override
194 231
                    public void widgetSelected(SelectionEvent e) {
......
202 239
            separator.setLayoutData(sepGrid);
203 240
            areaDisplaySelectionCombo = createCombo(child, TermDisplayEnum.values(), PreferencePredicate.DisplayOfAreasInDistributionEditor, Messages.ChecklistEditorGeneralPreference_Configure_display_of_Areas, isAdminPreference);
204 241

  
242

  
205 243
            index = 0;
206
            if (PreferencesUtil.getStringValue(PreferencePredicate.DistributionEditorActivated.getKey()) != null) {
207
                TermDisplayEnum areaDisplay;
208
                try {
209
                    if (displayArea != null) {
210
                        areaDisplay = TermDisplayEnum.byKey(displayArea);
211
                    } else {
212
                        areaDisplay = TermDisplayEnum.Title;
213
                    }
214
                } catch (IllegalArgumentException e) {
244
            TermDisplayEnum areaDisplay;
245
            try {
246
                if (displayArea != null) {
247
                    areaDisplay = TermDisplayEnum.valueOf(displayArea);
248
                } else {
215 249
                    areaDisplay = TermDisplayEnum.Title;
216 250
                }
217

  
218
                for (String itemLabel : areaDisplaySelectionCombo.getItems()) {
219
                    if (itemLabel.startsWith(areaDisplay.getLabel())) {
220
                        areaDisplaySelectionCombo.select(index);
221
                        break;
222
                    }
223
                    index++;
251
            } catch (IllegalArgumentException e) {
252
                areaDisplay = TermDisplayEnum.Title;
253
            }
254
            for (String itemLabel : areaDisplaySelectionCombo.getItems()) {
255
                if (itemLabel.equals(Messages.Preference_Use_Default) && displayArea.equals(Messages.Preference_Use_Default)){
256
                    areaDisplaySelectionCombo.select(index);
257
                    break;
224 258
                }
259
                if (itemLabel.startsWith(areaDisplay.getLabel())) {
260
                    areaDisplaySelectionCombo.select(index);
261
                    break;
262
                }
263

  
264
                index++;
225 265
            }
226 266
            areaDisplaySelectionCombo.addSelectionListener(this);
227 267

  
228 268
            if (isAdminPreference) {
229 269
                allowOverrideAreaDisplayButton = createAllowOverrideButton(child);
230
                allowOverrideAreaDisplayButton.setSelection(prefAreaDisplay.isAllowOverride());
270
                allowOverrideAreaDisplayButton.setSelection(prefAreaDisplay != null? prefAreaDisplay.isAllowOverride(): true);
231 271
                allowOverrideAreaDisplayButton.addSelectionListener(new SelectionAdapter() {
232 272
                    @Override
233 273
                    public void widgetSelected(SelectionEvent e) {
......
240 280
            statusDisplaySelectionCombo = createCombo(child, TermDisplayEnum.values(), PreferencePredicate.DisplayOfStatus, Messages.ChecklistEditorGeneralPreference_Configure_display_of_Status, isAdminPreference);
241 281

  
242 282
            index = 0;
243
            if (displayStatus != null) {
244
                TermDisplayEnum statusDisplay;
245
                try {
246
                    statusDisplay = TermDisplayEnum.byKey(displayStatus);
247
                } catch (IllegalArgumentException e) {
283
            TermDisplayEnum statusDisplay;
284
            try {
285
                if (displayStatus != null) {
286
                    statusDisplay = TermDisplayEnum.valueOf(displayStatus);
287
                } else {
248 288
                    statusDisplay = TermDisplayEnum.Title;
249 289
                }
250
                for (String itemLabel : statusDisplaySelectionCombo.getItems()) {
251
                    if (itemLabel.startsWith(statusDisplay.getLabel())) {
252
                        statusDisplaySelectionCombo.select(index);
253
                        break;
254
                    }
255
                    index++;
290
            } catch (IllegalArgumentException e) {
291
                statusDisplay = TermDisplayEnum.Title;
292
            }
293
            for (String itemLabel : statusDisplaySelectionCombo.getItems()) {
294
                if (itemLabel.equals(Messages.Preference_Use_Default) && displayStatus.equals(Messages.Preference_Use_Default)){
295
                    statusDisplaySelectionCombo.select(index);
296
                    break;
297
                }
298
                if (itemLabel.startsWith(statusDisplay.getLabel())) {
299
                    statusDisplaySelectionCombo.select(index);
300
                    break;
256 301
                }
302

  
303
                index++;
257 304
            }
258 305

  
259 306
            statusDisplaySelectionCombo.addSelectionListener(this);
260 307

  
261 308
            if (isAdminPreference) {
262 309
                allowOverrideStatusDisplayButton = createAllowOverrideButton(child);
263
                allowOverrideStatusDisplayButton.setSelection(prefStatusDisplay.isAllowOverride());
310
                allowOverrideStatusDisplayButton.setSelection(prefStatusDisplay != null ? prefStatusDisplay.isAllowOverride(): true);
264 311
                allowOverrideStatusDisplayButton.addSelectionListener(new SelectionAdapter() {
265 312
                    @Override
266 313
                    public void widgetSelected(SelectionEvent e) {
......
297 344
                    .setText(Messages.ChecklistEditorGeneralPreference_open_distribution_selection);
298 345

  
299 346
            if (!isAdminPreference) {
300
                PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);
347

  
348
                //PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);
301 349
                if (distributionEditorPref != null && !distributionEditorPref.isAllowOverride()){
302 350
                    activateComp.setEnabled(false);
303 351
                }
......
330 378

  
331 379
    @Override
332 380
    public boolean performOk() {
333
       // if (distributionEditorPref == null || this.distributionEditorPref.isAllowOverride()) {
334

  
335
            PreferencesUtil.setBooleanValue(PreferencePredicate.DistributionEditorActivated.getKey(),
336
                    isEditorActivated);
381
        if (!isApply()){
382
            return true;
383
        }
337 384
            boolean override = false;
338
            if (distributionEditorPref == null
339
                    || isEditorActivated != Boolean.parseBoolean(distributionEditorPref.getValue())) {
385
            if (isEditorActivated != null ) {
340 386
                override = true;
387
                PreferencesUtil.setStringValue(PreferencePredicate.DistributionEditorActivated.getKey(), isEditorActivated.toString());
341 388
            }
342 389
            PreferencesUtil.setBooleanValue(
343 390
                    PreferencesUtil.prefOverrideKey(PreferencePredicate.DistributionEditorActivated.getKey()),
344 391
                    override);
345
            PreferencesUtil.setSortNamedAreasInDistributionEditor(orderAreas);
392

  
393

  
346 394
            override = false;
347
            if (prefAreaSort == null || orderAreas != prefAreaSort.getValue()) {
395
            if (!orderAreas.equals(Messages.Preference_Use_Default) ) {
348 396
                override = true;
397
                PreferencesUtil.setSortNamedAreasInDistributionEditor(orderAreas);
349 398
            }
350 399
            PreferencesUtil.setBooleanValue(
351 400
                    PreferencesUtil.prefOverrideKey(PreferencePredicate.AreasSortedInDistributionEditor.getKey()),
352 401
                    override);
353
            PreferencesUtil.setShowRankInChecklistEditor(isShowRank);
402

  
403

  
404

  
405

  
406

  
354 407
            override = false;
355
            if (prefRank == null || isShowRank != Boolean.parseBoolean(prefRank.getValue())) {
408
            if (isShowRank != null ) {
356 409
                override = true;
410
                PreferencesUtil.setShowRankInChecklistEditor(isShowRank);
357 411
            }
358 412
            PreferencesUtil.setBooleanValue(
359 413
                    PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowRankInDistributionEditor.getKey()),
360
                    true);
361
            PreferencesUtil.setDisplayStatusInChecklistEditor(displayStatus);
414
                    override);
415

  
416

  
362 417
            override = false;
363
            if (prefStatusDisplay == null || displayStatus != prefStatusDisplay.getValue()) {
418
            if (!displayStatus.equals(Messages.Preference_Use_Default)) {
364 419
               override = true;
420
               PreferencesUtil.setDisplayStatusInChecklistEditor(displayStatus);
365 421
            }
366 422
            PreferencesUtil.setBooleanValue(
367 423
                    PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatus.getKey()),
368
                    true);
369
            PreferencesUtil.setAreaDisplayInChecklistEditor(displayArea);
424
                    override);
425

  
426

  
427

  
428

  
370 429
            override = false;
371
            if (prefAreaDisplay == null || displayArea != prefAreaDisplay.getValue()) {
430
            if (!displayArea.equals(Messages.Preference_Use_Default) ) {
372 431
                override = true;
432
                PreferencesUtil.setAreaDisplayInChecklistEditor(displayArea);
373 433
            }
374 434
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(
375
                    PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), overrideAreaDisplay);
435
                    PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), override);
436

  
437

  
438

  
439

  
376 440
            PreferencesUtil.setOwnDescriptionForChecklistEditor(ownDescriptionForDistributionEditor);
377 441
            PreferencesUtil.setBooleanValue(
378 442
                    PreferencesUtil.prefOverrideKey(PreferencePredicate.OwnDescriptionForDistributionEditor.getKey()),
379 443
                    true);
380 444

  
381
            // if (statusPref != null){
382
            // PreferencesUtil.setStringValue(PreferencePredicate.AvailableDistributionStatus.getKey(),
383
            // "");
384
            // //PreferencesUtil.setStringValue(PreferencePredicate.AvailableDistributionStatus.getKey(),
385
            // statusPref.getValue());
386
            // PreferencesUtil.setBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.AvailableDistributionStatus.getKey()),true);
387
            //
388
            // }
389
            // if (areaVocPref != null){
390
            // PreferencesUtil.setStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey(),
391
            // "");
392
            // PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey()),
393
            // true);
394
            // }
395 445
            PreferencesUtil.firePreferencesChanged(this.getClass());
396 446

  
397
        //}
398 447
        return true;
399 448
    }
400 449

  
......
406 455
        setApply(true);
407 456
        if (e.getSource().equals(statusDisplaySelectionCombo)) {
408 457
            String text = statusDisplaySelectionCombo.getText();
458
            if(text.equals(Messages.Preference_Use_Default)){
459
                displayStatus = Messages.Preference_Use_Default;
460
                if(isAdminPreference){
461
                    prefStatusDisplay.setAllowOverride(true);
462
                    allowOverrideStatusDisplayButton.setSelection(true);
463
                }
464

  
465
                return;
466
            }
409 467
            for (TermDisplayEnum display : TermDisplayEnum.values()) {
410 468
                if (text.startsWith(display.getLabel())) {
411 469
                    displayStatus = display.getKey();
412 470
                    break;
413 471
                }
472

  
414 473
            }
415 474
        }
416 475
        if (e.getSource().equals(areaDisplaySelectionCombo)) {
417 476
            String text = areaDisplaySelectionCombo.getText();
477
            if(text.equals(Messages.Preference_Use_Default)){
478
                displayArea = Messages.Preference_Use_Default;
479
                if (isAdminPreference){
480
                    prefAreaDisplay.setAllowOverride(true);
481
                    allowOverrideAreaDisplayButton.setSelection(true);
482
                }
483
                return;
484
            }
418 485
            for (TermDisplayEnum display : TermDisplayEnum.values()) {
419 486
                if (text.startsWith(display.getLabel())) {
420 487
                    displayArea = display.getKey();
......
424 491
        }
425 492
        if (e.getSource().equals(areaOrderSelectionCombo)) {
426 493
            String text = areaOrderSelectionCombo.getText();
494
            if(text.equals(Messages.Preference_Use_Default)){
495
                orderAreas = Messages.Preference_Use_Default;
496
                if (isAdminPreference){
497
                    prefAreaSort.setAllowOverride(true);
498
                    allowOverrideOrderAreasButton.setSelection(true);
499
                }
500
                return;
501
            }
427 502
            for (TermOrder display : TermOrder.values()) {
428 503
                if (text.startsWith(display.getLabel())) {
429 504
                    orderAreas = display.getKey();
......
433 508
        }
434 509
        if (e.getSource().equals(this.activateRankCombo)) {
435 510
            String text = activateRankCombo.getText();
436
            text = text.replace(Messages.Preference_Use_Default, "");
511
            if(text.equals(Messages.Preference_Use_Default)){
512
                isShowRank = null;
513
                if (isAdminPreference){
514
                    prefRank.setAllowOverride(true);
515
                    allowOverrideRankButton.setSelection(true);
516
                }
517
                return;
518
            }
437 519
            if (text.equals(SHOW_RANK)){
438 520
                isShowRank = true;
439 521
            }else{
......
443 525

  
444 526
        if (e.getSource().equals(this.activateCombo)) {
445 527
            String text = activateCombo.getText();
446
            text = text.replace(" (Default)", "");
528
            if(text.equals(Messages.Preference_Use_Default)){
529
                isEditorActivated = null;
530
                if (isAdminPreference){
531
                    if (distributionEditorPref == null){
532
                        distributionEditorPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DistributionEditorActivated, PreferencePredicate.DistributionEditorActivated.getDefaultValue() != null ?  PreferencePredicate.DistributionEditorActivated.getDefaultValue().toString(): null);
533
                    }
534
                    distributionEditorPref.setAllowOverride(true);
535
                    allowOverrideActivatedButton.setSelection(true);
536
                }
537
                return;
538
            }
447 539
            if (text.equals(ENABLE)){
448 540
                isEditorActivated = true;
449 541
            }else{
450 542
                isEditorActivated = false;
451 543
            }
544

  
452 545
        }
453
        PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);
546
        //PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);
454 547
    }
455 548

  
456 549
    /**
......
470 563
        isAdminPreference = false;
471 564
        setPreferenceStore(PreferencesUtil.getPreferenceStore());
472 565
        distributionEditorPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DistributionEditorActivated);
566
        overrideActivated = PreferencesUtil.getBooleanValue(
567
                PreferencesUtil.prefOverrideKey(PreferencePredicate.DistributionEditorActivated.getKey()), true);
473 568

  
474 569
        if (distributionEditorPref != null) {
475
            // isAllowOverride = distributionEditorPref.isAllowOverride();
476

  
477 570
            if (distributionEditorPref.isAllowOverride() ) {
478
                isEditorActivated = PreferencesUtil
479
                        .getBooleanValue(PreferencePredicate.DistributionEditorActivated.getKey(), true);
571
                if (overrideActivated){
572
                    isEditorActivated = PreferencesUtil.getBooleanValue(PreferencePredicate.DistributionEditorActivated.getKey(), true);
573
                }
480 574

  
481 575
            } else {
482 576
                isEditorActivated = Boolean.valueOf(distributionEditorPref.getValue());
483 577

  
484 578
            }
485
            overrideActivated = PreferencesUtil.getBooleanValue(
486
                    PreferencesUtil.prefOverrideKey(PreferencePredicate.DistributionEditorActivated.getKey()), true);
579

  
487 580
        } else {
488
            isEditorActivated = PreferencesUtil
489
                    .getBooleanValue(PreferencePredicate.DistributionEditorActivated.getKey(), true);
490
            // isAllowOverride = true;
491
            overrideActivated = PreferencesUtil.getBooleanValue(
492
                    PreferencesUtil.prefOverrideKey(PreferencePredicate.DistributionEditorActivated.getKey()), true);
493
            distributionEditorPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DistributionEditorActivated, PreferencePredicate.DistributionEditorActivated.getDefaultValue() != null ?  PreferencePredicate.DistributionEditorActivated.getDefaultValue().toString(): null);
581
            if(!overrideActivated){
582
                isEditorActivated = null;
583
            }else{
584
                isEditorActivated = PreferencesUtil.getBooleanValue(PreferencePredicate.DistributionEditorActivated.getKey(), true);
585
            }
586
            //distributionEditorPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DistributionEditorActivated, PreferencePredicate.DistributionEditorActivated.getDefaultValue() != null ?  PreferencePredicate.DistributionEditorActivated.getDefaultValue().toString(): null);
494 587
        }
495 588

  
496 589
        prefAreaVoc = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaVocabularies);
......
506 599

  
507 600

  
508 601
        prefAreaDisplay = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DisplayOfAreasInDistributionEditor);
602
        overrideAreaDisplay = PreferencesUtil.getBooleanValue(
603
                PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), true);
509 604
        if (prefAreaDisplay != null) {
510

  
511
            if (prefAreaDisplay.isAllowOverride()) {
512
                displayArea = PreferencesUtil.displayAreaInChecklistEditor();
513
                overrideAreaDisplay = PreferencesUtil.getBooleanValue(PreferencesUtil
514
                        .prefOverrideKey(PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), true);
605
            if (prefAreaDisplay.isAllowOverride()){
606
                if (overrideActivated) {
607
                    displayArea = PreferencesUtil.displayAreaInChecklistEditor();
608
                }else{
609
                    displayArea = Messages.Preference_Use_Default;
610
                }
515 611
            } else {
516 612
                displayArea = prefAreaDisplay.getValue();
517 613
            }
518 614
        } else {
519
            displayArea = PreferencesUtil.displayAreaInChecklistEditor();
520

  
521
            overrideAreaDisplay = PreferencesUtil.getBooleanValue(
522
                    PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), true);
523
            prefAreaDisplay = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DisplayOfAreasInDistributionEditor, PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue() != null ?  PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue().toString(): null);
615
            if (overrideAreaDisplay){
616
                displayArea = PreferencesUtil.displayAreaInChecklistEditor();
617
            } else{
618
                displayArea = Messages.Preference_Use_Default;
619
            }
620
            //prefAreaDisplay = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DisplayOfAreasInDistributionEditor, PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue() != null ?  PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue().toString(): null);
524 621
        }
525 622

  
526 623
        prefStatusDisplay = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DisplayOfStatus);
624
        overrideStatusDisplay = PreferencesUtil
625
                .getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatus.getKey()), true);
527 626
        if (prefStatusDisplay != null) {
528

  
529
            if (prefStatusDisplay.isAllowOverride()) {
530
                displayStatus = PreferencesUtil.displayStatusInChecklistEditor();
531
                overrideStatusDisplay = PreferencesUtil
532
                        .getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatus.getKey()), true);
627
            if (prefStatusDisplay.isAllowOverride()){
628
                if (overrideStatusDisplay) {
629
                    displayStatus = PreferencesUtil.displayStatusInChecklistEditor();
630
                }else{
631
                    displayStatus = Messages.Preference_Use_Default;
632
                }
533 633
            } else {
534 634
                this.displayStatus = prefStatusDisplay.getValue();
535 635
            }
536 636
        } else {
537
            displayStatus = PreferencesUtil.displayStatusInChecklistEditor();
538

  
539
            overrideStatusDisplay = PreferencesUtil
540
                    .getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatus.getKey()), true);
541
            prefStatusDisplay = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DisplayOfStatus, PreferencePredicate.DisplayOfStatus.getDefaultValue() != null ?  PreferencePredicate.DisplayOfStatus.getDefaultValue().toString(): null);
637
            if (overrideStatusDisplay){
638
                displayStatus = PreferencesUtil.displayStatusInChecklistEditor();
639
            } else{
640
                displayStatus = Messages.Preference_Use_Default;
641
            }
642
            //prefStatusDisplay = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DisplayOfStatus, PreferencePredicate.DisplayOfStatus.getDefaultValue() != null ?  PreferencePredicate.DisplayOfStatus.getDefaultValue().toString(): null);
542 643
        }
543 644

  
544 645
        prefAreaSort = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AreasSortedInDistributionEditor);
646
        overrideOrderAreas = PreferencesUtil.getBooleanValue(
647
                PreferencesUtil.prefOverrideKey(PreferencePredicate.AreasSortedInDistributionEditor.getKey()), true);
545 648
        if (prefAreaSort != null) {
546

  
547
            if (prefAreaSort.isAllowOverride()) {
548
                orderAreas = PreferencesUtil.getSortNamedAreasInDistributionEditor();
549
                overrideOrderAreas = PreferencesUtil.getBooleanValue(
550
                        PreferencesUtil.prefOverrideKey(PreferencePredicate.AreasSortedInDistributionEditor.getKey()), true);
649
            if (prefAreaSort.isAllowOverride()){
650
                if(overrideOrderAreas) {
651
                    orderAreas = PreferencesUtil.getSortNamedAreasInDistributionEditor();
652
                }else{
653
                    orderAreas = Messages.Preference_Use_Default;
654
                }
551 655
            } else {
552 656
                if (prefAreaSort.getValue() != null) {
553 657
                    orderAreas = prefAreaSort.getValue().toString();
......
555 659
                    orderAreas = ((TermOrder) PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue())
556 660
                            .getKey();
557 661
                }
662

  
558 663
            }
559 664
        } else {
560
            orderAreas = PreferencesUtil.getSortNamedAreasInDistributionEditor();
561
            overrideOrderAreas = PreferencesUtil.getBooleanValue(
562
                    PreferencesUtil.prefOverrideKey(PreferencePredicate.AreasSortedInDistributionEditor.getKey()), true);
563
            prefAreaSort = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AreasSortedInDistributionEditor, PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue() != null ?  PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue().toString(): null);
665
            if (overrideOrderAreas){
666
                orderAreas = PreferencesUtil.getSortNamedAreasInDistributionEditor();
667
            }else{
668
                orderAreas = Messages.Preference_Use_Default;
669
            }
670
            //prefAreaSort = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AreasSortedInDistributionEditor, PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue() != null ?  PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue().toString(): null);
564 671
        }
565 672

  
566 673
        prefRank = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.ShowRankInDistributionEditor);
674
        overrideRank = PreferencesUtil.getBooleanValue(
675
                PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowRankInDistributionEditor.getKey()), true);
567 676
        if (prefRank != null) {
568
            if (prefRank.isAllowOverride()) {
569
                isShowRank = PreferencesUtil.isShowRankInChecklistEditor();
570
                overrideRank = PreferencesUtil.getBooleanValue(
571
                        PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowRankInDistributionEditor.getKey()), true);
677
            if (prefRank.isAllowOverride()){
678
                if(overrideRank) {
679
                    isShowRank = PreferencesUtil.isShowRankInChecklistEditor();
680
                }
681

  
572 682
            } else {
573 683
                this.isShowRank = Boolean.valueOf(prefRank.getValue().toString());
574 684
            }
575 685
        } else {
576
            isShowRank = PreferencesUtil.isShowRankInChecklistEditor();
577
            overrideRank = PreferencesUtil.getBooleanValue(
578
                    PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowRankInDistributionEditor.getKey()), true);
579
            prefRank = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowRankInDistributionEditor, PreferencePredicate.ShowRankInDistributionEditor.getDefaultValue() != null ?  PreferencePredicate.ShowRankInDistributionEditor.getDefaultValue().toString(): null);
686
            if (overrideRank){
687
                isShowRank = PreferencesUtil.isShowRankInChecklistEditor();
688
            } else {
689
                isShowRank = null;
690
            }
691

  
692
            //refRank = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowRankInDistributionEditor, PreferencePredicate.ShowRankInDistributionEditor.getDefaultValue() != null ?  PreferencePredicate.ShowRankInDistributionEditor.getDefaultValue().toString(): null);
580 693
        }
581 694

  
582 695
        prefOwnDescription = PreferencesUtil
......
592 705
            // allowOverrideOwnDescriptionForDistributionEditor = true;
593 706
            overrideOwnDescriptionForDistributionEditor = PreferencesUtil.getBooleanValue(
594 707
                    PreferencesUtil.prefOverrideKey(PreferencePredicate.OwnDescriptionForDistributionEditor.getKey()), true);
595
            prefOwnDescription = CdmPreference.NewTaxEditorInstance(PreferencePredicate.OwnDescriptionForDistributionEditor, PreferencePredicate.OwnDescriptionForDistributionEditor.getDefaultValue() != null ?  PreferencePredicate.OwnDescriptionForDistributionEditor.getDefaultValue().toString(): null);
708
            //prefOwnDescription = CdmPreference.NewTaxEditorInstance(PreferencePredicate.OwnDescriptionForDistributionEditor, PreferencePredicate.OwnDescriptionForDistributionEditor.getDefaultValue() != null ?  PreferencePredicate.OwnDescriptionForDistributionEditor.getDefaultValue().toString(): null);
596 709
        }
597 710

  
598 711
        commandHandlerString = "eu.etaxonomy.taxeditor.store.open.OpenDistributionEditorWizardHandler";

Also available in: Unified diff