Revision a0914872
Added by Katja Luther over 2 years ago
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/SpecimenColumnPropertyAccessor.java | ||
|---|---|---|
| 8 | 8 |
*/ |
| 9 | 9 |
package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix; |
| 10 | 10 |
|
| 11 |
import java.util.ArrayList; |
|
| 11 | 12 |
import java.util.Collection; |
| 12 | 13 |
import java.util.List; |
| 13 | 14 |
|
| ... | ... | |
| 88 | 89 |
|
| 89 | 90 |
FeatureDto feature = matrix.getIndexToFeatureMap().get(columnIndex); |
| 90 | 91 |
if(feature.isSupportsCategoricalData() |
| 91 |
&& newValue instanceof Collection |
|
| 92 |
&& ((Collection) newValue).stream().allMatch(o->o instanceof TermDto)){
|
|
| 93 |
List<TermDto> dtos = (List<TermDto>)newValue; |
|
| 92 |
&& newValue instanceof Collection){
|
|
| 93 |
|
|
| 94 |
List<TermDto> dtos = new ArrayList<>(); |
|
| 95 |
if (((Collection) newValue).stream().allMatch(o->o instanceof TermDto) ){
|
|
| 96 |
dtos = (List<TermDto>)newValue; |
|
| 97 |
} |
|
| 94 | 98 |
// List<UUID> termUuids = dtos.stream().map(dto->dto.getUuid()).collect(Collectors.toList()); |
| 95 | 99 |
// List<DefinedTermBase> terms = CdmStore.getService(ITermService.class).load(termUuids, null); |
| 96 | 100 |
// List<State> states = new ArrayList<>(); |
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/categorical/CategoricalDataCellEditor.java | ||
|---|---|---|
| 44 | 44 |
if(rowWrapper instanceof RowWrapperDTO){
|
| 45 | 45 |
FeatureDto feature = matrix.getIndexToFeatureMap().get(getColumnIndex()); |
| 46 | 46 |
// FIXME avoid creating empty CategoricalData |
| 47 |
((RowWrapperDTO) rowWrapper).addCategoricalData(feature); |
|
| 47 |
// ((RowWrapperDTO) rowWrapper).addCategoricalData(feature);
|
|
| 48 | 48 |
} |
| 49 | 49 |
} |
| 50 | 50 |
super.setCanonicalValue(canonicalValue); |
Also available in: Unified diff
ref #9772: fix problems with rowWrapper