Revision b32cbeab
Added by Katja Luther over 6 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java | ||
|---|---|---|
| 52 | 52 |
import eu.etaxonomy.cdm.model.agent.Person; |
| 53 | 53 |
import eu.etaxonomy.cdm.model.agent.Team; |
| 54 | 54 |
import eu.etaxonomy.cdm.model.common.Annotation; |
| 55 |
import eu.etaxonomy.cdm.model.common.AnnotationType; |
|
| 55 | 56 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 56 | 57 |
import eu.etaxonomy.cdm.model.common.Credit; |
| 57 | 58 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
| ... | ... | |
| 919 | 920 |
ICdmFormElement parentElement, |
| 920 | 921 |
String labelString, |
| 921 | 922 |
T selection, |
| 922 |
int style) {
|
|
| 923 |
return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, true, style, false); |
|
| 923 |
int style, |
|
| 924 |
Comparator<T> comparator) {
|
|
| 925 |
return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, true, style, false, comparator); |
|
| 924 | 926 |
} |
| 925 | 927 |
|
| 926 | 928 |
public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement( |
| ... | ... | |
| 930 | 932 |
T selection, |
| 931 | 933 |
boolean addEmptyElement, |
| 932 | 934 |
int style) {
|
| 933 |
return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, addEmptyElement, style, false); |
|
| 935 |
return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, addEmptyElement, style, false, null); |
|
| 936 |
} |
|
| 937 |
|
|
| 938 |
public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement( |
|
| 939 |
TermType termType, |
|
| 940 |
ICdmFormElement parentElement, |
|
| 941 |
String labelString, |
|
| 942 |
T selection, |
|
| 943 |
int style) {
|
|
| 944 |
return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, true, style, false, null); |
|
| 934 | 945 |
} |
| 935 | 946 |
public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement( |
| 936 | 947 |
TermType termType, |
| ... | ... | |
| 940 | 951 |
boolean addEmptyElement, |
| 941 | 952 |
int style, |
| 942 | 953 |
boolean useAbbrevLabel) {
|
| 943 |
return createDefinedTermComboElement(termType, null, parentElement, labelString, selection, addEmptyElement, style, useAbbrevLabel); |
|
| 954 |
return createDefinedTermComboElement(termType, null, parentElement, labelString, selection, addEmptyElement, style, useAbbrevLabel, null);
|
|
| 944 | 955 |
} |
| 945 | 956 |
|
| 946 | 957 |
|
| ... | ... | |
| 950 | 961 |
String labelString, |
| 951 | 962 |
T selection, |
| 952 | 963 |
int style) {
|
| 953 |
return this.createDefinedTermComboElement(null, termVocabulary, parentElement, labelString, selection, true, style, false); |
|
| 964 |
return this.createDefinedTermComboElement(null, termVocabulary, parentElement, labelString, selection, true, style, false, null);
|
|
| 954 | 965 |
} |
| 955 | 966 |
|
| 956 | 967 |
public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement( |
| ... | ... | |
| 961 | 972 |
boolean addEmptyElement, |
| 962 | 973 |
int style, |
| 963 | 974 |
boolean useAbbrevLabel) {
|
| 964 |
return createDefinedTermComboElement(null, termVocabulary, parentElement, labelString, selection, addEmptyElement, style, useAbbrevLabel); |
|
| 975 |
return createDefinedTermComboElement(null, termVocabulary, parentElement, labelString, selection, addEmptyElement, style, useAbbrevLabel, null);
|
|
| 965 | 976 |
} |
| 966 | 977 |
|
| 967 | 978 |
private <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement( |
| ... | ... | |
| 972 | 983 |
T selection, |
| 973 | 984 |
boolean addEmptyElement, |
| 974 | 985 |
int style, |
| 975 |
boolean useAbbrevLabel) {
|
|
| 986 |
boolean useAbbrevLabel, |
|
| 987 |
Comparator<T> comparator) {
|
|
| 976 | 988 |
if(termType!=null){
|
| 977 |
TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termType, labelString, selection, addEmptyElement, style, useAbbrevLabel); |
|
| 989 |
TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termType, labelString, selection, addEmptyElement, style, useAbbrevLabel, comparator); |
|
| 990 |
if (comparator!= null){
|
|
| 991 |
element.setTermComparator(comparator); |
|
| 992 |
} |
|
| 978 | 993 |
adapt(element); |
| 979 | 994 |
parentElement.addElement(element); |
| 980 | 995 |
return element; |
| 981 | 996 |
} |
| 982 | 997 |
else if(termVocabulary!=null){
|
| 983 |
TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termVocabulary, labelString, selection, addEmptyElement, style, useAbbrevLabel); |
|
| 998 |
TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termVocabulary, labelString, selection, addEmptyElement, style, useAbbrevLabel, comparator); |
|
| 999 |
if (comparator!= null){
|
|
| 1000 |
element.setTermComparator(comparator); |
|
| 1001 |
} |
|
| 984 | 1002 |
adapt(element); |
| 985 | 1003 |
parentElement.addElement(element); |
| 986 | 1004 |
return element; |
| ... | ... | |
| 3005 | 3023 |
return section; |
| 3006 | 3024 |
} |
| 3007 | 3025 |
|
| 3026 |
|
|
| 3027 |
|
|
| 3008 | 3028 |
// public RichTextWithLabelElement createRichTextLabelElement(ICdmFormElement parentElement, String labelString, String initialText, int textHeight, int style) {
|
| 3009 | 3029 |
// RichTextWithLabelElement element = new RichTextWithLabelElement(this, parentElement, labelString, |
| 3010 | 3030 |
// initialText, textHeight, style); |
Also available in: Unified diff
fix #6918: use comparator in rank combobox if sortRankHierarchically is set