Project

General

Profile

« Previous | Next » 

Revision 27064204

Added by Patrick Plitzner almost 5 years ago

ref #7589 Fix multiple selection for categorical data in matrix editor

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/categorical/CategoricalDataCellEditor.java
8 8
*/
9 9
package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.categorical;
10 10

  
11
import java.util.List;
12
import java.util.stream.Collectors;
13

  
11 14
import org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor;
12 15
import org.eclipse.nebula.widgets.nattable.widget.NatCombo;
13 16
import org.eclipse.swt.events.SelectionEvent;
......
16 19
import org.eclipse.swt.widgets.Control;
17 20

  
18 21
import eu.etaxonomy.cdm.api.service.dto.RowWrapperDTO;
22
import eu.etaxonomy.cdm.model.description.CategoricalData;
19 23
import eu.etaxonomy.cdm.model.description.Feature;
24
import eu.etaxonomy.cdm.model.description.State;
20 25
import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.CharacterMatrix;
21 26

  
22 27
/**
......
46 51
                ((RowWrapperDTO) rowWrapper).addCategoricalData(feature);
47 52
            }
48 53
        }
54
        if(canonicalValue instanceof CategoricalData){
55
            List<State> statesOnly = ((CategoricalData) canonicalValue).getStatesOnly();
56
            super.setCanonicalValue(statesOnly.stream().map(state->state.getTitleCache()).collect(Collectors.toList()));
57
            return;
58
        }
49 59
        super.setCanonicalValue(canonicalValue);
50 60
    }
51 61

  

Also available in: Unified diff