Revision 360810ab
Added by Patrick Plitzner almost 9 years ago
- fixed NPE (#4448)
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java | ||
---|---|---|
773 | 773 |
parentElement.addElement(element); |
774 | 774 |
return element; |
775 | 775 |
} |
776 |
|
|
777 | 776 |
/** |
778 |
* <p> |
|
779 |
* createTermComboElement |
|
780 |
* </p> |
|
781 |
* |
|
782 | 777 |
* @deprecated Use {@link #createDefinedTermComboElement(TermType, ICdmFormElement, String, DefinedTermBase, int)} instead |
783 |
* @param termComboType |
|
784 |
* a |
|
785 |
* {@link eu.eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.TermComboType} |
|
786 |
* object. |
|
787 |
* @param parentElement |
|
788 |
* a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} |
|
789 |
* object. |
|
790 |
* @param labelString |
|
791 |
* a {@link java.lang.String} object. |
|
792 |
* @param selection |
|
793 |
* a {@link eu.etaxonomy.cdm.model.common.DefinedTermBase} |
|
794 |
* object. |
|
795 |
* @param style |
|
796 |
* a int. |
|
797 |
* @return a {@link eu.etaxonomy.taxeditor.ui.combo.TermComboElement} |
|
798 |
* object. |
|
799 | 778 |
*/ |
800 | 779 |
@Deprecated |
801 | 780 |
public <T extends DefinedTermBase> TermComboElement<T> createTermComboElement(Class<T> termComboType, |
802 | 781 |
ICdmFormElement parentElement, String labelString, T selection, int style) { |
803 | 782 |
TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termComboType, labelString, |
804 |
selection, style); |
|
783 |
selection, true, style);
|
|
805 | 784 |
adapt(element); |
806 | 785 |
parentElement.addElement(element); |
807 | 786 |
return element; |
808 | 787 |
} |
809 | 788 |
|
810 |
/** |
|
811 |
* <p> |
|
812 |
* createTermComboElement |
|
813 |
* </p> |
|
814 |
* |
|
815 |
* @param termComboType |
|
816 |
* a |
|
817 |
* {@link eu.eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.TermComboType} |
|
818 |
* object. |
|
819 |
* @param parentElement |
|
820 |
* a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} |
|
821 |
* object. |
|
822 |
* @param labelString |
|
823 |
* a {@link java.lang.String} object. |
|
824 |
* @param selection |
|
825 |
* a {@link eu.etaxonomy.cdm.model.common.DefinedTermBase} |
|
826 |
* object. |
|
827 |
* @param style |
|
828 |
* a int. |
|
829 |
* @return a {@link eu.etaxonomy.taxeditor.ui.combo.TermComboElement} |
|
830 |
* object. |
|
831 |
*/ |
|
789 |
public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement( |
|
790 |
TermType termType, |
|
791 |
ICdmFormElement parentElement, |
|
792 |
String labelString, |
|
793 |
T selection, |
|
794 |
int style) { |
|
795 |
TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termType, labelString, selection, true, style); |
|
796 |
adapt(element); |
|
797 |
parentElement.addElement(element); |
|
798 |
return element; |
|
799 |
} |
|
832 | 800 |
|
833 |
public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
|
|
801 |
public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
|
|
834 | 802 |
TermType termType, |
835 | 803 |
ICdmFormElement parentElement, |
836 | 804 |
String labelString, |
837 | 805 |
T selection, |
806 |
boolean addEmptyElement, |
|
838 | 807 |
int style) { |
839 |
TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termType, labelString, selection, style); |
|
808 |
TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termType, labelString, selection, addEmptyElement, style);
|
|
840 | 809 |
adapt(element); |
841 | 810 |
parentElement.addElement(element); |
842 | 811 |
return element; |
843 | 812 |
} |
844 | 813 |
|
845 |
/** |
|
846 |
* <p> |
|
847 |
* createTermComboElement |
|
848 |
* </p> |
|
849 |
* |
|
850 |
* @param termComboType |
|
851 |
* a |
|
852 |
* {@link eu.eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.TermComboType} |
|
853 |
* object. |
|
854 |
* @param parentElement |
|
855 |
* a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} |
|
856 |
* object. |
|
857 |
* @param labelString |
|
858 |
* a {@link java.lang.String} object. |
|
859 |
* @param selection |
|
860 |
* a {@link eu.etaxonomy.cdm.model.common.DefinedTermBase} |
|
861 |
* object. |
|
862 |
* @param style |
|
863 |
* a int. |
|
864 |
* @return a {@link eu.etaxonomy.taxeditor.ui.combo.TermComboElement} |
|
865 |
* object. |
|
866 |
*/ |
|
814 |
public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement( |
|
815 |
TermVocabulary<?> termVocabulary, |
|
816 |
ICdmFormElement parentElement, |
|
817 |
String labelString, |
|
818 |
T selection, |
|
819 |
int style) { |
|
820 |
TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termVocabulary, labelString, selection, true, style); |
|
821 |
adapt(element); |
|
822 |
parentElement.addElement(element); |
|
823 |
return element; |
|
824 |
} |
|
867 | 825 |
|
868 | 826 |
public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement( |
869 | 827 |
TermVocabulary<?> termVocabulary, |
870 | 828 |
ICdmFormElement parentElement, |
871 | 829 |
String labelString, |
872 | 830 |
T selection, |
831 |
boolean addEmptyElement, |
|
873 | 832 |
int style) { |
874 |
TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termVocabulary, labelString, selection, style); |
|
833 |
TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termVocabulary, labelString, selection, addEmptyElement, style);
|
|
875 | 834 |
adapt(element); |
876 | 835 |
parentElement.addElement(element); |
877 | 836 |
return element; |
Also available in: Unified diff