Project

General

Profile

« Previous | Next » 

Revision 1738ed58

Added by Patrick Plitzner about 6 years ago

fix #5488 show only zoological nomenclatural status types not for
botanical names

  • also dis some refactoring

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
59 59

  
60 60
	public TermComboElement(CdmFormFactory formFactory,
61 61
	        ICdmFormElement parentElement, TermVocabulary<?> termVocabulary, String labelString, T selection, boolean addEmptyElement,
62
	        int style) {
63
	    this(formFactory, parentElement, null, null, termVocabulary, labelString, selection, addEmptyElement, style, false);
62
	        int style, boolean useAbbrevLabel) {
63
	    this(formFactory, parentElement, null, null, termVocabulary, labelString, selection, addEmptyElement, style, useAbbrevLabel);
64 64
	}
65 65

  
66 66
    public TermComboElement(CdmFormFactory formFactory,
......
72 72
            ICdmFormElement parentElement, Class<T> termClass, String labelString, T selection, boolean addEmptyElement,
73 73
            int style, boolean useAbbrevLabel) {
74 74
        this(formFactory, parentElement, termClass, null, null, labelString, selection, addEmptyElement, style, useAbbrevLabel);
75
       
75

  
76 76
    }
77 77

  
78 78
	private TermComboElement(CdmFormFactory formFactory,
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
915 915
            String labelString,
916 916
            T selection,
917 917
            int style) {
918
        TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termType, labelString, selection, true, style, false);
919
        adapt(element);
920
        parentElement.addElement(element);
921
        return element;
918
        return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, false, style, true);
922 919
    }
923 920

  
924 921
    public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
......
928 925
			T selection,
929 926
			boolean addEmptyElement,
930 927
			int style) {
931
		TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termType, labelString, selection, addEmptyElement, style, false);
932
		adapt(element);
933
		parentElement.addElement(element);
934
		return element;
928
        return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, addEmptyElement, style, true);
935 929
	}
936 930
    public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
937 931
			TermType termType,
......
939 933
			String labelString,
940 934
			T selection,
941 935
			boolean addEmptyElement,
942
			int style, boolean useAbbrevLabel) {
943
		TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termType, labelString, selection, addEmptyElement, style, useAbbrevLabel);
944
		adapt(element);
945
		parentElement.addElement(element);
946
		return element;
936
			int style,
937
			boolean useAbbrevLabel) {
938
		return createDefinedTermComboElement(termType, null, parentElement, labelString, selection, addEmptyElement, style, useAbbrevLabel);
947 939
	}
948 940

  
949 941

  
......
953 945
            String labelString,
954 946
            T selection,
955 947
            int style) {
956
        TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termVocabulary, labelString, selection, true, style);
957
        adapt(element);
958
        parentElement.addElement(element);
959
        return element;
948
        return this.createDefinedTermComboElement(null, termVocabulary, parentElement, labelString, selection, false, style, true);
960 949
    }
961 950

  
962 951
	public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
......
965 954
	        String labelString,
966 955
	        T selection,
967 956
	        boolean addEmptyElement,
968
	        int style) {
969
	    TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termVocabulary, labelString, selection, addEmptyElement, style);
970
	    adapt(element);
971
	    parentElement.addElement(element);
972
	    return element;
957
	        int style,
958
	        boolean useAbbrevLabel) {
959
	    return createDefinedTermComboElement(null, termVocabulary, parentElement, labelString, selection, addEmptyElement, style, useAbbrevLabel);
960
	}
961

  
962
	private <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
963
	        TermType termType,
964
	        TermVocabulary<?> termVocabulary,
965
	        ICdmFormElement parentElement,
966
	        String labelString,
967
	        T selection,
968
	        boolean addEmptyElement,
969
	        int style,
970
	        boolean useAbbrevLabel) {
971
	    if(termType!=null){
972
	        TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termType, labelString, selection, addEmptyElement, style, useAbbrevLabel);
973
	        adapt(element);
974
	        parentElement.addElement(element);
975
	        return element;
976
	    }
977
	    else if(termVocabulary!=null){
978
	        TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termVocabulary, labelString, selection, addEmptyElement, style, useAbbrevLabel);
979
	        adapt(element);
980
	        parentElement.addElement(element);
981
	        return element;
982
	    }
983
	    else{
984
	        //this should never happen
985
	        return null;
986
	    }
973 987
	}
974 988

  
975 989
	public <T extends IEnumTerm<T>> EnumComboElement<T> createEnumComboElement(
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java
11 11

  
12 12
import org.eclipse.swt.events.SelectionListener;
13 13

  
14
import eu.etaxonomy.cdm.model.common.TermType;
14
import eu.etaxonomy.cdm.api.service.IVocabularyService;
15
import eu.etaxonomy.cdm.model.common.TermVocabulary;
16
import eu.etaxonomy.cdm.model.common.VocabularyEnum;
15 17
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
16 18
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
19
import eu.etaxonomy.taxeditor.store.CdmStore;
17 20
import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
18 21
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
19 22
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
......
46 49
	/** {@inheritDoc} */
47 50
	@Override
48 51
	public void createControls(ICdmFormElement element, int style) {
49
		nomenclaturalStatusTypeCombo = formFactory.createDefinedTermComboElement(TermType.NomenclaturalStatusType, this, "Nomenclatural Status Type", null, false, style, true);
52
	    TermVocabulary vocabulary = CdmStore.getService(IVocabularyService.class).find(VocabularyEnum.NomenclaturalStatusType.getUuid());
53
		nomenclaturalStatusTypeCombo = formFactory.createDefinedTermComboElement(vocabulary, this, "Nomenclatural Status Type", null,style);
50 54
		ruleConsideredText = formFactory.createTextWithLabelElement(this, "Rule Considered", "", style);
51 55

  
52 56
		super.createControls(element, style);

Also available in: Unified diff