Revision 7adc925d
Added by Andreas Kohlbecker almost 6 years ago
src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditor.java | ||
---|---|---|
19 | 19 |
import org.apache.log4j.Level; |
20 | 20 |
import org.springframework.context.annotation.Scope; |
21 | 21 |
import org.springframework.security.core.GrantedAuthority; |
22 |
import org.vaadin.viritin.fields.LazyComboBox; |
|
22 | 23 |
|
23 | 24 |
import com.vaadin.data.Property; |
24 | 25 |
import com.vaadin.data.Property.ValueChangeListener; |
... | ... | |
73 | 74 |
|
74 | 75 |
private static final boolean HAS_BASIONYM_DEFAULT = false; |
75 | 76 |
|
76 |
private TextField genusOrUninomialField;
|
|
77 |
private AbstractField<String> genusOrUninomialField;
|
|
77 | 78 |
|
78 |
private TextField infraGenericEpithetField;
|
|
79 |
private AbstractField<String> infraGenericEpithetField;
|
|
79 | 80 |
|
80 |
private TextField specificEpithetField;
|
|
81 |
private AbstractField<String> specificEpithetField;
|
|
81 | 82 |
|
82 |
private TextField infraSpecificEpithetField;
|
|
83 |
private AbstractField<String> infraSpecificEpithetField;
|
|
83 | 84 |
|
84 | 85 |
private SwitchableTextField fullTitleCacheFiled; |
85 | 86 |
|
... | ... | |
277 | 278 |
protectedNameCacheField = addSwitchableTextField("Name cache", "nameCache", "protectedNameCache", 0, row, GRID_COLS-1, row); |
278 | 279 |
protectedNameCacheField.setWidth(100, Unit.PERCENTAGE); |
279 | 280 |
row++; |
280 |
genusOrUninomialField = addTextField("Genus or uninomial", "genusOrUninomial", 0, row, 1, row); |
|
281 |
if(isModeEnabled(TaxonNamePopupEditorMode.VALIDATE_AGAINST_HIGHER_NAME_PART)){ |
|
282 |
genusOrUninomialField = addTextField("Genus or uninomial", "genusOrUninomial", 0, row, 1, row); |
|
283 |
} else { |
|
284 |
genusOrUninomialField = new LazyComboBox<String>(String.class); |
|
285 |
addField(genusOrUninomialField, "genusOrUninomial", 0, row, 1, row); |
|
286 |
} |
|
281 | 287 |
genusOrUninomialField.setWidth(200, Unit.PIXELS); |
282 | 288 |
infraGenericEpithetField = addTextField("Infrageneric epithet", "infraGenericEpithet", 2, row, 3, row); |
283 | 289 |
infraGenericEpithetField.setWidth(200, Unit.PIXELS); |
... | ... | |
730 | 736 |
return rankSelect; |
731 | 737 |
} |
732 | 738 |
|
739 |
/** |
|
740 |
* {@inheritDoc} |
|
741 |
*/ |
|
742 |
@Override |
|
743 |
public AbstractField<String> getGenusOrUninomialField(){ |
|
744 |
return genusOrUninomialField; |
|
745 |
} |
|
746 |
|
|
733 | 747 |
/** |
734 | 748 |
* @return the exBasionymAuthorshipField |
735 | 749 |
*/ |
... | ... | |
813 | 827 |
} |
814 | 828 |
} |
815 | 829 |
|
830 |
/** |
|
831 |
* @return the infraGenericEpithetField |
|
832 |
*/ |
|
833 |
@Override |
|
834 |
public AbstractField<String> getInfraGenericEpithetField() { |
|
835 |
return infraGenericEpithetField; |
|
836 |
} |
|
837 |
|
|
838 |
/** |
|
839 |
* @return the specificEpithetField |
|
840 |
*/ |
|
841 |
@Override |
|
842 |
public AbstractField<String> getSpecificEpithetField() { |
|
843 |
return specificEpithetField; |
|
844 |
} |
|
816 | 845 |
|
846 |
/** |
|
847 |
* @return the infraSpecificEpithetField |
|
848 |
*/ |
|
849 |
@Override |
|
850 |
public AbstractField<String> getInfraSpecificEpithetField() { |
|
851 |
return infraSpecificEpithetField; |
|
852 |
} |
|
817 | 853 |
|
818 | 854 |
|
819 | 855 |
} |
Also available in: Unified diff
ref #7338 TaxonNameEditor mode VALIDATE_AGAINST_HIGHER_NAME_PART implemented for genusOrUninomial