Revision c256784f
Added by Andreas Kohlbecker almost 6 years ago
src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditor.java | ||
---|---|---|
40 | 40 |
import eu.etaxonomy.cdm.vaadin.component.common.TeamOrPersonField; |
41 | 41 |
import eu.etaxonomy.cdm.vaadin.event.ReferenceEditorAction; |
42 | 42 |
import eu.etaxonomy.cdm.vaadin.event.TaxonNameEditorAction; |
43 |
import eu.etaxonomy.cdm.vaadin.model.name.TaxonNameDTO; |
|
43 | 44 |
import eu.etaxonomy.cdm.vaadin.permission.AccessRestrictedView; |
44 | 45 |
import eu.etaxonomy.cdm.vaadin.permission.CdmEditDeletePermissionTester; |
45 | 46 |
import eu.etaxonomy.cdm.vaadin.util.TeamOrPersonBaseCaptionGenerator; |
... | ... | |
49 | 50 |
import eu.etaxonomy.vaadin.component.ToManyRelatedEntitiesComboboxSelect; |
50 | 51 |
import eu.etaxonomy.vaadin.component.ToOneRelatedEntityCombobox; |
51 | 52 |
import eu.etaxonomy.vaadin.event.EditorActionType; |
52 |
import eu.etaxonomy.vaadin.mvp.AbstractCdmPopupEditor; |
|
53 |
import eu.etaxonomy.vaadin.mvp.AbstractCdmDTOPopupEditor;
|
|
53 | 54 |
|
54 | 55 |
/** |
55 | 56 |
* @author a.kohlbecker |
... | ... | |
58 | 59 |
*/ |
59 | 60 |
@SpringComponent |
60 | 61 |
@Scope("prototype") |
61 |
public class TaxonNamePopupEditor extends AbstractCdmPopupEditor<TaxonName, TaxonNameEditorPresenter> implements TaxonNamePopupEditorView, AccessRestrictedView {
|
|
62 |
public class TaxonNamePopupEditor extends AbstractCdmDTOPopupEditor<TaxonNameDTO, TaxonName, TaxonNameEditorPresenter> implements TaxonNamePopupEditorView, AccessRestrictedView {
|
|
62 | 63 |
|
63 | 64 |
private static final long serialVersionUID = -7037436241474466359L; |
64 | 65 |
|
... | ... | |
115 | 116 |
* @param dtoType |
116 | 117 |
*/ |
117 | 118 |
public TaxonNamePopupEditor() { |
118 |
super(new GridLayout(GRID_COLS, GRID_ROWS), TaxonName.class); |
|
119 |
super(new GridLayout(GRID_COLS, GRID_ROWS), TaxonNameDTO.class);
|
|
119 | 120 |
} |
120 | 121 |
|
121 | 122 |
/** |
... | ... | |
380 | 381 |
|
381 | 382 |
@Override |
382 | 383 |
protected void afterItemDataSourceSet() { |
383 |
TaxonName taxonName = getBean(); |
|
384 |
TaxonNameDTO taxonName = getBean();
|
|
384 | 385 |
boolean showBasionymSection = taxonName.getBasionyms().size() > 0 |
385 | 386 |
|| taxonName.getBasionymAuthorship() != null |
386 | 387 |
|| taxonName.getExBasionymAuthorship() != null; |
... | ... | |
422 | 423 |
@Override |
423 | 424 |
public void updateAuthorshipFields() { |
424 | 425 |
|
425 |
TaxonName taxonName = getBean(); |
|
426 |
TaxonNameDTO taxonName = getBean();
|
|
426 | 427 |
|
427 | 428 |
// ------------- CombinationAuthors |
428 | 429 |
isInferredCombinationAuthorship = updateAuthorshipFieldData( |
... | ... | |
527 | 528 |
|
528 | 529 |
// TODO use getField() instead and remove field references |
529 | 530 |
|
530 |
TaxonName taxonName = getBean(); |
|
531 |
TaxonNameDTO taxonName = getBean();
|
|
531 | 532 |
Rank rank = taxonName.getRank(); |
532 | 533 |
|
533 | 534 |
boolean isSpeciesOrBelow = !rank.isHigher(Rank.SPECIES()); |
Also available in: Unified diff
turning TaxonNamePopupEditor into dto editor