Revision 2d25257c
Added by Andreas Kohlbecker over 5 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditor.java | ||
|---|---|---|
| 18 | 18 |
import org.apache.commons.lang3.BooleanUtils; |
| 19 | 19 |
import org.springframework.context.annotation.Scope; |
| 20 | 20 |
import org.springframework.security.core.GrantedAuthority; |
| 21 |
import org.vaadin.viritin.fields.LazyComboBox; |
|
| 22 | 21 |
|
| 23 | 22 |
import com.vaadin.data.Property; |
| 24 | 23 |
import com.vaadin.data.Property.ValueChangeListener; |
| ... | ... | |
| 57 | 56 |
import eu.etaxonomy.vaadin.component.SwitchableTextField; |
| 58 | 57 |
import eu.etaxonomy.vaadin.component.ToManyRelatedEntitiesComboboxSelect; |
| 59 | 58 |
import eu.etaxonomy.vaadin.component.ToOneRelatedEntityCombobox; |
| 59 |
import eu.etaxonomy.vaadin.component.WeaklyRelatedEntityCombobox; |
|
| 60 | 60 |
import eu.etaxonomy.vaadin.event.EditorActionType; |
| 61 | 61 |
import eu.etaxonomy.vaadin.mvp.AbstractCdmDTOPopupEditor; |
| 62 | 62 |
|
| ... | ... | |
| 705 | 705 |
if(isModeEnabled(TaxonNamePopupEditorMode.VALIDATE_AGAINST_HIGHER_NAME_PART)){
|
| 706 | 706 |
if(isSpeciesOrBelow) {
|
| 707 | 707 |
if(TextField.class.isAssignableFrom(genusOrUninomialField.getClass())){
|
| 708 |
genusOrUninomialField = replaceComponent("genusOrUninomial", genusOrUninomialField, new LazyComboBox<String>(String.class), 0, genusOrUninomialRow, 1, genusOrUninomialRow);
|
|
| 708 |
WeaklyRelatedEntityCombobox<TaxonName> combobox = new WeaklyRelatedEntityCombobox<TaxonName>("-> this caption will be relpaced <-", TaxonName.class);
|
|
| 709 |
genusOrUninomialField = replaceComponent("genusOrUninomial", genusOrUninomialField, combobox, 0, genusOrUninomialRow, 1, genusOrUninomialRow);
|
|
| 709 | 710 |
} |
| 710 | 711 |
} else {
|
| 711 |
if(LazyComboBox.class.isAssignableFrom(genusOrUninomialField.getClass())) {
|
|
| 712 |
if(ToOneRelatedEntityCombobox.class.isAssignableFrom(genusOrUninomialField.getClass())) {
|
|
| 712 | 713 |
genusOrUninomialField = replaceComponent("genusOrUninomial", genusOrUninomialField, new TextFieldNFix(), 0, genusOrUninomialRow, 1, genusOrUninomialRow);
|
| 713 | 714 |
} |
| 714 | 715 |
} |
| ... | ... | |
| 717 | 718 |
if(isModeEnabled(TaxonNamePopupEditorMode.VALIDATE_AGAINST_HIGHER_NAME_PART)){
|
| 718 | 719 |
if(rank.isInfraSpecific()) {
|
| 719 | 720 |
if(TextField.class.isAssignableFrom(specificEpithetField.getClass())) {
|
| 720 |
specificEpithetField = replaceComponent("specificEpithet", specificEpithetField, new LazyComboBox<String>(String.class), 0, specificEpithetFieldRow, 1, specificEpithetFieldRow);
|
|
| 721 |
WeaklyRelatedEntityCombobox<TaxonName> combobox = new WeaklyRelatedEntityCombobox<TaxonName>("-> this caption will be relpaced <-", TaxonName.class);
|
|
| 722 |
specificEpithetField = replaceComponent("specificEpithet", specificEpithetField, combobox, 0, specificEpithetFieldRow, 1, specificEpithetFieldRow);
|
|
| 721 | 723 |
} |
| 722 | 724 |
} else {
|
| 723 |
if(LazyComboBox.class.isAssignableFrom(specificEpithetField.getClass())) {
|
|
| 725 |
if(ToOneRelatedEntityCombobox.class.isAssignableFrom(specificEpithetField.getClass())) {
|
|
| 724 | 726 |
specificEpithetField = replaceComponent("specificEpithet", specificEpithetField, new TextFieldNFix(), 0, specificEpithetFieldRow, 1, specificEpithetFieldRow);
|
| 725 | 727 |
} |
| 726 | 728 |
} |
Also available in: Unified diff
ref #7783 implementing WeaklyRelatedEntityCombobox according PagingProvider