Project

General

Profile

« Previous | Next » 

Revision 501ab766

Added by Patrick Plitzner over 5 years ago

ref #7875 Completely convert area selection to DTOs

  • Fix initial selection

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/DescriptiveDataSetEditor.java
156 156 
            public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
157 157 
                AreasSelectionDialog areasSelectionDialog = new AreasSelectionDialog(composite.getShell(), composite.getAreas());
158 158 
                if(areasSelectionDialog.open()==Window.OK){
159 
                    Set<TermDto> selectedAreas = areasSelectionDialog.getSelectedAreas();
159 
                    List<TermDto> selectedAreas = areasSelectionDialog.getSelectedAreas();
160 160 
                    if(selectedAreas!=null){
161 161 
                        composite.setAreas(selectedAreas);
162 162 
                        dirty.setDirty(true);
......
210 210 
                    filter.getPartOf()!=null?filter.getPartOf().getUuid():null,
211 211 
                    filter.getVocabulary().getUuid(),
212 212 
                    filter.getOrderIndex())).collect(Collectors.toSet());
213 
            composite.setAreas(terms);
213 
            composite.setAreas(new ArrayList<>(terms));
214 214 
        }
215 215 
        Set<TaxonNode> taxonSubtreeFilter = descriptiveDataSet.getTaxonSubtreeFilter();
216 216 
        if(taxonSubtreeFilter!=null){
......
274 274 
    @Persist
275 275 
    @Override
276 276 
    public void save(IProgressMonitor monitor) {
277 
        Set<TermDto> areas = composite.getAreas();
277 
        Collection<TermDto> areas = composite.getAreas();
278 278 
        Object input = composite.getTaxonNodeTree().getInput();
279 279 
        if(input!=null){
280 280 
            descriptiveDataSet.setTaxonSubtreeFilter(new HashSet<>());//clear existing filter

Also available in: Unified diff