Revision a4f3f99c
Added by Katja Luther almost 5 years ago
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java | ||
---|---|---|
656 | 656 |
setPreferenceStore(PreferencesUtil.getPreferenceStore()); |
657 | 657 |
distributionEditorPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DistributionEditorActivated); |
658 | 658 |
overrideActivated = PreferencesUtil.getBooleanValue( |
659 |
PreferencesUtil.prefOverrideKey(PreferencePredicate.DistributionEditorActivated.getKey()), true); |
|
659 |
PreferencesUtil.prefOverrideKey(PreferencePredicate.DistributionEditorActivated.getKey()), true) != null? PreferencesUtil.getBooleanValue( |
|
660 |
PreferencesUtil.prefOverrideKey(PreferencePredicate.DistributionEditorActivated.getKey()), true):false; |
|
660 | 661 |
|
661 | 662 |
if (distributionEditorPref != null) { |
662 | 663 |
if (distributionEditorPref.isAllowOverride() ) { |
... | ... | |
666 | 667 |
|
667 | 668 |
} else { |
668 | 669 |
isEditorActivated = Boolean.valueOf(distributionEditorPref.getValue()); |
669 |
|
|
670 | 670 |
} |
671 | 671 |
|
672 | 672 |
} else { |
... | ... | |
692 | 692 |
|
693 | 693 |
prefAreaDisplay = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DisplayOfAreasInDistributionEditor); |
694 | 694 |
overrideAreaDisplay = PreferencesUtil.getBooleanValue( |
695 |
PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), true); |
|
695 |
PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), true) != null? PreferencesUtil.getBooleanValue( |
|
696 |
PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), true): false; |
|
697 |
|
|
696 | 698 |
if (prefAreaDisplay != null) { |
697 | 699 |
if (prefAreaDisplay.isAllowOverride()){ |
698 | 700 |
if (overrideActivated) { |
... | ... | |
714 | 716 |
|
715 | 717 |
prefStatusDisplay = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DisplayOfStatus); |
716 | 718 |
overrideStatusDisplay = PreferencesUtil |
717 |
.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatus.getKey()), true); |
|
719 |
.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatus.getKey()), true) != null? PreferencesUtil |
|
720 |
.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatus.getKey()), true): false; |
|
718 | 721 |
if (prefStatusDisplay != null) { |
719 | 722 |
if (prefStatusDisplay.isAllowOverride()){ |
720 | 723 |
if (overrideStatusDisplay) { |
... | ... | |
736 | 739 |
|
737 | 740 |
prefStatusDisplayInCombo = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DisplayOfStatusInCombo); |
738 | 741 |
overrideStatusDisplayCombo = PreferencesUtil |
739 |
.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatusInCombo.getKey()), true); |
|
742 |
.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatusInCombo.getKey()), true) != null? PreferencesUtil |
|
743 |
.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatusInCombo.getKey()), true): false; |
|
740 | 744 |
if (prefStatusDisplayInCombo != null) { |
741 | 745 |
if (prefStatusDisplayInCombo.isAllowOverride()){ |
742 | 746 |
if (overrideStatusDisplayCombo) { |
... | ... | |
759 | 763 |
|
760 | 764 |
prefAreaSort = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AreasSortedInDistributionEditor); |
761 | 765 |
overrideOrderAreas = PreferencesUtil.getBooleanValue( |
762 |
PreferencesUtil.prefOverrideKey(PreferencePredicate.AreasSortedInDistributionEditor.getKey()), true); |
|
766 |
PreferencesUtil.prefOverrideKey(PreferencePredicate.AreasSortedInDistributionEditor.getKey()), true) != null? PreferencesUtil.getBooleanValue( |
|
767 |
PreferencesUtil.prefOverrideKey(PreferencePredicate.AreasSortedInDistributionEditor.getKey()), true): false; |
|
763 | 768 |
if (prefAreaSort != null) { |
764 | 769 |
if (prefAreaSort.isAllowOverride()){ |
765 | 770 |
if(overrideOrderAreas) { |
... | ... | |
787 | 792 |
|
788 | 793 |
prefRank = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.ShowRankInDistributionEditor); |
789 | 794 |
overrideRank = PreferencesUtil.getBooleanValue( |
790 |
PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowRankInDistributionEditor.getKey()), true); |
|
795 |
PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowRankInDistributionEditor.getKey()), true) != null? PreferencesUtil.getBooleanValue( |
|
796 |
PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowRankInDistributionEditor.getKey()), true): false; |
|
791 | 797 |
if (prefRank != null) { |
792 | 798 |
if (prefRank.isAllowOverride()){ |
793 | 799 |
if(overrideRank) { |
... | ... | |
819 | 825 |
ownDescriptionForDistributionEditor = PreferencesUtil.isShowRankInChecklistEditor(); |
820 | 826 |
// allowOverrideOwnDescriptionForDistributionEditor = true; |
821 | 827 |
overrideOwnDescriptionForDistributionEditor = PreferencesUtil.getBooleanValue( |
822 |
PreferencesUtil.prefOverrideKey(PreferencePredicate.OwnDescriptionForDistributionEditor.getKey()), true); |
|
828 |
PreferencesUtil.prefOverrideKey(PreferencePredicate.OwnDescriptionForDistributionEditor.getKey()), true) != null? PreferencesUtil.getBooleanValue( |
|
829 |
PreferencesUtil.prefOverrideKey(PreferencePredicate.OwnDescriptionForDistributionEditor.getKey()), true): false; |
|
823 | 830 |
//prefOwnDescription = CdmPreference.NewTaxEditorInstance(PreferencePredicate.OwnDescriptionForDistributionEditor, PreferencePredicate.OwnDescriptionForDistributionEditor.getDefaultValue() != null ? PreferencePredicate.OwnDescriptionForDistributionEditor.getDefaultValue().toString(): null); |
824 | 831 |
} |
825 | 832 |
|
Also available in: Unified diff
ref #8294: add preference page for id in namespace and namespace in source