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/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
123 123
    @Override
124 124
    protected void performDefaults() {
125 125
        isShowIOMenu = null;
126
        showIOMenuButton.select(0);
127

  
128 126
        isShowCheckListPerspective = null;
129
        showChecklistPerspectiveButton.select(0);
130

  
131

  
132 127
        isShowTaxonNodeWizard = null;
133
        showTaxonNodeWizardButton.select(0);
128

  
134 129

  
135 130
        isAllowOverrideShowIOMenu = true;
136 131

  
137
        allowOverrideShowIOMenuButton.setSelection(isAllowOverrideShowIOMenu);
132

  
138 133
        isAllowOverrideShowCheckListPerspective = true;
139
        allowOverrideShowChecklistButton.setSelection(isAllowOverrideShowCheckListPerspective);
134

  
140 135
        isAllowOverrideShowTaxonNodeWizard = true;
141
        allowOverrideShowTaxonNodeWizardButton.setSelection(isAllowOverrideShowTaxonNodeWizard);
136
        setSelections();
142 137
        super.performDefaults();
143 138
    }
144 139

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbcdImportPreference.java
393 393
        }
394 394
        if (isAdminPreference){
395 395
            checkAllowOverride.setSelection(allowOverride || preference == null);
396
            if (preference == null){
397
                checkAllowOverride.setEnabled(false);
398
            }else{
399
                checkAllowOverride.setEnabled(true);
400
            }
396 401
        }else{
397 402
            checkAllowOverride.setSelection(override);
398 403
        }
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{
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java
234 234
            if (text.startsWith(Messages.Preference_Use_Default)){
235 235
                isOverrideShowIOMenu = false;
236 236
                isShowIOMenu = null;
237
                isAllowOverrideShowIOMenu = true;
237 238
            }else if (text.equals(SHOW)){
238 239
                isShowIOMenu = true;
239 240
                isOverrideShowIOMenu = true;
241

  
240 242
            }else{
241 243
                isShowIOMenu = false;
242 244
                isOverrideShowIOMenu = true;
......
247 249
            if (text.startsWith(Messages.Preference_Use_Default)){
248 250
                isOverrideShowCheckListPerspective = false;
249 251
                isShowCheckListPerspective = null;
252
                isAllowOverrideShowCheckListPerspective = true;
250 253
            }else if (text.equals(SHOW)){
251 254
                isShowCheckListPerspective = true;
252 255
                isOverrideShowCheckListPerspective = true;
......
260 263
            if (text.startsWith(Messages.Preference_Use_Default)){
261 264
                isOverrideShowTaxonNodeWizard = false;
262 265
                isShowTaxonNodeWizard = null;
266
                isAllowOverrideShowTaxonNodeWizard = true;
263 267
            }else if (text.equals(SHOW)){
264 268
                isShowTaxonNodeWizard = true;
265 269
                isOverrideShowTaxonNodeWizard = true;
......
268 272
                isOverrideShowTaxonNodeWizard = true;
269 273
            }
270 274
        }
275
        this.setSelections();
271 276
        this.setApply(true);
272 277

  
273 278

  
......
301 306
    protected void setSelections(){
302 307
        if (isShowIOMenu == null || (!isOverrideShowIOMenu && !isAdminPreference)){
303 308
            showIOMenuButton.select(0);
304
        }else if (isShowIOMenu){
305
            showIOMenuButton.select(1);
309
            if (isAdminPreference){
310
                allowOverrideShowIOMenuButton.setEnabled(false);
311
            }
306 312
        }else{
307
            showIOMenuButton.select(2);
313
            if (isAdminPreference){
314
                allowOverrideShowIOMenuButton.setEnabled(true);
315
            }
316
            if (isShowIOMenu){
317
                showIOMenuButton.select(1);
318
            }else{
319
                showIOMenuButton.select(2);
320
            }
308 321
        }
309 322

  
310 323
        if (isShowCheckListPerspective == null || (!isOverrideShowCheckListPerspective && !isAdminPreference)){
311 324
            showChecklistPerspectiveButton.select(0);
312
        }else if (isShowCheckListPerspective){
313
            showChecklistPerspectiveButton.select(1);
325
            if (isAdminPreference){
326
                allowOverrideShowChecklistButton.setEnabled(false);
327
            }
314 328
        }else{
315
            showChecklistPerspectiveButton.select(2);
329
            if (isAdminPreference){
330
                allowOverrideShowChecklistButton.setEnabled(true);
331
            }
332
            if (isShowCheckListPerspective){
333
                showChecklistPerspectiveButton.select(1);
334
            }else{
335
                showChecklistPerspectiveButton.select(2);
336
            }
316 337
        }
317 338

  
318 339
        if (isShowTaxonNodeWizard == null || (!isOverrideShowTaxonNodeWizard && !isAdminPreference)){
319 340
            showTaxonNodeWizardButton.select(0);
320
        }else if (isShowTaxonNodeWizard){
321
            showTaxonNodeWizardButton.select(1);
341
            if (isAdminPreference){
342
                allowOverrideShowTaxonNodeWizardButton.setEnabled(false);
343
            }
322 344
        }else{
323
            showTaxonNodeWizardButton.select(2);
345
            if (isAdminPreference){
346
                allowOverrideShowTaxonNodeWizardButton.setEnabled(true);
347
            }
348
            if (isShowTaxonNodeWizard){
349
                showTaxonNodeWizardButton.select(1);
350
            }else{
351
                showTaxonNodeWizardButton.select(2);
352
            }
324 353
        }
325 354

  
326 355
        if (isAdminPreference){
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
458 458
        activateCheckButton.select(index);
459 459
        if (isAdminPreference){
460 460
            allowLocalPreference.setSelection(isAllowOverride);
461
            allowLocalPreference.setEnabled(isSimpleDetailsViewActivated != null);
461 462
        }
462 463
        showTaxon.setSelection(isShowTaxon);
463 464
        showLsid.setSelection(isShowLSID);
......
545 546
              showSecDetail.setEnabled(isShowTaxon);
546 547
              secEnabled.setEnabled(isShowTaxon);
547 548
            }
549
            setButtonSelections();
548 550
            setApply(true);
549 551
        }
550 552

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishFlagLocalPreference.java
92 92
            public void widgetSelected(SelectionEvent e) {
93 93
                setApply(true);
94 94
                if (!publishFlagBehaviour.getText().startsWith(Messages.Preference_Use_Default)){
95

  
96 95
                    publishBehaviour = (PublishEnum)publishFlagBehaviour.getData(publishFlagBehaviour.getText());
97
                }
96
                }else{
97
                    publishBehaviour = null;
98
                    allowOverride = true;
98 99

  
100
                }
101
                if (isAdminPreference){
102
                    allowOverrideButton.setEnabled(publishBehaviour != null);
103
                    allowOverrideButton.setSelection(allowOverride);
104
                }
99 105
            }
100 106

  
101 107
            @Override
......
108 114
            allowOverrideButton = createAllowOverrideButton(composite);
109 115
            allowOverrideButton.setText(Messages.GeneralPreference_override);
110 116
            allowOverrideButton.setSelection(allowOverride);
117
            allowOverrideButton.setEnabled(publishBehaviour != null);
111 118
            allowOverrideButton.addSelectionListener(new SelectionAdapter(){
112 119
                @Override
113 120
                public void widgetSelected(SelectionEvent e) {
......
189 196
            index++;
190 197
        }
191 198
        allowOverrideButton.setSelection(allowOverride);
199
        allowOverrideButton.setEnabled(pref != null);
192 200
        super.performDefaults();
193 201
    }
194 202

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchDialogPreferences.java
108 108
                if (isAdminPreference){
109 109
                    showIdInSelectionDialogPref.setAllowOverride(true);
110 110
                    allowOverrideIsShowIdInSelectionDialogButton.setSelection(true);
111
                    allowOverrideIsShowIdInSelectionDialogButton.setEnabled(false);
111 112
                }
112 113
                return;
113 114
            }
115
            if (isAdminPreference){
116
                allowOverrideIsShowIdInSelectionDialogButton.setEnabled(true);
117
            }
114 118
            if (text.equals(Messages.GeneralPreference_yes)){
115 119
                showIdInSelectionDialog = true;
116 120
            }else{
......
125 129
                if (isAdminPreference){
126 130
                    searchForIdentifierAsDefaultPref.setAllowOverride(true);
127 131
                    allowOverrideSearchForIdentifierAsDefaultButton.setSelection(true);
132
                    allowOverrideSearchForIdentifierAsDefaultButton.setEnabled(false);
128 133
                }
129 134
                return;
130 135
            }
136
            if (isAdminPreference){
137
                allowOverrideSearchForIdentifierAsDefaultButton.setEnabled(true);
138
            }
131 139
            if (text.equals(Messages.GeneralPreference_yes)){
132 140
                searchForIdentifierAsDefault = true;
133 141
            }else{
......
142 150
                if (isAdminPreference){
143 151
                    searchForIdentifierAndTitleCachePref.setAllowOverride(true);
144 152
                    allowOverridesSearchForIdentifierAndTitleCacheButton.setSelection(true);
153
                    allowOverridesSearchForIdentifierAndTitleCacheButton.setEnabled(false);
145 154
                }
146 155
                return;
147 156
            }
157
            if (isAdminPreference){
158
                allowOverridesSearchForIdentifierAndTitleCacheButton.setEnabled(true);
159
            }
148 160
            if (text.equals(Messages.GeneralPreference_yes)){
149 161
                searchForIdentifierAndTitleCache = true;
150 162
            }else{
......
159 171
                if (isAdminPreference){
160 172
                    sortTaxaByRankAndNamePref.setAllowOverride(true);
161 173
                    allowOverrideIsSortTaxaByRankAndNameButton.setSelection(true);
174
                    allowOverrideIsSortTaxaByRankAndNameButton.setEnabled(false);
162 175
                }
163 176
                return;
164 177
            }
178
            if (isAdminPreference){
179
                allowOverrideIsSortTaxaByRankAndNameButton.setEnabled(true);
180
            }
165 181
            if (text.equals(Messages.GeneralPreference_yes)){
166 182
                sortTaxaByRankAndName = true;
167 183
            }else{
......
176 192
                if (isAdminPreference){
177 193
                    filterCommonNameReferencesPref.setAllowOverride(true);
178 194
                    allowOverrideFilterCommonNameReferencesButton.setSelection(true);
195
                    allowOverrideFilterCommonNameReferencesButton.setEnabled(false);
179 196
                }
180 197
                return;
181 198
            }
199
            if (isAdminPreference){
200
                allowOverrideFilterCommonNameReferencesButton.setEnabled(true);
201
            }
182 202
            if (text.equals(Messages.GeneralPreference_yes)){
183 203
                filterCommonNameReferences = true;
184 204
            }else{
......
216 236
        if (isAdminPreference){
217 237
            allowOverrideIsShowIdInSelectionDialogButton = createAllowOverrideButton(titleComp);
218 238
            allowOverrideIsShowIdInSelectionDialogButton.setSelection(showIdInSelectionDialogPref != null? showIdInSelectionDialogPref.isAllowOverride(): true);
239
            allowOverrideIsShowIdInSelectionDialogButton.setEnabled(showIdInSelectionDialog != null);
219 240
            allowOverrideIsShowIdInSelectionDialogButton.addSelectionListener(new SelectionAdapter(){
220 241
                @Override
221 242
                public void widgetSelected(SelectionEvent e) {
......
242 263
        if (isAdminPreference){
243 264
            allowOverrideSearchForIdentifierAsDefaultButton = createAllowOverrideButton(composite);
244 265
            allowOverrideSearchForIdentifierAsDefaultButton.setSelection(searchForIdentifierAsDefaultPref != null?searchForIdentifierAsDefaultPref.isAllowOverride(): true);
266
            allowOverrideSearchForIdentifierAsDefaultButton.setEnabled(searchForIdentifierAsDefault != null);
245 267
            allowOverrideSearchForIdentifierAsDefaultButton.addSelectionListener(new SelectionAdapter(){
246 268
                @Override
247 269
                public void widgetSelected(SelectionEvent e) {
......
267 289
        if (isAdminPreference){
268 290
            allowOverridesSearchForIdentifierAndTitleCacheButton = createAllowOverrideButton(composite);
269 291
            allowOverridesSearchForIdentifierAndTitleCacheButton.setSelection(searchForIdentifierAndTitleCachePref != null?searchForIdentifierAndTitleCachePref.isAllowOverride():true);
292
            allowOverridesSearchForIdentifierAndTitleCacheButton.setEnabled(searchForIdentifierAndTitleCache != null);
270 293
            allowOverridesSearchForIdentifierAndTitleCacheButton.addSelectionListener(new SelectionAdapter(){
271 294
                @Override
272 295
                public void widgetSelected(SelectionEvent e) {
......
291 314
        if (isAdminPreference){
292 315
            allowOverrideIsSortTaxaByRankAndNameButton = createAllowOverrideButton(composite);
293 316
            allowOverrideIsSortTaxaByRankAndNameButton.setSelection(sortTaxaByRankAndNamePref != null? sortTaxaByRankAndNamePref.isAllowOverride(): true);
317
            allowOverrideIsSortTaxaByRankAndNameButton.setEnabled(sortTaxaByRankAndName != null);
294 318
            allowOverrideIsSortTaxaByRankAndNameButton.addSelectionListener(new SelectionAdapter(){
295 319
                @Override
296 320
                public void widgetSelected(SelectionEvent e) {
......
314 338
        if (isAdminPreference){
315 339
            allowOverrideFilterCommonNameReferencesButton = createAllowOverrideButton(composite);
316 340
            allowOverrideFilterCommonNameReferencesButton.setSelection(filterCommonNameReferencesPref != null? filterCommonNameReferencesPref.isAllowOverride():true);
341
            allowOverrideFilterCommonNameReferencesButton.setEnabled(filterCommonNameReferences != null);
317 342
            allowOverrideFilterCommonNameReferencesButton.addSelectionListener(new SelectionAdapter(){
318 343
                @Override
319 344
                public void widgetSelected(SelectionEvent e) {
......
337 362
        showIdInSelectionDialog = null;
338 363
        if (isAdminPreference){
339 364
            allowOverrideIsShowIdInSelectionDialogButton.setSelection(true);
365
            allowOverrideIsShowIdInSelectionDialogButton.setEnabled(false);
340 366
            showIdInSelectionDialogPref.setAllowOverride(true);
341 367
        }
342 368
        searchForIdentifierAsDefaultButton.select(0);
343 369
        searchForIdentifierAsDefault = null;
344 370
        if (isAdminPreference){
345 371
            allowOverrideSearchForIdentifierAsDefaultButton.setSelection(true);
372
            allowOverrideSearchForIdentifierAsDefaultButton.setEnabled(false);
346 373
            searchForIdentifierAsDefaultPref.setAllowOverride(true);
347 374
        }
348 375
        searchForIdentifierAndTitleCacheButton.select(0);
349 376
        searchForIdentifierAndTitleCache = null;
350 377
        if (isAdminPreference){
351 378
            allowOverridesSearchForIdentifierAndTitleCacheButton.setSelection(true);
379
            allowOverridesSearchForIdentifierAndTitleCacheButton.setEnabled(false);
352 380
            searchForIdentifierAndTitleCachePref.setAllowOverride(true);
353 381
        }
354 382
        sortTaxaByRankAndNameButton.select(0);
355 383
        sortTaxaByRankAndName = null;
356 384
        if (isAdminPreference){
357 385
            allowOverrideIsSortTaxaByRankAndNameButton.setSelection(true);
386
            allowOverrideIsSortTaxaByRankAndNameButton.setEnabled(false);
358 387
            sortTaxaByRankAndNamePref.setAllowOverride(true);
359 388
        }
360 389
        filterCommonNameReferenceButton.select(0);
361 390
        filterCommonNameReferences = null;
362 391
        if (isAdminPreference){
363 392
            allowOverrideFilterCommonNameReferencesButton.setSelection(true);
393
            allowOverrideFilterCommonNameReferencesButton.setEnabled(false);
364 394
            filterCommonNameReferencesPref.setAllowOverride(true);
365 395
        }
366 396
        setApply(true);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
95 95

  
96 96
            if (showSpecimenPref != null){
97 97
                if (!showSpecimenPref.isAllowOverride() ){
98

  
99 98
                    isEditingAllowed = false;
100

  
101 99
                }
102 100
            }
103 101
        }
......
140 138
        if (isAdminPreference){
141 139
            allowOverrideIsShowSpecimenRelatedIssuesButton = createAllowOverrideButton(titleComp);
142 140
            allowOverrideIsShowSpecimenRelatedIssuesButton.setSelection(allowOverrideShowSpecimenRelatedIssues);
141
            allowOverrideIsShowSpecimenRelatedIssuesButton.setEnabled(isShowSpecimenRelatedIssues != null);
143 142
            allowOverrideIsShowSpecimenRelatedIssuesButton.addSelectionListener(new SelectionAdapter(){
144 143
                @Override
145 144
                public void widgetSelected(SelectionEvent e) {
......
178 177
        if (isAdminPreference){
179 178
            allowOverrideShowCollectingAreaButton = createAllowOverrideButton(composite);
180 179
            allowOverrideShowCollectingAreaButton.setSelection(allowOverrideShowCollectingAreaInGeneralSection);
180
            allowOverrideShowCollectingAreaButton.setEnabled(isShowCollectingAreaInGeneralSection != null);
181 181
            allowOverrideShowCollectingAreaButton.addSelectionListener(new SelectionAdapter(){
182 182
                @Override
183 183
                public void widgetSelected(SelectionEvent e) {
......
220 220
        if (isAdminPreference){
221 221
            allowOverridesDeterminationOnlyForFieldUnitsButton = createAllowOverrideButton(composite);
222 222
            allowOverridesDeterminationOnlyForFieldUnitsButton.setSelection(allowOverrideDeterminationOnlyForFieldUnits);
223
            allowOverridesDeterminationOnlyForFieldUnitsButton.setEnabled(showDeterminationOnlyForFieldUnits != null);
223 224
            allowOverridesDeterminationOnlyForFieldUnitsButton.addSelectionListener(new SelectionAdapter(){
224 225
                @Override
225 226
                public void widgetSelected(SelectionEvent e) {
......
257 258
        if (isAdminPreference){
258 259
            allowOverrideIsShowTaxonAssociationButton = createAllowOverrideButton(composite);
259 260
            allowOverrideIsShowTaxonAssociationButton.setSelection(allowOverrideShowTaxonAssociation);
261
            allowOverrideIsShowTaxonAssociationButton.setEnabled(showTaxonAssociation != null);
260 262
            allowOverrideIsShowTaxonAssociationButton.addSelectionListener(new SelectionAdapter(){
261 263
                @Override
262 264
                public void widgetSelected(SelectionEvent e) {
......
293 295
        if (isAdminPreference){
294 296
            allowOverrideShowLifeFormButton = createAllowOverrideButton(composite);
295 297
            allowOverrideShowLifeFormButton.setSelection(allowOverrideShowLifeForm);
298
            allowOverrideShowLifeFormButton.setEnabled(showLifeForm != null);
296 299
            allowOverrideShowLifeFormButton.addSelectionListener(new SelectionAdapter(){
297 300
                @Override
298 301
                public void widgetSelected(SelectionEvent e) {
......
571 574
               isShowSpecimenRelatedIssues = null;
572 575
               if (isAdminPreference){
573 576
                   allowOverrideIsShowSpecimenRelatedIssuesButton.setSelection(true);
577
                   allowOverrideIsShowSpecimenRelatedIssuesButton.setEnabled(false);
574 578
               }
575 579
               return;
576 580
           }
581
           if (isAdminPreference){
582
               allowOverrideIsShowSpecimenRelatedIssuesButton.setEnabled(true);
583
           }
577 584
           if (text.equals(Messages.GeneralPreference_yes)){
578 585
               isShowSpecimenRelatedIssues = true;
579 586
           }else{
......
586 593
           if(text.startsWith(Messages.Preference_Use_Default)){
587 594
               isShowCollectingAreaInGeneralSection = null;
588 595
               if (isAdminPreference){
589
                   //showCollectingAreaInGeneralSection.setAllowOverride(true);
590 596
                   allowOverrideShowCollectingAreaButton.setSelection(true);
597
                   allowOverrideShowCollectingAreaButton.setEnabled(false);
591 598
               }
592 599
               return;
593 600
           }
601
           if (isAdminPreference){
602
               allowOverrideShowCollectingAreaButton.setEnabled(true);
603
           }
594 604
           if (text.equals(Messages.GeneralPreference_yes)){
595 605
               isShowCollectingAreaInGeneralSection = true;
596 606
           }else{
......
603 613
           if(text.startsWith(Messages.Preference_Use_Default)){
604 614
               isDeterminationOnlyForFieldUnits = null;
605 615
               if (isAdminPreference){
606
                   //showDeterminationOnlyForFieldUnits.setAllowOverride(true);
607 616
                   allowOverridesDeterminationOnlyForFieldUnitsButton.setSelection(true);
617
                   allowOverridesDeterminationOnlyForFieldUnitsButton.setEnabled(false);
608 618
               }
609 619
               return;
610 620
           }
621
           if (isAdminPreference){
622
               allowOverridesDeterminationOnlyForFieldUnitsButton.setEnabled(true);
623
           }
611 624
           if (text.equals(Messages.GeneralPreference_yes)){
612 625
               isDeterminationOnlyForFieldUnits = true;
613 626
           }else{
......
622 635
               if (isAdminPreference){
623 636
                   //showTaxonAssociation.setAllowOverride(true);
624 637
                   allowOverrideIsShowTaxonAssociationButton.setSelection(true);
638
                   allowOverrideIsShowTaxonAssociationButton.setEnabled(false);
625 639
               }
626 640
               return;
641
           }if (isAdminPreference){
642
               allowOverrideIsShowTaxonAssociationButton.setEnabled(true);
627 643
           }
628 644
           if (text.equals(Messages.GeneralPreference_yes)){
629 645
               isShowTaxonAssociation = true;
......
637 653
           if(text.startsWith(Messages.Preference_Use_Default)){
638 654
               isShowLifeForm = null;
639 655
               if (isAdminPreference){
640
                   //showLifeForm.setAllowOverride(true);
641 656
                   allowOverrideShowLifeFormButton.setSelection(true);
657
                   allowOverrideShowLifeFormButton.setEnabled(false);
642 658
               }
643 659
               return;
644 660
           }
661
           if (isAdminPreference){
662
               allowOverrideShowLifeFormButton.setEnabled(true);
663
           }
645 664
           if (text.equals(Messages.GeneralPreference_yes)){
646 665
               isShowLifeForm = true;
647 666
           }else{
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SupplementalDataSourcePreferences.java
75 75
        if (isAdminPreference){
76 76
            allowOverrideIDSourceButton = createAllowOverrideButton(composite);
77 77
            allowOverrideIDSourceButton.setSelection(isAllowOverrideShowIDSource);
78
            allowOverrideIDSourceButton.setEnabled(isShowIDSource != null);
78 79
            allowOverrideIDSourceButton.addSelectionListener(new SelectionAdapter(){
79 80
                @Override
80 81
                public void widgetSelected(SelectionEvent e) {
......
100 101
            allowOverrideShowIDNamespaceButton = createAllowOverrideButton(composite);
101 102

  
102 103
            allowOverrideShowIDNamespaceButton.setSelection(isAllowOverrideShowIDNamespace);
104
            allowOverrideShowIDNamespaceButton.setEnabled(isShowIDNamespace != null);
103 105
            allowOverrideShowIDNamespaceButton.addSelectionListener(new SelectionAdapter(){
104 106
                @Override
105 107
                public void widgetSelected(SelectionEvent e) {
......
165 167
        if (e.getSource().equals(this.showIDNamespaceButton)) {
166 168
            String text = showIDNamespaceButton.getText();
167 169
           // text = text.replace(Messages.Preference_Use_Default, "");
168
            if (text.equals(Messages.Preference_Use_Default)){
170
            if (text.startsWith(Messages.Preference_Use_Default)){
171
                isShowIDNamespace = null;
169 172
                isOverrideShowIDNamespace = false;
170 173
            }else{
171 174
                isOverrideShowIDNamespace = true;
172
            }
173
            if (text.equals(SHOW)){
174
                isShowIDNamespace = true;
175
                if (text.equals(SHOW)){
176
                    isShowIDNamespace = true;
175 177

  
176
            }else{
177
                isShowIDNamespace = false;
178
                }else{
179
                    isShowIDNamespace = false;
180
                }
178 181
            }
182

  
183
            allowOverrideShowIDNamespaceButton.setEnabled(isShowIDNamespace != null);
179 184
        }
180 185
        if (e.getSource().equals(this.showIDSourceButton)) {
181 186
            String text = showIDSourceButton.getText();
182
            if (text.equals(Messages.Preference_Use_Default)){
187
            if (text.startsWith(Messages.Preference_Use_Default)){
188
                isShowIDSource = null;
183 189
                isOverrideShowIDSource = false;
184 190
            }else{
185 191
                isOverrideShowIDSource = true;
192
                if (text.equals(SHOW)){
193
                    isShowIDSource = true;
194
                }else{
195
                    isShowIDSource = false;
196
                }
186 197
            }
187
            if (text.equals(SHOW)){
188
                isShowIDSource = true;
189
            }else{
190
                isShowIDSource = false;
191
            }
198

  
199
            allowOverrideIDSourceButton.setEnabled(isShowIDSource != null);
192 200
        }
193 201

  
194 202
        this.setApply(true);
......
208 216
        if (isAdminPreference){
209 217
            allowOverrideIDSourceButton.setSelection(true);
210 218
            allowOverrideShowIDNamespaceButton.setSelection(true);
219
            allowOverrideIDSourceButton.setEnabled(false);
220
            allowOverrideShowIDNamespaceButton.setEnabled(false);
211 221
        }
212 222

  
213 223
        showIDSourceButton.select(0);

Also available in: Unified diff