Project

General

Profile

« Previous | Next » 

Revision e056e66e

Added by Katja Luther over 4 years ago

fix #8226: add new preferences for modifiers

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java
18 18
import eu.etaxonomy.cdm.model.common.LanguageString;
19 19
import eu.etaxonomy.cdm.model.description.State;
20 20
import eu.etaxonomy.cdm.model.description.StateData;
21
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
21 22
import eu.etaxonomy.cdm.model.term.TermType;
22 23
import eu.etaxonomy.cdm.model.term.TermVocabulary;
24
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
23 25
import eu.etaxonomy.taxeditor.store.CdmStore;
24 26
import eu.etaxonomy.taxeditor.store.StoreUtil;
25 27
import eu.etaxonomy.taxeditor.ui.combo.term.TermComboElement;
......
69 71
        }
70 72
		combo_state.setTerms(stateTerms);
71 73
		combo_state.setSelection(entity.getState());
72
		section_modifiers.setEntity(entity);
73
		section_modifiers.setExpanded(!entity.getModifiers().isEmpty());
74
		if(getEntity().getModifyingText().get(CdmStore.getDefaultLanguage()) != null) {
74
		if (section_modifiers != null){
75
    		section_modifiers.setEntity(entity);
76
    		section_modifiers.setExpanded(!entity.getModifiers().isEmpty());
77
		}
78
		if(getEntity().getModifyingText().get(CdmStore.getDefaultLanguage()) != null && text_modifyingText != null) {
75 79
            text_modifyingText.setText(getEntity().getModifyingText().get(CdmStore.getDefaultLanguage()).getText());
76 80
        }
77 81
		if(getEntity().getId()>0){
......
83 87
	@Override
84 88
	public void createControls(ICdmFormElement element, int style) {
85 89
		combo_state = formFactory.createDefinedTermComboElement(TermType.State, element, "State", null, style);
86
		section_modifiers = formFactory.createModifierSection(getConversationHolder(), element, StoreUtil.getSectionStyle(ModifierSection.class, StateData.class.getCanonicalName(), true));
87
		section_modifiers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
88
		text_modifyingText = formFactory.createTextWithLabelElement(element, "Modifying Text", null, style);
90
		if (PreferencesUtil.getBooleanValue(PreferencePredicate.ShowModifier.getKey())){
91
		    section_modifiers = formFactory.createModifierSection(getConversationHolder(), element, StoreUtil.getSectionStyle(ModifierSection.class, StateData.class.getCanonicalName(), true));
92
		    section_modifiers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
93
		}
94
		if (PreferencesUtil.getBooleanValue(PreferencePredicate.ShowModifierFreeText.getKey())){
95
		    text_modifyingText = formFactory.createTextWithLabelElement(element, "Modifying Text", null, style);
96
		}
97

  
89 98
	}
90 99

  
91 100
	/** {@inheritDoc} */

Also available in: Unified diff