Revision 79bd864f
Added by Katja Luther over 4 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralAdminPreference.java | ||
|---|---|---|
| 51 | 51 |
} |
| 52 | 52 |
IPreferenceService service = controller.getPreferenceService(); |
| 53 | 53 |
CdmPreference pref; |
| 54 |
if (isEditorActivated == null){
|
|
| 54 |
if (isEditorActivated == null && allowOverrideActivatedButton.getSelection()){
|
|
| 55 | 55 |
service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DistributionEditorActivated)); |
| 56 | 56 |
}else{
|
| 57 |
pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DistributionEditorActivated, Boolean.toString(isEditorActivated));
|
|
| 57 |
pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DistributionEditorActivated, isEditorActivated != null? Boolean.toString(isEditorActivated): null);
|
|
| 58 | 58 |
pref.setAllowOverride(allowOverrideActivatedButton.getSelection()); |
| 59 | 59 |
service.set(pref); |
| 60 | 60 |
} |
| 61 |
if(displayArea == null){
|
|
| 61 |
if(displayArea == null && allowOverrideAreaDisplayButton.getSelection()){
|
|
| 62 | 62 |
service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DisplayOfAreasInDistributionEditor)); |
| 63 | 63 |
}else{
|
| 64 |
pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DisplayOfAreasInDistributionEditor, this.displayArea.getKey());
|
|
| 64 |
pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DisplayOfAreasInDistributionEditor, displayArea != null ?this.displayArea.getKey(): null);
|
|
| 65 | 65 |
pref.setAllowOverride(allowOverrideAreaDisplayButton.getSelection()); |
| 66 | 66 |
service.set(pref); |
| 67 | 67 |
} |
| 68 | 68 |
|
| 69 |
if (displayStatus == null){
|
|
| 69 |
if (displayStatus == null && allowOverrideStatusDisplayButton.getSelection()){
|
|
| 70 | 70 |
service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DisplayOfStatus)); |
| 71 | 71 |
}else{
|
| 72 |
pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DisplayOfStatus, this.displayStatus.getKey());
|
|
| 72 |
pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DisplayOfStatus, displayStatus != null? this.displayStatus.getKey(): null);
|
|
| 73 | 73 |
pref.setAllowOverride(allowOverrideStatusDisplayButton.getSelection()); |
| 74 | 74 |
service.set(pref); |
| 75 | 75 |
} |
| 76 | 76 |
|
| 77 |
if (isShowRank == null){
|
|
| 77 |
if (isShowRank == null && allowOverrideRankButton.getSelection()){
|
|
| 78 | 78 |
service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowRankInDistributionEditor)); |
| 79 | 79 |
}else{
|
| 80 |
pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.ShowRankInDistributionEditor, Boolean.toString(isShowRank));
|
|
| 80 |
pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.ShowRankInDistributionEditor, isShowRank != null? Boolean.toString(isShowRank): null);
|
|
| 81 | 81 |
pref.setAllowOverride(allowOverrideRankButton.getSelection()); |
| 82 | 82 |
service.set(pref); |
| 83 | 83 |
} |
| 84 |
if (orderAreas == null){
|
|
| 84 |
if (orderAreas == null && allowOverrideOrderAreasButton.getSelection()){
|
|
| 85 | 85 |
service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AreasSortedInDistributionEditor)); |
| 86 | 86 |
}else{
|
| 87 |
pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.AreasSortedInDistributionEditor, this.orderAreas.getKey());
|
|
| 87 |
pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.AreasSortedInDistributionEditor, orderAreas != null? this.orderAreas.getKey(): null);
|
|
| 88 | 88 |
pref.setAllowOverride(allowOverrideOrderAreasButton.getSelection()); |
| 89 | 89 |
service.set(pref); |
| 90 | 90 |
} |
| 91 | 91 |
|
| 92 |
if (displayStatusCombo == null){
|
|
| 92 |
if (displayStatusCombo == null && allowOverrideStatusDisplayInComboButton.getSelection()){
|
|
| 93 | 93 |
service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DisplayOfStatusInCombo)); |
| 94 | 94 |
}else{
|
| 95 |
pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DisplayOfStatusInCombo, displayStatusCombo.getKey());
|
|
| 95 |
pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DisplayOfStatusInCombo, displayStatusCombo != null? displayStatusCombo.getKey(): null);
|
|
| 96 | 96 |
if (prefStatusDisplayInCombo == null){
|
| 97 | 97 |
prefStatusDisplayInCombo = pref; |
| 98 | 98 |
} |
| ... | ... | |
| 110 | 110 |
super.getValues(); |
| 111 | 111 |
distributionEditorPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DistributionEditorActivated); |
| 112 | 112 |
if (distributionEditorPref != null){
|
| 113 |
isEditorActivated = Boolean.valueOf(distributionEditorPref.getValue());
|
|
| 113 |
isEditorActivated = distributionEditorPref.getValue() != null? Boolean.valueOf(distributionEditorPref.getValue()): null;
|
|
| 114 | 114 |
}else{
|
| 115 | 115 |
isEditorActivated = null; |
| 116 | 116 |
} |
| ... | ... | |
| 119 | 119 |
isAdminPreference = true; |
| 120 | 120 |
|
| 121 | 121 |
if (prefAreaDisplay != null){
|
| 122 |
this.displayArea = TermDisplayEnum.byKey(prefAreaDisplay.getValue());
|
|
| 122 |
this.displayArea = prefAreaDisplay.getValue()!= null?TermDisplayEnum.byKey(prefAreaDisplay.getValue()): null;
|
|
| 123 | 123 |
}else{
|
| 124 | 124 |
this.displayArea = null; |
| 125 | 125 |
} |
| 126 | 126 |
|
| 127 | 127 |
|
| 128 | 128 |
if (prefStatusDisplay != null){
|
| 129 |
this.displayStatus = TermDisplayEnum.byKey(prefStatusDisplay.getValue());
|
|
| 129 |
this.displayStatus = prefStatusDisplay.getValue() != null? TermDisplayEnum.byKey(prefStatusDisplay.getValue()): null;
|
|
| 130 | 130 |
}else{
|
| 131 | 131 |
this.displayStatus = null; |
| 132 | 132 |
} |
| 133 | 133 |
|
| 134 | 134 |
if (prefStatusDisplayInCombo != null){
|
| 135 |
this.displayStatusCombo = TermComboEnum.byKey(prefStatusDisplayInCombo.getValue());
|
|
| 135 |
this.displayStatusCombo = prefStatusDisplayInCombo.getValue() != null? TermComboEnum.byKey(prefStatusDisplayInCombo.getValue()): null;
|
|
| 136 | 136 |
}else{
|
| 137 | 137 |
this.displayStatusCombo = null; |
| 138 | 138 |
} |
| ... | ... | |
| 140 | 140 |
|
| 141 | 141 |
if (prefAreaSort != null){
|
| 142 | 142 |
if (prefAreaSort.getValue() != null){
|
| 143 |
this.orderAreas = TermOrder.valueOf(prefAreaSort.getValue().toString());
|
|
| 143 |
this.orderAreas = prefAreaSort.getValue() != null? TermOrder.valueOf(prefAreaSort.getValue().toString()): null;
|
|
| 144 | 144 |
}else{
|
| 145 | 145 |
this.orderAreas = null; |
| 146 | 146 |
} |
| ... | ... | |
| 152 | 152 |
|
| 153 | 153 |
|
| 154 | 154 |
if (prefRank != null){
|
| 155 |
this.isShowRank = Boolean.valueOf(prefRank.getValue().toString());
|
|
| 155 |
this.isShowRank = prefRank.getValue() != null?Boolean.valueOf(prefRank.getValue().toString()): null;
|
|
| 156 | 156 |
|
| 157 | 157 |
}else{
|
| 158 | 158 |
this.isShowRank = null; |
| ... | ... | |
| 160 | 160 |
|
| 161 | 161 |
|
| 162 | 162 |
if (prefOwnDescription != null){
|
| 163 |
this.ownDescriptionForDistributionEditor = Boolean.valueOf(prefOwnDescription.getValue().toString());
|
|
| 163 |
this.ownDescriptionForDistributionEditor = prefOwnDescription.getValue() != null? Boolean.valueOf(prefOwnDescription.getValue().toString()): null;
|
|
| 164 | 164 |
}else{
|
| 165 | 165 |
this.ownDescriptionForDistributionEditor = null; |
| 166 | 166 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java | ||
|---|---|---|
| 41 | 41 |
if (controller != null){
|
| 42 | 42 |
IPreferenceService service = controller.getPreferenceService(); |
| 43 | 43 |
CdmPreference pref; |
| 44 |
if (isShowIOMenu == null){
|
|
| 44 |
if (isShowIOMenu == null && isAllowOverrideShowIOMenu){
|
|
| 45 | 45 |
service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowImportExportMenu)); |
| 46 | 46 |
}else{
|
| 47 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowImportExportMenu, Boolean.toString(this.isShowIOMenu));
|
|
| 47 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowImportExportMenu, isShowIOMenu!= null? Boolean.toString(this.isShowIOMenu):null);
|
|
| 48 | 48 |
pref.setAllowOverride(isAllowOverrideShowIOMenu); |
| 49 | 49 |
service.set(pref); |
| 50 | 50 |
} |
| 51 | 51 |
|
| 52 |
if(isShowCheckListPerspective == null){
|
|
| 52 |
if(isShowCheckListPerspective == null && isAllowOverrideShowCheckListPerspective){
|
|
| 53 | 53 |
service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowChecklistPerspective)); |
| 54 | 54 |
}else{
|
| 55 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowChecklistPerspective, Boolean.toString(this.isShowCheckListPerspective));
|
|
| 55 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowChecklistPerspective, isShowCheckListPerspective != null?Boolean.toString(this.isShowCheckListPerspective): null);
|
|
| 56 | 56 |
pref.setAllowOverride(isAllowOverrideShowCheckListPerspective); |
| 57 | 57 |
service.set(pref); |
| 58 | 58 |
} |
| 59 | 59 |
|
| 60 |
if(isShowTaxonNodeWizard == null){
|
|
| 60 |
if(isShowTaxonNodeWizard == null && isAllowOverrideShowTaxonNodeWizard){
|
|
| 61 | 61 |
service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowTaxonNodeWizard)); |
| 62 | 62 |
}else{
|
| 63 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowTaxonNodeWizard, Boolean.toString(this.isShowTaxonNodeWizard));
|
|
| 63 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowTaxonNodeWizard, isShowTaxonNodeWizard != null? Boolean.toString(this.isShowTaxonNodeWizard): null);
|
|
| 64 | 64 |
pref.setAllowOverride(isAllowOverrideShowTaxonNodeWizard); |
| 65 | 65 |
service.set(pref); |
| 66 | 66 |
} |
| ... | ... | |
| 80 | 80 |
PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowImportExportMenu); |
| 81 | 81 |
CdmPreference pref = service.find(key); |
| 82 | 82 |
if (pref != null){
|
| 83 |
isShowIOMenu = Boolean.valueOf(pref.getValue());
|
|
| 83 |
isShowIOMenu = pref.getValue()!= null?Boolean.valueOf(pref.getValue()): null;
|
|
| 84 | 84 |
isAllowOverrideShowIOMenu = pref.isAllowOverride(); |
| 85 | 85 |
}else{
|
| 86 | 86 |
isShowIOMenu = null; |
| ... | ... | |
| 100 | 100 |
key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowChecklistPerspective); |
| 101 | 101 |
pref = service.find(key); |
| 102 | 102 |
if (pref != null){
|
| 103 |
isShowCheckListPerspective = Boolean.valueOf(pref.getValue());
|
|
| 103 |
isShowCheckListPerspective = pref.getValue()!= null?Boolean.valueOf(pref.getValue()): null;
|
|
| 104 | 104 |
isAllowOverrideShowCheckListPerspective = pref.isAllowOverride(); |
| 105 | 105 |
}else{
|
| 106 | 106 |
isShowCheckListPerspective = null; |
| ... | ... | |
| 110 | 110 |
key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowTaxonNodeWizard); |
| 111 | 111 |
pref = service.find(key); |
| 112 | 112 |
if (pref != null){
|
| 113 |
isShowTaxonNodeWizard = Boolean.valueOf(pref.getValue());
|
|
| 113 |
isShowTaxonNodeWizard = pref.getValue() != null?Boolean.valueOf(pref.getValue()): null;
|
|
| 114 | 114 |
isAllowOverrideShowTaxonNodeWizard = pref.isAllowOverride(); |
| 115 | 115 |
}else{
|
| 116 | 116 |
isShowTaxonNodeWizard = null; |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewAdminConfiguration.java | ||
|---|---|---|
| 60 | 60 |
NameDetailsConfigurator config = createNameDetailsViewConfig(); |
| 61 | 61 |
String value = config.toString(); |
| 62 | 62 |
|
| 63 |
if (isSimpleDetailsViewActivated == null){
|
|
| 63 |
if (isSimpleDetailsViewActivated == null && isAllowOverride){
|
|
| 64 | 64 |
service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.NameDetailsView)); |
| 65 | 65 |
|
| 66 | 66 |
return true; |
| 67 |
}else if (isSimpleDetailsViewActivated == null){
|
|
| 68 |
value = null; |
|
| 67 | 69 |
} |
| 68 | 70 |
CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.NameDetailsView, value); |
| 69 | 71 |
pref.setAllowOverride(isAllowOverride); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/PublishFlagPreference.java | ||
|---|---|---|
| 45 | 45 |
return false; |
| 46 | 46 |
} |
| 47 | 47 |
IPreferenceService service = controller.getPreferenceService(); |
| 48 |
String text = publishFlagBehaviour.getText(); |
|
| 48 |
String textCombo = publishFlagBehaviour.getText(); |
|
| 49 |
String text = null; |
|
| 49 | 50 |
// default -> delete preference |
| 50 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
|
| 51 |
if(textCombo.startsWith(Messages.Preference_Use_Default) && allowOverride){
|
|
| 51 | 52 |
service.remove(pref.getKey()); |
| 52 | 53 |
PreferencesUtil.updateDBPreferences(); |
| 53 | 54 |
return true; |
| 54 |
} |
|
| 55 |
|
|
| 56 |
for (PublishEnum display: PublishEnum.values()){
|
|
| 57 |
if (display.getLabel().equals(text)){
|
|
| 58 |
text = display.getKey(); |
|
| 59 |
break; |
|
| 55 |
}else if (textCombo.startsWith(Messages.Preference_Use_Default)){
|
|
| 56 |
text = null; |
|
| 57 |
}else{
|
|
| 58 |
for (PublishEnum display: PublishEnum.values()){
|
|
| 59 |
if (display.getLabel().equals(text)){
|
|
| 60 |
text = display.getKey(); |
|
| 61 |
break; |
|
| 62 |
} |
|
| 60 | 63 |
} |
| 61 | 64 |
} |
| 62 | 65 |
CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DefaultBehaviourForPublishFlag, text); |
| ... | ... | |
| 81 | 84 |
} |
| 82 | 85 |
else {
|
| 83 | 86 |
allowOverride = pref.isAllowOverride(); |
| 84 |
publishBehaviour = PublishEnum.valueOf(pref.getValue());
|
|
| 87 |
publishBehaviour = pref.getValue() != null? PublishEnum.valueOf(pref.getValue()): null;
|
|
| 85 | 88 |
} |
| 86 | 89 |
} |
| 87 | 90 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SearchDialogAdminPreferences.java | ||
|---|---|---|
| 29 | 29 |
super.getValues(); |
| 30 | 30 |
isAdminPreference = true; |
| 31 | 31 |
if(showIdInSelectionDialogPref != null){
|
| 32 |
showIdInSelectionDialog = Boolean.parseBoolean(showIdInSelectionDialogPref.getValue());
|
|
| 32 |
showIdInSelectionDialog = showIdInSelectionDialogPref.getValue() != null? Boolean.parseBoolean(showIdInSelectionDialogPref.getValue()): null;
|
|
| 33 | 33 |
}else{
|
| 34 | 34 |
showIdInSelectionDialog = null; |
| 35 | 35 |
showIdInSelectionDialogPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowIdInSelectionDialog, null); |
| 36 | 36 |
} |
| 37 | 37 |
if (searchForIdentifierAsDefaultPref != null){
|
| 38 |
searchForIdentifierAsDefault = Boolean.parseBoolean(searchForIdentifierAsDefaultPref.getValue());
|
|
| 38 |
searchForIdentifierAsDefault = searchForIdentifierAsDefaultPref.getValue() != null? Boolean.parseBoolean(searchForIdentifierAsDefaultPref.getValue()): null;
|
|
| 39 | 39 |
}else{
|
| 40 | 40 |
searchForIdentifierAsDefault = null; |
| 41 | 41 |
searchForIdentifierAsDefaultPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.SearchForIdentifierAsDefault, null); |
| 42 | 42 |
} |
| 43 | 43 |
if (searchForIdentifierAndTitleCachePref != null){
|
| 44 |
searchForIdentifierAndTitleCache = Boolean.parseBoolean(searchForIdentifierAndTitleCachePref.getValue());
|
|
| 44 |
searchForIdentifierAndTitleCache = searchForIdentifierAndTitleCachePref.getValue() != null? Boolean.parseBoolean(searchForIdentifierAndTitleCachePref.getValue()): null;
|
|
| 45 | 45 |
}else{
|
| 46 | 46 |
searchForIdentifierAndTitleCache = null; |
| 47 | 47 |
searchForIdentifierAndTitleCachePref =CdmPreference.NewTaxEditorInstance(PreferencePredicate.SearchForIdentifierAndTitleCache, null); |
| 48 | 48 |
} |
| 49 | 49 |
if (sortTaxaByRankAndNamePref != null){
|
| 50 |
sortTaxaByRankAndName = Boolean.parseBoolean(sortTaxaByRankAndNamePref.getValue());
|
|
| 50 |
sortTaxaByRankAndName = sortTaxaByRankAndNamePref.getValue() != null? Boolean.parseBoolean(sortTaxaByRankAndNamePref.getValue()): null;
|
|
| 51 | 51 |
}else{
|
| 52 | 52 |
sortTaxaByRankAndName = null; |
| 53 | 53 |
sortTaxaByRankAndNamePref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.SortTaxaByRankAndName, null); |
| 54 | 54 |
} |
| 55 | 55 |
if (filterCommonNameReferencesPref != null){
|
| 56 |
filterCommonNameReferences = Boolean.parseBoolean(filterCommonNameReferencesPref.getValue());
|
|
| 56 |
filterCommonNameReferences = filterCommonNameReferencesPref.getValue() != null? Boolean.parseBoolean(filterCommonNameReferencesPref.getValue()): null;
|
|
| 57 | 57 |
}else{
|
| 58 | 58 |
filterCommonNameReferences = null; |
| 59 | 59 |
filterCommonNameReferencesPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.CommonNameReferencesWithMarker, null); |
| ... | ... | |
| 70 | 70 |
IPreferenceService service = controller.getPreferenceService(); |
| 71 | 71 |
CdmPreference pref; |
| 72 | 72 |
if (showIdInSelectionDialog != null || !showIdInSelectionDialogPref.isAllowOverride()) {
|
| 73 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowIdInSelectionDialog, showIdInSelectionDialog != null? showIdInSelectionDialog.toString():PreferencePredicate.ShowIdInSelectionDialog.getDefaultValue().toString());
|
|
| 73 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowIdInSelectionDialog, showIdInSelectionDialog != null? showIdInSelectionDialog.toString():null);
|
|
| 74 | 74 |
pref.setAllowOverride(showIdInSelectionDialogPref.isAllowOverride()); |
| 75 | 75 |
service.set(pref); |
| 76 | 76 |
}else{
|
| ... | ... | |
| 79 | 79 |
|
| 80 | 80 |
|
| 81 | 81 |
if(searchForIdentifierAsDefault != null || !searchForIdentifierAsDefaultPref.isAllowOverride()){
|
| 82 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.SearchForIdentifierAsDefault, searchForIdentifierAsDefault!= null? searchForIdentifierAsDefault.toString():PreferencePredicate.SearchForIdentifierAsDefault.getDefaultValue().toString());
|
|
| 82 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.SearchForIdentifierAsDefault, searchForIdentifierAsDefault!= null? searchForIdentifierAsDefault.toString():null);
|
|
| 83 | 83 |
pref.setAllowOverride(searchForIdentifierAsDefaultPref.isAllowOverride()); |
| 84 | 84 |
service.set(pref); |
| 85 | 85 |
}else{
|
| ... | ... | |
| 88 | 88 |
|
| 89 | 89 |
|
| 90 | 90 |
if(searchForIdentifierAndTitleCache != null || !searchForIdentifierAndTitleCachePref.isAllowOverride()){
|
| 91 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.SearchForIdentifierAndTitleCache, searchForIdentifierAndTitleCache!= null? searchForIdentifierAndTitleCache.toString():PreferencePredicate.SearchForIdentifierAndTitleCache.getDefaultValue().toString());
|
|
| 91 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.SearchForIdentifierAndTitleCache, searchForIdentifierAndTitleCache!= null? searchForIdentifierAndTitleCache.toString():null);
|
|
| 92 | 92 |
pref.setAllowOverride(searchForIdentifierAndTitleCachePref.isAllowOverride()); |
| 93 | 93 |
service.set(pref); |
| 94 | 94 |
}else{
|
| ... | ... | |
| 97 | 97 |
|
| 98 | 98 |
if(sortTaxaByRankAndName != null || !sortTaxaByRankAndNamePref.isAllowOverride()){
|
| 99 | 99 |
|
| 100 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.SortTaxaByRankAndName, sortTaxaByRankAndName!= null? sortTaxaByRankAndName.toString():PreferencePredicate.SortTaxaByRankAndName.getDefaultValue().toString());
|
|
| 100 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.SortTaxaByRankAndName, sortTaxaByRankAndName!= null? sortTaxaByRankAndName.toString():null);
|
|
| 101 | 101 |
pref.setAllowOverride(sortTaxaByRankAndNamePref.isAllowOverride()); |
| 102 | 102 |
service.set(pref); |
| 103 | 103 |
}else{
|
| ... | ... | |
| 107 | 107 |
|
| 108 | 108 |
|
| 109 | 109 |
if(filterCommonNameReferences != null || !filterCommonNameReferencesPref.isAllowOverride()){
|
| 110 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.CommonNameReferencesWithMarker, filterCommonNameReferences!= null? filterCommonNameReferences.toString():PreferencePredicate.CommonNameReferencesWithMarker.getDefaultValue().toString());
|
|
| 110 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.CommonNameReferencesWithMarker, filterCommonNameReferences!= null? filterCommonNameReferences.toString():null);
|
|
| 111 | 111 |
pref.setAllowOverride(filterCommonNameReferencesPref.isAllowOverride()); |
| 112 | 112 |
service.set(pref); |
| 113 | 113 |
}else{
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SpecimenAdminPreferences.java | ||
|---|---|---|
| 50 | 50 |
PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowSpecimen); |
| 51 | 51 |
showSpecimenPref = service.find(key); |
| 52 | 52 |
if (showSpecimenPref != null){
|
| 53 |
this.isShowSpecimenRelatedIssues = Boolean.valueOf(showSpecimenPref.getValue());
|
|
| 53 |
this.isShowSpecimenRelatedIssues = showSpecimenPref.getValue() != null? Boolean.valueOf(showSpecimenPref.getValue()): null;
|
|
| 54 | 54 |
this.allowOverrideShowSpecimenRelatedIssues = showSpecimenPref.isAllowOverride(); |
| 55 | 55 |
}else{
|
| 56 |
//showSpecimenPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowSpecimen, Boolean.toString(true)); |
|
| 57 |
// this.isShowSpecimenRelatedIssues = true; |
|
| 58 | 56 |
this.allowOverrideShowSpecimenRelatedIssues = true; |
| 59 | 57 |
} |
| 60 | 58 |
|
| 61 | 59 |
key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowCollectingAreasInGeneralSection); |
| 62 | 60 |
CdmPreference isShowCollectingAreaInGeneralSectionPref = service.find(key); |
| 63 | 61 |
if (isShowCollectingAreaInGeneralSectionPref != null){
|
| 64 |
this.isShowCollectingAreaInGeneralSection = Boolean.valueOf(isShowCollectingAreaInGeneralSectionPref.getValue());
|
|
| 62 |
this.isShowCollectingAreaInGeneralSection = isShowCollectingAreaInGeneralSectionPref.getValue() != null? Boolean.valueOf(isShowCollectingAreaInGeneralSectionPref.getValue()): null;
|
|
| 65 | 63 |
this.allowOverrideShowCollectingAreaInGeneralSection = isShowCollectingAreaInGeneralSectionPref.isAllowOverride(); |
| 66 | 64 |
}else{
|
| 67 | 65 |
// this.isShowCollectingAreaInGeneralSection = (Boolean) PreferencePredicate.ShowCollectingAreasInGeneralSection.getDefaultValue(); |
| ... | ... | |
| 71 | 69 |
key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DeterminationOnlyForFieldUnits); |
| 72 | 70 |
CdmPreference isDeterminationOnlyForFieldUnitsPref = service.find(key); |
| 73 | 71 |
if (isDeterminationOnlyForFieldUnitsPref != null){
|
| 74 |
this.isDeterminationOnlyForFieldUnits = Boolean.valueOf(isDeterminationOnlyForFieldUnitsPref.getValue());
|
|
| 72 |
this.isDeterminationOnlyForFieldUnits = isDeterminationOnlyForFieldUnitsPref.getValue() != null? Boolean.valueOf(isDeterminationOnlyForFieldUnitsPref.getValue()): null;
|
|
| 75 | 73 |
this.allowOverrideDeterminationOnlyForFieldUnits = isDeterminationOnlyForFieldUnitsPref.isAllowOverride(); |
| 76 | 74 |
}else{
|
| 77 |
// this.isDeterminationOnlyForFieldUnits =(Boolean)PreferencePredicate.DeterminationOnlyForFieldUnits.getDefaultValue(); |
|
| 78 | 75 |
this.allowOverrideDeterminationOnlyForFieldUnits = true; |
| 79 | 76 |
} |
| 80 | 77 |
key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowTaxonAssociations); |
| 81 | 78 |
CdmPreference isShowTaxonAssociationPref = service.find(key); |
| 82 | 79 |
if (isShowTaxonAssociationPref != null){
|
| 83 |
this.isShowTaxonAssociation = Boolean.valueOf(isShowTaxonAssociationPref.getValue());
|
|
| 80 |
this.isShowTaxonAssociation = isShowTaxonAssociationPref.getValue() != null? Boolean.valueOf(isShowTaxonAssociationPref.getValue()): null;
|
|
| 84 | 81 |
this.allowOverrideShowTaxonAssociation = isShowTaxonAssociationPref.isAllowOverride(); |
| 85 | 82 |
}else{
|
| 86 |
// this.isShowTaxonAssociation = (Boolean)PreferencePredicate.ShowTaxonAssociations.getDefaultValue(); |
|
| 87 | 83 |
this.allowOverrideShowTaxonAssociation = true; |
| 88 | 84 |
} |
| 89 | 85 |
|
| 90 | 86 |
key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowLifeForm); |
| 91 | 87 |
CdmPreference isShowLifeFormPref = service.find(key); |
| 92 | 88 |
if (isShowLifeFormPref != null){
|
| 93 |
this.isShowLifeForm = Boolean.valueOf(isShowLifeFormPref.getValue());
|
|
| 89 |
this.isShowLifeForm = isShowLifeFormPref.getValue() != null? Boolean.valueOf(isShowLifeFormPref.getValue()): null;
|
|
| 94 | 90 |
this.allowOverrideShowLifeForm = isShowLifeFormPref.isAllowOverride(); |
| 95 | 91 |
} else{
|
| 96 |
// this.isShowLifeForm = (Boolean)PreferencePredicate.ShowLifeForm.getDefaultValue(); |
|
| 97 | 92 |
this.allowOverrideShowLifeForm = true; |
| 98 | 93 |
} |
| 99 | 94 |
|
| ... | ... | |
| 109 | 104 |
if (controller != null){
|
| 110 | 105 |
IPreferenceService service = controller.getPreferenceService(); |
| 111 | 106 |
CdmPreference pref; |
| 112 |
if (isShowCollectingAreaInGeneralSection == null){
|
|
| 107 |
if (isShowCollectingAreaInGeneralSection == null && allowOverrideShowCollectingAreaInGeneralSection){
|
|
| 113 | 108 |
service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowCollectingAreasInGeneralSection)); |
| 114 | 109 |
}else{
|
| 115 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowCollectingAreasInGeneralSection, Boolean.toString(this.isShowCollectingAreaInGeneralSection));
|
|
| 110 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowCollectingAreasInGeneralSection, this.isShowCollectingAreaInGeneralSection != null? Boolean.toString(this.isShowCollectingAreaInGeneralSection): null);
|
|
| 116 | 111 |
pref.setAllowOverride(allowOverrideShowCollectingAreaInGeneralSection); |
| 117 | 112 |
service.set(pref); |
| 118 | 113 |
} |
| 119 |
if (isShowSpecimenRelatedIssues == null){
|
|
| 114 |
if (isShowSpecimenRelatedIssues == null && allowOverrideShowSpecimenRelatedIssues){
|
|
| 120 | 115 |
service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowSpecimen)); |
| 121 | 116 |
}else{
|
| 122 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowSpecimen, Boolean.toString(this.isShowSpecimenRelatedIssues));
|
|
| 117 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowSpecimen, isShowSpecimenRelatedIssues != null? Boolean.toString(this.isShowSpecimenRelatedIssues): null);
|
|
| 123 | 118 |
pref.setAllowOverride(allowOverrideShowSpecimenRelatedIssues); |
| 124 | 119 |
service.set(pref); |
| 125 | 120 |
} |
| 126 | 121 |
|
| 127 |
if (isDeterminationOnlyForFieldUnits == null){
|
|
| 122 |
if (isDeterminationOnlyForFieldUnits == null && allowOverrideDeterminationOnlyForFieldUnits){
|
|
| 128 | 123 |
service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DeterminationOnlyForFieldUnits)); |
| 129 | 124 |
}else{
|
| 130 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DeterminationOnlyForFieldUnits, Boolean.toString(this.isDeterminationOnlyForFieldUnits));
|
|
| 125 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DeterminationOnlyForFieldUnits, isDeterminationOnlyForFieldUnits != null? Boolean.toString(this.isDeterminationOnlyForFieldUnits): null);
|
|
| 131 | 126 |
pref.setAllowOverride(allowOverrideDeterminationOnlyForFieldUnits); |
| 132 | 127 |
service.set(pref); |
| 133 | 128 |
} |
| 134 |
if (isShowTaxonAssociation == null){
|
|
| 129 |
if (isShowTaxonAssociation == null && allowOverrideShowTaxonAssociation){
|
|
| 135 | 130 |
service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowTaxonAssociations)); |
| 136 | 131 |
}else{
|
| 137 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowTaxonAssociations, Boolean.toString(this.isShowTaxonAssociation));
|
|
| 132 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowTaxonAssociations, isShowTaxonAssociation != null? Boolean.toString(this.isShowTaxonAssociation): null);
|
|
| 138 | 133 |
pref.setAllowOverride(allowOverrideShowTaxonAssociation); |
| 139 | 134 |
service.set(pref); |
| 140 | 135 |
} |
| 141 |
if (isShowLifeForm == null){
|
|
| 136 |
if (isShowLifeForm == null && allowOverrideShowLifeForm){
|
|
| 142 | 137 |
service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowLifeForm)); |
| 143 | 138 |
}else{
|
| 144 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowLifeForm, Boolean.toString(this.isShowLifeForm));
|
|
| 139 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowLifeForm, isShowLifeForm != null? Boolean.toString(this.isShowLifeForm): null);
|
|
| 145 | 140 |
pref.setAllowOverride(allowOverrideShowLifeForm); |
| 146 | 141 |
service.set(pref); |
| 147 | 142 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SupplementalDataSourceAdminPreference.java | ||
|---|---|---|
| 29 | 29 |
return true; |
| 30 | 30 |
} |
| 31 | 31 |
boolean setToDefault = false; |
| 32 |
if (isShowIDSource== null){
|
|
| 32 |
if (isShowIDSource == null && isAllowOverrideShowIDSource){
|
|
| 33 | 33 |
setToDefault = true; |
| 34 |
isShowIDSource= true; |
|
| 35 | 34 |
} |
| 36 |
CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowIdInSource, Boolean.toString(this.isShowIDSource)); |
|
| 35 |
|
|
| 36 |
CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowIdInSource, isShowIDSource != null? Boolean.toString(this.isShowIDSource): null); |
|
| 37 | 37 |
pref.setAllowOverride(isAllowOverrideShowIDSource); |
| 38 | 38 |
PreferencesUtil.setPreferencesToDB(pref, setToDefault); |
| 39 |
|
|
| 40 |
if (isShowIDNamespace== null){
|
|
| 39 |
setToDefault = false; |
|
| 40 |
if (isShowIDNamespace== null && isAllowOverrideShowIDNamespace){
|
|
| 41 | 41 |
setToDefault = true; |
| 42 |
isShowIDNamespace = true; |
|
| 42 |
|
|
| 43 | 43 |
} |
| 44 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowNamespaceInSource, Boolean.toString(this.isShowIDNamespace));
|
|
| 44 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowNamespaceInSource, isShowIDNamespace != null? Boolean.toString(this.isShowIDNamespace): null);
|
|
| 45 | 45 |
pref.setAllowOverride(isAllowOverrideShowIDNamespace); |
| 46 | 46 |
PreferencesUtil.setPreferencesToDB(pref, setToDefault); |
| 47 | 47 |
|
| 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 |
// if (preference == null){
|
|
| 397 |
// checkAllowOverride.setEnabled(false);
|
|
| 398 |
// }else{
|
|
| 399 |
// checkAllowOverride.setEnabled(true);
|
|
| 400 |
// }
|
|
| 401 | 401 |
}else{
|
| 402 | 402 |
checkAllowOverride.setSelection(override); |
| 403 | 403 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java | ||
|---|---|---|
| 182 | 182 |
if (isAdminPreference) {
|
| 183 | 183 |
allowOverrideRankButton = createAllowOverrideButton(child); |
| 184 | 184 |
allowOverrideRankButton.setSelection(prefRank != null? prefRank.isAllowOverride():true); |
| 185 |
allowOverrideRankButton.setEnabled(prefRank != null); |
|
| 185 |
// allowOverrideRankButton.setEnabled(prefRank != null);
|
|
| 186 | 186 |
allowOverrideRankButton.addSelectionListener(new SelectionAdapter() {
|
| 187 | 187 |
@Override |
| 188 | 188 |
public void widgetSelected(SelectionEvent e) {
|
| ... | ... | |
| 216 | 216 |
if (isAdminPreference) {
|
| 217 | 217 |
allowOverrideOrderAreasButton = createAllowOverrideButton(child); |
| 218 | 218 |
allowOverrideOrderAreasButton.setSelection(prefAreaSort != null? prefAreaSort.isAllowOverride(): true); |
| 219 |
allowOverrideOrderAreasButton.setEnabled(prefAreaSort != null); |
|
| 219 |
//allowOverrideOrderAreasButton.setEnabled(prefAreaSort != null);
|
|
| 220 | 220 |
allowOverrideOrderAreasButton.addSelectionListener(new SelectionAdapter() {
|
| 221 | 221 |
@Override |
| 222 | 222 |
public void widgetSelected(SelectionEvent e) {
|
| ... | ... | |
| 252 | 252 |
if (isAdminPreference) {
|
| 253 | 253 |
allowOverrideAreaDisplayButton = createAllowOverrideButton(child); |
| 254 | 254 |
allowOverrideAreaDisplayButton.setSelection(prefAreaDisplay != null? prefAreaDisplay.isAllowOverride(): true); |
| 255 |
allowOverrideAreaDisplayButton.setEnabled(prefAreaDisplay != null); |
|
| 255 |
//allowOverrideAreaDisplayButton.setEnabled(prefAreaDisplay != null);
|
|
| 256 | 256 |
allowOverrideAreaDisplayButton.addSelectionListener(new SelectionAdapter() {
|
| 257 | 257 |
@Override |
| 258 | 258 |
public void widgetSelected(SelectionEvent e) {
|
| ... | ... | |
| 287 | 287 |
if (isAdminPreference) {
|
| 288 | 288 |
allowOverrideStatusDisplayButton = createAllowOverrideButton(child); |
| 289 | 289 |
allowOverrideStatusDisplayButton.setSelection(prefStatusDisplay != null ? prefStatusDisplay.isAllowOverride(): true); |
| 290 |
allowOverrideStatusDisplayButton.setEnabled(prefStatusDisplay != null); |
|
| 290 |
//allowOverrideStatusDisplayButton.setEnabled(prefStatusDisplay != null);
|
|
| 291 | 291 |
allowOverrideStatusDisplayButton.addSelectionListener(new SelectionAdapter() {
|
| 292 | 292 |
@Override |
| 293 | 293 |
public void widgetSelected(SelectionEvent e) {
|
| ... | ... | |
| 322 | 322 |
if (isAdminPreference) {
|
| 323 | 323 |
allowOverrideStatusDisplayInComboButton = createAllowOverrideButton(child); |
| 324 | 324 |
allowOverrideStatusDisplayInComboButton.setSelection(prefStatusDisplayInCombo != null ? prefStatusDisplayInCombo.isAllowOverride(): true); |
| 325 |
allowOverrideStatusDisplayInComboButton.setEnabled(prefStatusDisplayInCombo != null); |
|
| 325 |
//allowOverrideStatusDisplayInComboButton.setEnabled(prefStatusDisplayInCombo != null);
|
|
| 326 | 326 |
allowOverrideStatusDisplayInComboButton.addSelectionListener(new SelectionAdapter() {
|
| 327 | 327 |
@Override |
| 328 | 328 |
public void widgetSelected(SelectionEvent e) {
|
| ... | ... | |
| 446 | 446 |
String text = statusDisplaySelectionCombo.getText(); |
| 447 | 447 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
| 448 | 448 |
displayStatus = null; |
| 449 |
if(isAdminPreference){
|
|
| 450 |
prefStatusDisplay.setAllowOverride(true); |
|
| 451 |
allowOverrideStatusDisplayButton.setSelection(true); |
|
| 452 |
allowOverrideStatusDisplayButton.setEnabled(false); |
|
| 453 |
} |
|
| 454 |
|
|
| 455 | 449 |
return; |
| 456 | 450 |
} |
| 457 |
allowOverrideStatusDisplayButton.setEnabled(true); |
|
| 451 |
|
|
| 458 | 452 |
for (TermDisplayEnum display : TermDisplayEnum.values()) {
|
| 459 | 453 |
if (text.startsWith(display.getLabel())) {
|
| 460 | 454 |
displayStatus = display; |
| ... | ... | |
| 467 | 461 |
String text = statusDisplayInComboSelectionCombo.getText(); |
| 468 | 462 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
| 469 | 463 |
displayStatusCombo = null; |
| 470 |
if(isAdminPreference){
|
|
| 471 |
prefStatusDisplayInCombo.setAllowOverride(true); |
|
| 472 |
allowOverrideStatusDisplayInComboButton.setSelection(true); |
|
| 473 |
allowOverrideStatusDisplayInComboButton.setEnabled(false); |
|
| 474 |
} |
|
| 475 |
|
|
| 476 | 464 |
return; |
| 477 | 465 |
} |
| 478 |
allowOverrideStatusDisplayInComboButton.setEnabled(true); |
|
| 466 |
|
|
| 479 | 467 |
for (TermComboEnum display : TermComboEnum.values()) {
|
| 480 | 468 |
if (text.startsWith(display.getLabel())) {
|
| 481 | 469 |
displayStatusCombo = display; |
| ... | ... | |
| 488 | 476 |
String text = areaDisplaySelectionCombo.getText(); |
| 489 | 477 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
| 490 | 478 |
displayArea = null; |
| 491 |
if (isAdminPreference){
|
|
| 492 |
prefAreaDisplay.setAllowOverride(true); |
|
| 493 |
allowOverrideAreaDisplayButton.setSelection(true); |
|
| 494 |
allowOverrideAreaDisplayButton.setEnabled(false); |
|
| 495 |
} |
|
| 496 | 479 |
return; |
| 497 | 480 |
} |
| 498 |
allowOverrideAreaDisplayButton.setEnabled(true); |
|
| 481 |
|
|
| 499 | 482 |
for (TermDisplayEnum display : TermDisplayEnum.values()) {
|
| 500 | 483 |
if (text.startsWith(display.getLabel())) {
|
| 501 | 484 |
displayArea = display; |
| ... | ... | |
| 507 | 490 |
String text = areaOrderSelectionCombo.getText(); |
| 508 | 491 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
| 509 | 492 |
orderAreas = null; |
| 510 |
if (isAdminPreference){
|
|
| 511 |
prefAreaSort.setAllowOverride(true); |
|
| 512 |
allowOverrideOrderAreasButton.setSelection(true); |
|
| 513 |
allowOverrideOrderAreasButton.setEnabled(false); |
|
| 514 |
} |
|
| 515 | 493 |
return; |
| 516 | 494 |
} |
| 517 |
allowOverrideOrderAreasButton.setEnabled(true); |
|
| 495 |
|
|
| 518 | 496 |
for (TermOrder display : TermOrder.values()) {
|
| 519 | 497 |
if (text.startsWith(display.getLabel())) {
|
| 520 | 498 |
orderAreas = display; |
| ... | ... | |
| 526 | 504 |
String text = activateRankCombo.getText(); |
| 527 | 505 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
| 528 | 506 |
isShowRank = null; |
| 529 |
if (isAdminPreference){
|
|
| 530 |
prefRank.setAllowOverride(true); |
|
| 531 |
allowOverrideRankButton.setSelection(true); |
|
| 532 |
allowOverrideRankButton.setEnabled(false); |
|
| 533 |
} |
|
| 534 | 507 |
return; |
| 535 | 508 |
} |
| 536 |
allowOverrideRankButton.setEnabled(true); |
|
| 509 |
|
|
| 537 | 510 |
if (text.equals(SHOW_RANK)){
|
| 538 | 511 |
isShowRank = true; |
| 539 | 512 |
}else{
|
| ... | ... | |
| 545 | 518 |
String text = activateCombo.getText(); |
| 546 | 519 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
| 547 | 520 |
isEditorActivated = null; |
| 548 |
if (isAdminPreference){
|
|
| 549 |
if (distributionEditorPref == null){
|
|
| 550 |
distributionEditorPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DistributionEditorActivated, PreferencePredicate.DistributionEditorActivated.getDefaultValue() != null ? PreferencePredicate.DistributionEditorActivated.getDefaultValue().toString(): null); |
|
| 551 |
} |
|
| 552 |
distributionEditorPref.setAllowOverride(true); |
|
| 553 |
allowOverrideActivatedButton.setSelection(true); |
|
| 554 |
allowOverrideActivatedButton.setEnabled(false); |
|
| 555 |
} |
|
| 556 | 521 |
return; |
| 557 | 522 |
} |
| 558 |
allowOverrideActivatedButton.setEnabled(true); |
|
| 523 |
|
|
| 559 | 524 |
if (text.equals(ENABLE)){
|
| 560 | 525 |
isEditorActivated = true; |
| 561 | 526 |
}else{
|
| ... | ... | |
| 563 | 528 |
} |
| 564 | 529 |
|
| 565 | 530 |
} |
| 566 |
//PreferencesUtil.recursiveSetEnabled(child, isEditorActivated); |
|
| 531 |
|
|
| 567 | 532 |
} |
| 568 | 533 |
|
| 569 | 534 |
/** |
| ... | ... | |
| 594 | 559 |
} |
| 595 | 560 |
|
| 596 | 561 |
} else {
|
| 597 |
isEditorActivated = Boolean.valueOf(distributionEditorPref.getValue());
|
|
| 562 |
isEditorActivated = distributionEditorPref.getValue() != null? Boolean.valueOf(distributionEditorPref.getValue()): null;
|
|
| 598 | 563 |
} |
| 599 | 564 |
|
| 600 | 565 |
} else {
|
| ... | ... | |
| 622 | 587 |
displayArea = null; |
| 623 | 588 |
} |
| 624 | 589 |
} else {
|
| 625 |
displayArea = TermDisplayEnum.byKey(prefAreaDisplay.getValue());
|
|
| 590 |
displayArea = prefAreaDisplay.getValue() != null? TermDisplayEnum.byKey(prefAreaDisplay.getValue()): null;
|
|
| 626 | 591 |
} |
| 627 | 592 |
} else {
|
| 628 | 593 |
if (overrideAreaDisplay){
|
| ... | ... | |
| 645 | 610 |
displayStatus = null; |
| 646 | 611 |
} |
| 647 | 612 |
} else {
|
| 648 |
this.displayStatus = TermDisplayEnum.byKey(prefStatusDisplay.getValue());
|
|
| 613 |
this.displayStatus = prefStatusDisplay.getValue() != null? TermDisplayEnum.byKey(prefStatusDisplay.getValue()): null;
|
|
| 649 | 614 |
} |
| 650 | 615 |
} else {
|
| 651 | 616 |
if (overrideStatusDisplay){
|
| ... | ... | |
| 668 | 633 |
displayStatusCombo = null; |
| 669 | 634 |
} |
| 670 | 635 |
} else {
|
| 671 |
this.displayStatusCombo = TermComboEnum.byKey(prefStatusDisplayInCombo.getValue());
|
|
| 636 |
this.displayStatusCombo = prefStatusDisplayInCombo.getValue() != null? TermComboEnum.byKey(prefStatusDisplayInCombo.getValue()): null;
|
|
| 672 | 637 |
} |
| 673 | 638 |
} else {
|
| 674 | 639 |
if (overrideStatusDisplayCombo){
|
| ... | ... | |
| 693 | 658 |
} |
| 694 | 659 |
} else {
|
| 695 | 660 |
if (prefAreaSort.getValue() != null) {
|
| 696 |
orderAreas = TermOrder.valueOf(prefAreaSort.getValue().toString());
|
|
| 661 |
orderAreas = prefAreaSort.getValue() != null? TermOrder.valueOf(prefAreaSort.getValue().toString()): null;
|
|
| 697 | 662 |
} else {
|
| 698 | 663 |
orderAreas = ((TermOrder) PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue()); |
| 699 | 664 |
} |
| ... | ... | |
| 719 | 684 |
} |
| 720 | 685 |
|
| 721 | 686 |
} else {
|
| 722 |
this.isShowRank = Boolean.valueOf(prefRank.getValue().toString());
|
|
| 687 |
this.isShowRank = prefRank.getValue() != null? Boolean.valueOf(prefRank.getValue().toString()): null;
|
|
| 723 | 688 |
} |
| 724 | 689 |
} else {
|
| 725 | 690 |
if (overrideRank){
|
| ... | ... | |
| 737 | 702 |
if (prefOwnDescription.isAllowOverride()) {
|
| 738 | 703 |
ownDescriptionForDistributionEditor = PreferencesUtil.isOwnDescriptionForChecklistEditor(); |
| 739 | 704 |
} else {
|
| 740 |
ownDescriptionForDistributionEditor = Boolean.valueOf(prefOwnDescription.getValue().toString());
|
|
| 705 |
ownDescriptionForDistributionEditor = prefOwnDescription.getValue() != null? Boolean.valueOf(prefOwnDescription.getValue().toString()): null;
|
|
| 741 | 706 |
} |
| 742 | 707 |
} else {
|
| 743 | 708 |
ownDescriptionForDistributionEditor = PreferencesUtil.isShowRankInChecklistEditor(); |
| 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 | 238 |
}else if (text.equals(SHOW)){
|
| 239 | 239 |
isShowIOMenu = true; |
| 240 | 240 |
isOverrideShowIOMenu = true; |
| ... | ... | |
| 249 | 249 |
if (text.startsWith(Messages.Preference_Use_Default)){
|
| 250 | 250 |
isOverrideShowCheckListPerspective = false; |
| 251 | 251 |
isShowCheckListPerspective = null; |
| 252 |
isAllowOverrideShowCheckListPerspective = true; |
|
| 252 |
|
|
| 253 | 253 |
}else if (text.equals(SHOW)){
|
| 254 | 254 |
isShowCheckListPerspective = true; |
| 255 | 255 |
isOverrideShowCheckListPerspective = true; |
| ... | ... | |
| 263 | 263 |
if (text.startsWith(Messages.Preference_Use_Default)){
|
| 264 | 264 |
isOverrideShowTaxonNodeWizard = false; |
| 265 | 265 |
isShowTaxonNodeWizard = null; |
| 266 |
isAllowOverrideShowTaxonNodeWizard = true; |
|
| 266 |
|
|
| 267 | 267 |
}else if (text.equals(SHOW)){
|
| 268 | 268 |
isShowTaxonNodeWizard = true; |
| 269 | 269 |
isOverrideShowTaxonNodeWizard = true; |
| ... | ... | |
| 306 | 306 |
protected void setSelections(){
|
| 307 | 307 |
if (isShowIOMenu == null || (!isOverrideShowIOMenu && !isAdminPreference)){
|
| 308 | 308 |
showIOMenuButton.select(0); |
| 309 |
if (isAdminPreference){
|
|
| 310 |
allowOverrideShowIOMenuButton.setEnabled(false); |
|
| 311 |
} |
|
| 309 |
// if (isAdminPreference){
|
|
| 310 |
// allowOverrideShowIOMenuButton.setEnabled(false);
|
|
| 311 |
// }
|
|
| 312 | 312 |
}else{
|
| 313 |
if (isAdminPreference){
|
|
| 314 |
allowOverrideShowIOMenuButton.setEnabled(true); |
|
| 315 |
} |
|
| 313 |
// if (isAdminPreference){
|
|
| 314 |
// allowOverrideShowIOMenuButton.setEnabled(true);
|
|
| 315 |
// }
|
|
| 316 | 316 |
if (isShowIOMenu){
|
| 317 | 317 |
showIOMenuButton.select(1); |
| 318 | 318 |
}else{
|
| ... | ... | |
| 322 | 322 |
|
| 323 | 323 |
if (isShowCheckListPerspective == null || (!isOverrideShowCheckListPerspective && !isAdminPreference)){
|
| 324 | 324 |
showChecklistPerspectiveButton.select(0); |
| 325 |
if (isAdminPreference){
|
|
| 326 |
allowOverrideShowChecklistButton.setEnabled(false); |
|
| 327 |
} |
|
| 325 |
// if (isAdminPreference){
|
|
| 326 |
// allowOverrideShowChecklistButton.setEnabled(false);
|
|
| 327 |
// }
|
|
| 328 | 328 |
}else{
|
| 329 |
if (isAdminPreference){
|
|
| 330 |
allowOverrideShowChecklistButton.setEnabled(true); |
|
| 331 |
} |
|
| 329 |
// if (isAdminPreference){
|
|
| 330 |
// allowOverrideShowChecklistButton.setEnabled(true);
|
|
| 331 |
// }
|
|
| 332 | 332 |
if (isShowCheckListPerspective){
|
| 333 | 333 |
showChecklistPerspectiveButton.select(1); |
| 334 | 334 |
}else{
|
| ... | ... | |
| 338 | 338 |
|
| 339 | 339 |
if (isShowTaxonNodeWizard == null || (!isOverrideShowTaxonNodeWizard && !isAdminPreference)){
|
| 340 | 340 |
showTaxonNodeWizardButton.select(0); |
| 341 |
if (isAdminPreference){
|
|
| 342 |
allowOverrideShowTaxonNodeWizardButton.setEnabled(false); |
|
| 343 |
} |
|
| 341 |
// if (isAdminPreference){
|
|
| 342 |
// allowOverrideShowTaxonNodeWizardButton.setEnabled(false);
|
|
| 343 |
// }
|
|
| 344 | 344 |
}else{
|
| 345 |
if (isAdminPreference){
|
|
| 346 |
allowOverrideShowTaxonNodeWizardButton.setEnabled(true); |
|
| 347 |
} |
|
| 345 |
// if (isAdminPreference){
|
|
| 346 |
// allowOverrideShowTaxonNodeWizardButton.setEnabled(true);
|
|
| 347 |
// }
|
|
| 348 | 348 |
if (isShowTaxonNodeWizard){
|
| 349 | 349 |
showTaxonNodeWizardButton.select(1); |
| 350 | 350 |
}else{
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageRepresentationPreferencePage.java | ||
|---|---|---|
| 94 | 94 |
*/ |
| 95 | 95 |
@Override |
| 96 | 96 |
public void widgetSelected(SelectionEvent e) {
|
| 97 |
setApply(true); |
|
| 97 |
|
|
| 98 | 98 |
int selectionIndex = combo_globalLanguage.getSelectionIndex(); |
| 99 | 99 |
globalLanguage = CdmStore.getCurrentApplicationConfiguration().getTermService().getLanguageByLabel(combo_globalLanguage.getItem(selectionIndex)); |
| 100 |
setApply(true); |
|
| 100 | 101 |
} |
| 101 | 102 |
}); |
| 102 | 103 |
} |
| 103 | 104 |
|
| 104 | 105 |
private void createSetMultiLanguageTextEditingCapability(Composite parent) {
|
| 105 |
isMultilanguageTextEditingCapability = getPreferenceStore().getBoolean(IPreferenceKeys.MULTILANGUAGE_TEXT_EDITING_CAPABILITY);
|
|
| 106 |
isMultilanguageTextEditingCapability = PreferencesUtil.getBooleanValue(IPreferenceKeys.MULTILANGUAGE_TEXT_EDITING_CAPABILITY);
|
|
| 106 | 107 |
|
| 107 | 108 |
final Composite composite = createComposite(parent); |
| 108 | 109 |
|
| ... | ... | |
| 128 | 129 |
|
| 129 | 130 |
@Override |
| 130 | 131 |
public boolean performOk() {
|
| 131 |
if (isApply()){
|
|
| 132 |
PreferencesUtil.setBooleanValue(IPreferenceKeys.MULTILANGUAGE_TEXT_EDITING_CAPABILITY, isMultilanguageTextEditingCapability); |
|
| 133 |
PreferencesUtil.setGlobalLanguage(globalLanguage); |
|
| 132 |
if (!isApply()){
|
|
| 133 |
return true; |
|
| 134 | 134 |
} |
| 135 |
PreferencesUtil.setBooleanValue(IPreferenceKeys.MULTILANGUAGE_TEXT_EDITING_CAPABILITY, isMultilanguageTextEditingCapability); |
|
| 136 |
PreferencesUtil.setGlobalLanguage(globalLanguage); |
|
| 137 |
|
|
| 135 | 138 |
return super.performOk(); |
| 136 | 139 |
} |
| 137 | 140 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/MediaPreferences.java | ||
|---|---|---|
| 42 | 42 |
advanced.setPreferenceStore(getPreferenceStore()); |
| 43 | 43 |
advanced.load(); |
| 44 | 44 |
|
| 45 |
|
|
| 45 | 46 |
Label mediaView = new Label(top, SWT.NULL); |
| 46 | 47 |
mediaView.setText("Media View");
|
| 47 | 48 |
preview = new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_MEDIA_PREVIEW), |
| 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 |
// allowLocalPreference.setEnabled(isSimpleDetailsViewActivated != null);
|
|
| 462 | 462 |
} |
| 463 | 463 |
showTaxon.setSelection(isShowTaxon); |
| 464 | 464 |
showLsid.setSelection(isShowLSID); |
| ... | ... | |
| 521 | 521 |
String text = activateCheckButton.getText(); |
| 522 | 522 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
| 523 | 523 |
isSimpleDetailsViewActivated = null; |
| 524 |
if (isAdminPreference){
|
|
| 525 |
if (nameDetailsPref != null){
|
|
| 526 |
nameDetailsPref.setAllowOverride(true); |
|
| 527 |
} |
|
| 528 |
allowLocalPreference.setSelection(true); |
|
| 529 |
}else{
|
|
| 524 |
if (!isAdminPreference){
|
|
| 530 | 525 |
isOverride = false; |
| 531 | 526 |
} |
| 532 | 527 |
PreferencesUtil.recursiveSetEnabled(dbSettings, isSimpleDetailsViewActivated!= null? (isSimpleDetailsViewActivated && isOverride):false); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java | ||
|---|---|---|
| 105 | 105 |
allowOverrideButton.setText(Messages.GeneralPreference_allowOverride); |
| 106 | 106 |
allowOverrideButton.setSelection(allowOverride); |
| 107 | 107 |
if (actualCode == null){
|
| 108 |
allowOverrideButton.setEnabled(false); |
|
| 108 |
// allowOverrideButton.setEnabled(false);
|
|
| 109 | 109 |
} |
| 110 | 110 |
allowOverrideButton.addSelectionListener(new SelectionAdapter(){
|
| 111 | 111 |
@Override |
| ... | ... | |
| 128 | 128 |
} |
| 129 | 129 |
} |
| 130 | 130 |
if (isAdminPreference){
|
| 131 |
allowOverrideButton.setEnabled(actualCode != null); |
|
| 131 |
// allowOverrideButton.setEnabled(actualCode != null);
|
|
| 132 | 132 |
//if default value is selected, allow override is true |
| 133 | 133 |
allowOverrideButton.setSelection(allowOverride || (actualCode == null)); |
| 134 | 134 |
} |
| ... | ... | |
| 197 | 197 |
|
| 198 | 198 |
if (isAdminPreference){
|
| 199 | 199 |
allowOverrideButton.setSelection(allowOverride); |
| 200 |
allowOverrideButton.setEnabled(false); |
|
| 200 |
// allowOverrideButton.setEnabled(false);
|
|
| 201 | 201 |
} |
| 202 | 202 |
setApply(true); |
| 203 | 203 |
super.performDefaults(); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java | ||
|---|---|---|
| 496 | 496 |
public static NomenclaturalCode getPreferredNomenclaturalCode(String preferenceKeyNomenclaturalCode) {
|
| 497 | 497 |
|
| 498 | 498 |
for (NomenclaturalCode code : NomenclaturalCodeHelper.getAllCodes()) {
|
| 499 |
if (getPreferenceKey(code).equals(preferenceKeyNomenclaturalCode)) {
|
|
| 499 |
if (getPreferenceKey(code).equals(preferenceKeyNomenclaturalCode) || code.getKey().equals(preferenceKeyNomenclaturalCode)) {
|
|
| 500 | 500 |
return code; |
| 501 | 501 |
} |
| 502 | 502 |
} |
| ... | ... | |
| 1372 | 1372 |
config.setNameRelationsSectionActivated(getValue(sectionMap,"nameRelation")); |
| 1373 | 1373 |
config.setHybridActivated(getValue(sectionMap,"hybrid")); |
| 1374 | 1374 |
config.setNameApprobiationActivated(getValue(sectionMap, "nameApproviation")); |
| 1375 |
}else {
|
|
| 1376 |
return null; |
|
| 1375 | 1377 |
} |
| 1376 | 1378 |
return config; |
| 1377 | 1379 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishFlagLocalPreference.java | ||
|---|---|---|
| 95 | 95 |
publishBehaviour = (PublishEnum)publishFlagBehaviour.getData(publishFlagBehaviour.getText()); |
| 96 | 96 |
}else{
|
| 97 | 97 |
publishBehaviour = null; |
| 98 |
allowOverride = true; |
|
| 99 |
|
|
| 100 | 98 |
} |
| 101 | 99 |
if (isAdminPreference){
|
| 102 |
allowOverrideButton.setEnabled(publishBehaviour != null); |
|
| 103 | 100 |
allowOverrideButton.setSelection(allowOverride); |
| 104 | 101 |
} |
| 105 | 102 |
} |
| ... | ... | |
| 114 | 111 |
allowOverrideButton = createAllowOverrideButton(composite); |
| 115 | 112 |
allowOverrideButton.setText(Messages.GeneralPreference_override); |
| 116 | 113 |
allowOverrideButton.setSelection(allowOverride); |
| 117 |
allowOverrideButton.setEnabled(publishBehaviour != null); |
|
| 118 | 114 |
allowOverrideButton.addSelectionListener(new SelectionAdapter(){
|
| 119 | 115 |
@Override |
| 120 | 116 |
public void widgetSelected(SelectionEvent e) {
|
| ... | ... | |
| 196 | 192 |
index++; |
| 197 | 193 |
} |
| 198 | 194 |
allowOverrideButton.setSelection(allowOverride); |
| 199 |
allowOverrideButton.setEnabled(pref != null); |
|
| 200 | 195 |
super.performDefaults(); |
| 201 | 196 |
} |
| 202 | 197 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchDialogPreferences.java | ||
|---|---|---|
| 105 | 105 |
String text = showIdInSelectionDialogButton.getText(); |
| 106 | 106 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
| 107 | 107 |
showIdInSelectionDialog = null; |
| 108 |
if (isAdminPreference){
|
|
| 109 |
showIdInSelectionDialogPref.setAllowOverride(true); |
|
| 110 |
allowOverrideIsShowIdInSelectionDialogButton.setSelection(true); |
|
| 111 |
allowOverrideIsShowIdInSelectionDialogButton.setEnabled(false); |
|
| 112 |
} |
|
| 113 | 108 |
return; |
| 114 | 109 |
} |
| 115 |
if (isAdminPreference){
|
|
| 116 |
allowOverrideIsShowIdInSelectionDialogButton.setEnabled(true); |
|
| 117 |
} |
|
| 110 |
|
|
| 118 | 111 |
if (text.equals(Messages.GeneralPreference_yes)){
|
| 119 | 112 |
showIdInSelectionDialog = true; |
| 120 | 113 |
}else{
|
| ... | ... | |
| 126 | 119 |
String text = searchForIdentifierAsDefaultButton.getText(); |
| 127 | 120 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
| 128 | 121 |
searchForIdentifierAsDefault = null; |
| 129 |
if (isAdminPreference){
|
|
| 130 |
searchForIdentifierAsDefaultPref.setAllowOverride(true); |
|
| 131 |
allowOverrideSearchForIdentifierAsDefaultButton.setSelection(true); |
|
| 132 |
allowOverrideSearchForIdentifierAsDefaultButton.setEnabled(false); |
|
| 133 |
} |
|
| 134 | 122 |
return; |
| 135 | 123 |
} |
| 136 |
if (isAdminPreference){
|
|
| 137 |
allowOverrideSearchForIdentifierAsDefaultButton.setEnabled(true); |
|
| 138 |
} |
|
| 124 |
|
|
| 139 | 125 |
if (text.equals(Messages.GeneralPreference_yes)){
|
| 140 | 126 |
searchForIdentifierAsDefault = true; |
| 141 | 127 |
}else{
|
| ... | ... | |
| 147 | 133 |
String text = searchForIdentifierAndTitleCacheButton.getText(); |
| 148 | 134 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
| 149 | 135 |
searchForIdentifierAndTitleCache = null; |
| 150 |
if (isAdminPreference){
|
|
| 151 |
searchForIdentifierAndTitleCachePref.setAllowOverride(true); |
|
| 152 |
allowOverridesSearchForIdentifierAndTitleCacheButton.setSelection(true); |
|
| 153 |
allowOverridesSearchForIdentifierAndTitleCacheButton.setEnabled(false); |
|
| 154 |
} |
|
| 155 | 136 |
return; |
| 156 | 137 |
} |
| 157 |
if (isAdminPreference){
|
|
| 158 |
allowOverridesSearchForIdentifierAndTitleCacheButton.setEnabled(true); |
|
| 159 |
} |
|
| 138 |
|
|
| 160 | 139 |
if (text.equals(Messages.GeneralPreference_yes)){
|
| 161 | 140 |
searchForIdentifierAndTitleCache = true; |
| 162 | 141 |
}else{
|
| ... | ... | |
| 168 | 147 |
String text = sortTaxaByRankAndNameButton.getText(); |
| 169 | 148 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
| 170 | 149 |
sortTaxaByRankAndName = null; |
| 171 |
if (isAdminPreference){
|
|
| 172 |
sortTaxaByRankAndNamePref.setAllowOverride(true); |
|
| 173 |
allowOverrideIsSortTaxaByRankAndNameButton.setSelection(true); |
|
| 174 |
allowOverrideIsSortTaxaByRankAndNameButton.setEnabled(false); |
|
| 175 |
} |
|
| 176 | 150 |
return; |
| 177 | 151 |
} |
| 178 |
if (isAdminPreference){
|
|
| 179 |
allowOverrideIsSortTaxaByRankAndNameButton.setEnabled(true); |
|
| 180 |
} |
|
| 152 |
|
|
| 181 | 153 |
if (text.equals(Messages.GeneralPreference_yes)){
|
| 182 | 154 |
sortTaxaByRankAndName = true; |
| 183 | 155 |
}else{
|
| ... | ... | |
| 189 | 161 |
String text = filterCommonNameReferenceButton.getText(); |
| 190 | 162 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
| 191 | 163 |
filterCommonNameReferences = null; |
| 192 |
if (isAdminPreference){
|
|
| 193 |
filterCommonNameReferencesPref.setAllowOverride(true); |
|
| 194 |
allowOverrideFilterCommonNameReferencesButton.setSelection(true); |
|
| 195 |
allowOverrideFilterCommonNameReferencesButton.setEnabled(false); |
|
| 196 |
} |
|
| 197 | 164 |
return; |
| 198 | 165 |
} |
| 199 |
if (isAdminPreference){
|
|
| 200 |
allowOverrideFilterCommonNameReferencesButton.setEnabled(true); |
|
| 201 |
} |
|
| 166 |
|
|
| 202 | 167 |
if (text.equals(Messages.GeneralPreference_yes)){
|
| 203 | 168 |
filterCommonNameReferences = true; |
| 204 | 169 |
}else{
|
| ... | ... | |
| 236 | 201 |
if (isAdminPreference){
|
| 237 | 202 |
allowOverrideIsShowIdInSelectionDialogButton = createAllowOverrideButton(titleComp); |
| 238 | 203 |
allowOverrideIsShowIdInSelectionDialogButton.setSelection(showIdInSelectionDialogPref != null? showIdInSelectionDialogPref.isAllowOverride(): true); |
| 239 |
allowOverrideIsShowIdInSelectionDialogButton.setEnabled(showIdInSelectionDialog != null); |
|
| 240 | 204 |
allowOverrideIsShowIdInSelectionDialogButton.addSelectionListener(new SelectionAdapter(){
|
| 241 | 205 |
@Override |
| 242 | 206 |
public void widgetSelected(SelectionEvent e) {
|
| ... | ... | |
| 263 | 227 |
if (isAdminPreference){
|
| 264 | 228 |
allowOverrideSearchForIdentifierAsDefaultButton = createAllowOverrideButton(composite); |
| 265 | 229 |
allowOverrideSearchForIdentifierAsDefaultButton.setSelection(searchForIdentifierAsDefaultPref != null?searchForIdentifierAsDefaultPref.isAllowOverride(): true); |
| 266 |
allowOverrideSearchForIdentifierAsDefaultButton.setEnabled(searchForIdentifierAsDefault != null); |
|
| 267 | 230 |
allowOverrideSearchForIdentifierAsDefaultButton.addSelectionListener(new SelectionAdapter(){
|
| 268 | 231 |
@Override |
| 269 | 232 |
public void widgetSelected(SelectionEvent e) {
|
| ... | ... | |
| 289 | 252 |
if (isAdminPreference){
|
| 290 | 253 |
allowOverridesSearchForIdentifierAndTitleCacheButton = createAllowOverrideButton(composite); |
| 291 | 254 |
allowOverridesSearchForIdentifierAndTitleCacheButton.setSelection(searchForIdentifierAndTitleCachePref != null?searchForIdentifierAndTitleCachePref.isAllowOverride():true); |
| 292 |
allowOverridesSearchForIdentifierAndTitleCacheButton.setEnabled(searchForIdentifierAndTitleCache != null); |
|
| 293 | 255 |
allowOverridesSearchForIdentifierAndTitleCacheButton.addSelectionListener(new SelectionAdapter(){
|
| 294 | 256 |
@Override |
| 295 | 257 |
public void widgetSelected(SelectionEvent e) {
|
| ... | ... | |
| 314 | 276 |
if (isAdminPreference){
|
| 315 | 277 |
allowOverrideIsSortTaxaByRankAndNameButton = createAllowOverrideButton(composite); |
| 316 | 278 |
allowOverrideIsSortTaxaByRankAndNameButton.setSelection(sortTaxaByRankAndNamePref != null? sortTaxaByRankAndNamePref.isAllowOverride(): true); |
| 317 |
allowOverrideIsSortTaxaByRankAndNameButton.setEnabled(sortTaxaByRankAndName != null); |
|
| 318 | 279 |
allowOverrideIsSortTaxaByRankAndNameButton.addSelectionListener(new SelectionAdapter(){
|
| 319 | 280 |
@Override |
| 320 | 281 |
public void widgetSelected(SelectionEvent e) {
|
| ... | ... | |
| 338 | 299 |
if (isAdminPreference){
|
| 339 | 300 |
allowOverrideFilterCommonNameReferencesButton = createAllowOverrideButton(composite); |
| 340 | 301 |
allowOverrideFilterCommonNameReferencesButton.setSelection(filterCommonNameReferencesPref != null? filterCommonNameReferencesPref.isAllowOverride():true); |
| 341 |
allowOverrideFilterCommonNameReferencesButton.setEnabled(filterCommonNameReferences != null); |
|
| 342 | 302 |
allowOverrideFilterCommonNameReferencesButton.addSelectionListener(new SelectionAdapter(){
|
| 343 | 303 |
@Override |
| 344 | 304 |
public void widgetSelected(SelectionEvent e) {
|
| ... | ... | |
| 362 | 322 |
showIdInSelectionDialog = null; |
| 363 | 323 |
if (isAdminPreference){
|
| 364 | 324 |
allowOverrideIsShowIdInSelectionDialogButton.setSelection(true); |
| 365 |
allowOverrideIsShowIdInSelectionDialogButton.setEnabled(false); |
|
| 366 | 325 |
showIdInSelectionDialogPref.setAllowOverride(true); |
| 367 | 326 |
} |
| 368 | 327 |
searchForIdentifierAsDefaultButton.select(0); |
| 369 | 328 |
searchForIdentifierAsDefault = null; |
| 370 | 329 |
if (isAdminPreference){
|
| 371 | 330 |
allowOverrideSearchForIdentifierAsDefaultButton.setSelection(true); |
| 372 |
allowOverrideSearchForIdentifierAsDefaultButton.setEnabled(false); |
|
| 373 | 331 |
searchForIdentifierAsDefaultPref.setAllowOverride(true); |
| 374 | 332 |
} |
| 375 | 333 |
searchForIdentifierAndTitleCacheButton.select(0); |
| 376 | 334 |
searchForIdentifierAndTitleCache = null; |
| 377 | 335 |
if (isAdminPreference){
|
| 378 | 336 |
allowOverridesSearchForIdentifierAndTitleCacheButton.setSelection(true); |
| 379 |
allowOverridesSearchForIdentifierAndTitleCacheButton.setEnabled(false); |
|
| 380 | 337 |
searchForIdentifierAndTitleCachePref.setAllowOverride(true); |
| 381 | 338 |
} |
| 382 | 339 |
sortTaxaByRankAndNameButton.select(0); |
| 383 | 340 |
sortTaxaByRankAndName = null; |
| 384 | 341 |
if (isAdminPreference){
|
| 385 | 342 |
allowOverrideIsSortTaxaByRankAndNameButton.setSelection(true); |
| 386 |
allowOverrideIsSortTaxaByRankAndNameButton.setEnabled(false); |
|
| 387 | 343 |
sortTaxaByRankAndNamePref.setAllowOverride(true); |
| 388 | 344 |
} |
| 389 | 345 |
filterCommonNameReferenceButton.select(0); |
| 390 | 346 |
filterCommonNameReferences = null; |
| 391 | 347 |
if (isAdminPreference){
|
| 392 | 348 |
allowOverrideFilterCommonNameReferencesButton.setSelection(true); |
| 393 |
allowOverrideFilterCommonNameReferencesButton.setEnabled(false); |
|
| 394 | 349 |
filterCommonNameReferencesPref.setAllowOverride(true); |
| 395 | 350 |
} |
| 396 | 351 |
setApply(true); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java | ||
|---|---|---|
| 138 | 138 |
if (isAdminPreference){
|
| 139 | 139 |
allowOverrideIsShowSpecimenRelatedIssuesButton = createAllowOverrideButton(titleComp); |
| 140 | 140 |
allowOverrideIsShowSpecimenRelatedIssuesButton.setSelection(allowOverrideShowSpecimenRelatedIssues); |
| 141 |
allowOverrideIsShowSpecimenRelatedIssuesButton.setEnabled(isShowSpecimenRelatedIssues != null); |
|
| 141 |
// allowOverrideIsShowSpecimenRelatedIssuesButton.setEnabled(isShowSpecimenRelatedIssues != null);
|
|
| 142 | 142 |
allowOverrideIsShowSpecimenRelatedIssuesButton.addSelectionListener(new SelectionAdapter(){
|
| 143 | 143 |
@Override |
| 144 | 144 |
public void widgetSelected(SelectionEvent e) {
|
| ... | ... | |
| 177 | 177 |
if (isAdminPreference){
|
| 178 | 178 |
allowOverrideShowCollectingAreaButton = createAllowOverrideButton(composite); |
| 179 | 179 |
allowOverrideShowCollectingAreaButton.setSelection(allowOverrideShowCollectingAreaInGeneralSection); |
| 180 |
allowOverrideShowCollectingAreaButton.setEnabled(isShowCollectingAreaInGeneralSection != null); |
|
| 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 |
// allowOverridesDeterminationOnlyForFieldUnitsButton.setEnabled(showDeterminationOnlyForFieldUnits != null);
|
|
| 224 | 224 |
allowOverridesDeterminationOnlyForFieldUnitsButton.addSelectionListener(new SelectionAdapter(){
|
| 225 | 225 |
@Override |
| 226 | 226 |
public void widgetSelected(SelectionEvent e) {
|
| ... | ... | |
| 258 | 258 |
if (isAdminPreference){
|
| 259 | 259 |
allowOverrideIsShowTaxonAssociationButton = createAllowOverrideButton(composite); |
| 260 | 260 |
allowOverrideIsShowTaxonAssociationButton.setSelection(allowOverrideShowTaxonAssociation); |
| 261 |
allowOverrideIsShowTaxonAssociationButton.setEnabled(showTaxonAssociation != null); |
|
| 261 |
// allowOverrideIsShowTaxonAssociationButton.setEnabled(showTaxonAssociation != null);
|
|
| 262 | 262 |
allowOverrideIsShowTaxonAssociationButton.addSelectionListener(new SelectionAdapter(){
|
| 263 | 263 |
@Override |
| 264 | 264 |
public void widgetSelected(SelectionEvent e) {
|
| ... | ... | |
| 295 | 295 |
if (isAdminPreference){
|
| 296 | 296 |
allowOverrideShowLifeFormButton = createAllowOverrideButton(composite); |
| 297 | 297 |
allowOverrideShowLifeFormButton.setSelection(allowOverrideShowLifeForm); |
| 298 |
allowOverrideShowLifeFormButton.setEnabled(showLifeForm != null); |
|
| 298 |
// allowOverrideShowLifeFormButton.setEnabled(showLifeForm != null);
|
|
| 299 | 299 |
allowOverrideShowLifeFormButton.addSelectionListener(new SelectionAdapter(){
|
| 300 | 300 |
@Override |
| 301 | 301 |
public void widgetSelected(SelectionEvent e) {
|
| ... | ... | |
| 572 | 572 |
String text = showSpecimenButton.getText(); |
| 573 | 573 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
| 574 | 574 |
isShowSpecimenRelatedIssues = null; |
| 575 |
if (isAdminPreference){
|
|
| 576 |
allowOverrideIsShowSpecimenRelatedIssuesButton.setSelection(true); |
|
| 577 |
allowOverrideIsShowSpecimenRelatedIssuesButton.setEnabled(false); |
|
| 578 |
} |
|
| 579 | 575 |
return; |
| 580 | 576 |
} |
| 581 |
if (isAdminPreference){
|
|
| 582 |
allowOverrideIsShowSpecimenRelatedIssuesButton.setEnabled(true); |
|
| 583 |
} |
|
| 577 |
|
|
| 584 | 578 |
if (text.equals(Messages.GeneralPreference_yes)){
|
| 585 | 579 |
isShowSpecimenRelatedIssues = true; |
| 586 | 580 |
}else{
|
| ... | ... | |
| 592 | 586 |
String text = showCollectingAreaInGeneralSectionButton.getText(); |
| 593 | 587 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
| 594 | 588 |
isShowCollectingAreaInGeneralSection = null; |
| 595 |
if (isAdminPreference){
|
|
| 596 |
allowOverrideShowCollectingAreaButton.setSelection(true); |
|
| 597 |
allowOverrideShowCollectingAreaButton.setEnabled(false); |
|
| 598 |
} |
|
| 599 | 589 |
return; |
| 600 | 590 |
} |
| 601 |
if (isAdminPreference){
|
|
| 602 |
allowOverrideShowCollectingAreaButton.setEnabled(true); |
|
| 603 |
} |
|
| 591 |
|
|
| 604 | 592 |
if (text.equals(Messages.GeneralPreference_yes)){
|
| 605 | 593 |
isShowCollectingAreaInGeneralSection = true; |
| 606 | 594 |
}else{
|
| ... | ... | |
| 612 | 600 |
String text = determinationOnlyForFieldUnitsButton.getText(); |
| 613 | 601 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
| 614 | 602 |
isDeterminationOnlyForFieldUnits = null; |
| 615 |
if (isAdminPreference){
|
|
| 616 |
allowOverridesDeterminationOnlyForFieldUnitsButton.setSelection(true); |
|
| 617 |
allowOverridesDeterminationOnlyForFieldUnitsButton.setEnabled(false); |
|
| 618 |
} |
|
| 619 | 603 |
return; |
| 620 | 604 |
} |
| 621 |
if (isAdminPreference){
|
|
| 622 |
allowOverridesDeterminationOnlyForFieldUnitsButton.setEnabled(true); |
|
| 623 |
} |
|
| 624 | 605 |
if (text.equals(Messages.GeneralPreference_yes)){
|
| 625 | 606 |
isDeterminationOnlyForFieldUnits = true; |
| 626 | 607 |
}else{
|
| ... | ... | |
| 632 | 613 |
String text = showTaxonAssociationButton.getText(); |
| 633 | 614 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
| 634 | 615 |
isShowTaxonAssociation = null; |
| 635 |
if (isAdminPreference){
|
|
| 636 |
//showTaxonAssociation.setAllowOverride(true); |
|
| 637 |
allowOverrideIsShowTaxonAssociationButton.setSelection(true); |
|
| 638 |
allowOverrideIsShowTaxonAssociationButton.setEnabled(false); |
|
| 639 |
} |
|
| 640 | 616 |
return; |
| 641 |
}if (isAdminPreference){
|
|
| 642 |
allowOverrideIsShowTaxonAssociationButton.setEnabled(true); |
|
| 643 | 617 |
} |
| 618 |
|
|
| 644 | 619 |
if (text.equals(Messages.GeneralPreference_yes)){
|
| 645 | 620 |
isShowTaxonAssociation = true; |
| 646 | 621 |
}else{
|
| ... | ... | |
| 652 | 627 |
String text = showLifeFormButton.getText(); |
| 653 | 628 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
| 654 | 629 |
isShowLifeForm = null; |
| 655 |
if (isAdminPreference){
|
|
| 656 |
allowOverrideShowLifeFormButton.setSelection(true); |
|
| 657 |
allowOverrideShowLifeFormButton.setEnabled(false); |
|
| 658 |
} |
|
| 659 | 630 |
return; |
| 660 | 631 |
} |
| 661 |
if (isAdminPreference){
|
|
| 662 |
allowOverrideShowLifeFormButton.setEnabled(true); |
|
| 663 |
} |
|
| 632 |
|
|
| 664 | 633 |
if (text.equals(Messages.GeneralPreference_yes)){
|
| 665 | 634 |
isShowLifeForm = true; |
| 666 | 635 |
}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); |
|
| 79 | 78 |
allowOverrideIDSourceButton.addSelectionListener(new SelectionAdapter(){
|
| 80 | 79 |
@Override |
| 81 | 80 |
public void widgetSelected(SelectionEvent e) {
|
| ... | ... | |
| 99 | 98 |
} |
| 100 | 99 |
if (isAdminPreference){
|
| 101 | 100 |
allowOverrideShowIDNamespaceButton = createAllowOverrideButton(composite); |
| 102 |
|
|
| 103 | 101 |
allowOverrideShowIDNamespaceButton.setSelection(isAllowOverrideShowIDNamespace); |
| 104 |
allowOverrideShowIDNamespaceButton.setEnabled(isShowIDNamespace != null); |
|
| 105 | 102 |
allowOverrideShowIDNamespaceButton.addSelectionListener(new SelectionAdapter(){
|
| 106 | 103 |
@Override |
| 107 | 104 |
public void widgetSelected(SelectionEvent e) {
|
| ... | ... | |
| 166 | 163 |
public void widgetSelected(SelectionEvent e) {
|
| 167 | 164 |
if (e.getSource().equals(this.showIDNamespaceButton)) {
|
| 168 | 165 |
String text = showIDNamespaceButton.getText(); |
| 169 |
// text = text.replace(Messages.Preference_Use_Default, ""); |
|
| 166 |
|
|
| 170 | 167 |
if (text.startsWith(Messages.Preference_Use_Default)){
|
| 171 | 168 |
isShowIDNamespace = null; |
| 172 | 169 |
isOverrideShowIDNamespace = false; |
| ... | ... | |
| 180 | 177 |
} |
| 181 | 178 |
} |
| 182 | 179 |
|
| 183 |
allowOverrideShowIDNamespaceButton.setEnabled(isShowIDNamespace != null); |
|
| 184 | 180 |
} |
| 185 | 181 |
if (e.getSource().equals(this.showIDSourceButton)) {
|
| 186 | 182 |
String text = showIDSourceButton.getText(); |
| ... | ... | |
| 196 | 192 |
} |
| 197 | 193 |
} |
| 198 | 194 |
|
| 199 |
allowOverrideIDSourceButton.setEnabled(isShowIDSource != null); |
|
| 200 | 195 |
} |
| 201 | 196 |
|
| 202 | 197 |
this.setApply(true); |
| ... | ... | |
| 216 | 211 |
if (isAdminPreference){
|
| 217 | 212 |
allowOverrideIDSourceButton.setSelection(true); |
| 218 | 213 |
allowOverrideShowIDNamespaceButton.setSelection(true); |
| 219 |
allowOverrideIDSourceButton.setEnabled(false); |
|
| 220 |
allowOverrideShowIDNamespaceButton.setEnabled(false); |
|
| 214 |
|
|
| 221 | 215 |
} |
| 222 | 216 |
|
| 223 | 217 |
showIDSourceButton.select(0); |
| 224 | 218 |
isShowIDSource = null; |
| 225 | 219 |
isAllowOverrideShowIDSource=true; |
| 220 |
this.setApply(true); |
|
| 226 | 221 |
super.performDefaults(); |
| 227 | 222 |
} |
| 228 | 223 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/AbstractMenuPreferences.java | ||
|---|---|---|
| 229 | 229 |
@Override |
| 230 | 230 |
protected void performDefaults() {
|
| 231 | 231 |
tableViewer.setAllChecked(true); |
| 232 |
setApply(true); |
|
| 232 | 233 |
} |
| 233 | 234 |
|
| 234 | 235 |
/** {@inheritDoc} */
|
Also available in: Unified diff
ref #8389: revert disabling of allowOverride for default selection