Revision 33523822
Added by Katja Luther over 2 years ago
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixConfigLabelAccumulator.java | ||
|---|---|---|
| 201 | 201 |
TermTreeDto tree = matrix.getDescriptiveDataSet().getDescriptiveSystem(); |
| 202 | 202 |
boolean isApplicableCheck = true; |
| 203 | 203 |
if (tree.getOnlyApplicable().containsKey(feature.getUuid())){
|
| 204 |
|
|
| 204 | 205 |
for (FeatureStateDto featureStateDto:tree.getOnlyApplicable().get(feature.getUuid())){
|
| 206 |
isApplicableCheck = false; |
|
| 205 | 207 |
FeatureDto dto = featureStateDto.getFeature(); |
| 206 | 208 |
TermDto stateDto = featureStateDto.getState(); |
| 207 | 209 |
Set<DescriptionElementDto> descEls = rowWrapperDTO.getDataValueForFeature(dto.getUuid()); |
| ... | ... | |
| 209 | 211 |
for (DescriptionElementDto el:descEls){
|
| 210 | 212 |
if (el instanceof CategoricalDataDto){
|
| 211 | 213 |
for (StateDataDto stateData:((CategoricalDataDto) el).getStates()){
|
| 212 |
isApplicableCheck &= stateData.getState().getUuid().equals(stateDto.getUuid());
|
|
| 214 |
isApplicableCheck |= stateData.getState().getUuid().equals(stateDto.getUuid());
|
|
| 213 | 215 |
} |
| 214 | 216 |
} |
| 215 | 217 |
} |
Also available in: Unified diff
ref #9861: smaller changes to fit the logic of inapplicable and only applicable