Project

General

Profile

« Previous | Next » 

Revision 785b88aa

Added by Patrick Plitzner over 5 years ago

ref #7597 Adapt to service method changes

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java
31 31
import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
32 32
import eu.etaxonomy.cdm.api.service.UpdateResult;
33 33
import eu.etaxonomy.cdm.api.service.dto.RowWrapperDTO;
34
import eu.etaxonomy.cdm.common.CdmUtils;
34 35
import eu.etaxonomy.cdm.model.description.CategoricalData;
35 36
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
36 37
import eu.etaxonomy.cdm.model.description.Feature;
......
74 75
        btnAddDescription.addSelectionListener(new SelectionAdapter() {
75 76
            @Override
76 77
            public void widgetSelected(SelectionEvent e) {
78
                String error = "";
77 79
                SpecimenSelectionDialog dialog = new SpecimenSelectionDialog(matrix.getShell(), matrix);
78 80
                if(dialog.open()==Window.OK){
79 81
                    Collection<SpecimenNodeWrapper> wrappers = dialog.getSpecimen();
......
88 90
                            Feature feature = descriptionElementBase.getFeature();
89 91
                            featureToElementMap.put(feature, descriptionElementBase);
90 92
                        }
91
                        RowWrapperDTO rowWrapper = CdmStore.getService(IDescriptiveDataSetService.class).createRowWrapper(description, matrix.getDescriptiveDataSet());
93
                        RowWrapperDTO rowWrapper = CdmStore.getService(IDescriptiveDataSetService.class).createRowWrapper(wrapper.getTaxonNode(), description, matrix.getDescriptiveDataSet());
94
                        if(rowWrapper==null){
95
                            error += description;
96
                            continue;
97
                        }
92 98
                        matrix.getDescriptions().add(rowWrapper);
93 99
                        matrix.getDescriptiveDataSet().addDescription(description);
94 100
                        matrix.setDirty();
95 101
                        matrix.getSpecimenCache().remove(wrapper);
96 102
                    }
103
                    if(CdmUtils.isNotBlank(error)){
104
                        MessagingUtils.warningDialog("Errors during row creation", this,
105
                                String.format("Could not create rows for the following description:\n\n%s", error));
106
                    }
97 107
                }
98 108
            }
99 109
        });

Also available in: Unified diff