Revision 9f53671d
Added by Cherian Mathew about 9 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/component/NewTaxonBaseComposite.java | ||
|---|---|---|
| 32 | 32 |
import com.vaadin.ui.VerticalLayout; |
| 33 | 33 |
import com.vaadin.ui.Window; |
| 34 | 34 |
|
| 35 |
import eu.etaxonomy.cdm.vaadin.container.IdAndUuid;
|
|
| 35 |
import eu.etaxonomy.cdm.vaadin.container.IdUuidName;
|
|
| 36 | 36 |
import eu.etaxonomy.cdm.vaadin.session.CdmChangeEvent; |
| 37 | 37 |
import eu.etaxonomy.cdm.vaadin.session.CdmChangeEvent.Action; |
| 38 | 38 |
import eu.etaxonomy.cdm.vaadin.util.CdmVaadinOperation; |
| ... | ... | |
| 77 | 77 |
|
| 78 | 78 |
|
| 79 | 79 |
private final Window dialog; |
| 80 |
private final IdAndUuid accTaxonIdUuid;
|
|
| 81 |
private final IdAndUuid classificationIdUuid;
|
|
| 80 |
private final IdUuidName accTaxonIdUuid;
|
|
| 81 |
private final IdUuidName classificationIdUuid;
|
|
| 82 | 82 |
|
| 83 | 83 |
private static final Logger logger = Logger.getLogger(NewTaxonBaseComposite.class); |
| 84 | 84 |
|
| ... | ... | |
| 91 | 91 |
*/ |
| 92 | 92 |
public NewTaxonBaseComposite(Window dialog, |
| 93 | 93 |
INewTaxonBaseComponentListener listener, |
| 94 |
IdAndUuid accTaxonIdUuid,
|
|
| 94 |
IdUuidName accTaxonIdUuid,
|
|
| 95 | 95 |
String accTaxonName, |
| 96 |
IdAndUuid classificationIdUuid) {
|
|
| 96 |
IdUuidName classificationIdUuid) {
|
|
| 97 | 97 |
buildMainLayout(); |
| 98 | 98 |
setCompositionRoot(mainLayout); |
| 99 | 99 |
|
| ... | ... | |
| 158 | 158 |
@Override |
| 159 | 159 |
public boolean execute() {
|
| 160 | 160 |
setProgress("Saving Taxon " + nameTextField.getValue());
|
| 161 |
IdAndUuid taxonBaseIdUuid;
|
|
| 161 |
IdUuidName taxonBaseIdUuid;
|
|
| 162 | 162 |
if(accTaxonIdUuid == null) {
|
| 163 | 163 |
taxonBaseIdUuid = listener.newTaxon(nameTextField.getValue(),secComboBox.getValue(), classificationIdUuid.getUuid()); |
| 164 | 164 |
} else {
|
Also available in: Unified diff
EditConceptRelationshipComposite : updated composite for new and edit functionality
IdAndUuid -> IdAndUuidName : new identity object with name
NewTaxonBaseComposite, StatusComposite, NewTaxonBasePresenter, IConceptRelationshipComponentListener, INewTaxonBaseComponentListener : changed IdUuid to IdUuidName
ConceptRelationshipPresenter, ConceptRelationshipPresenterTest(.xml) : added update and delete methods for relationships
CdmQueryFactory : updated relationship query to include classification