Revision 7b6b3222
Added by Patrick Plitzner over 5 years ago
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java | ||
---|---|---|
93 | 93 |
matrix.getDescriptiveDataSet().addDescription(specimenDescription); |
94 | 94 |
matrix.getCdmEntitiySession().load(specimenDescription, true); |
95 | 95 |
|
96 |
//add taxon description |
|
97 |
TaxonRowWrapperDTO taxonDescription = rowWrapper.getDefaultTaxonDescription(); |
|
98 |
if(taxonDescription!=null){ |
|
99 |
matrix.getDescriptiveDataSet().addDescription(taxonDescription.getDescription()); |
|
100 |
matrix.getCdmEntitiySession().load(taxonDescription.getDescription(), true); |
|
101 |
} |
|
102 |
|
|
103 | 96 |
matrix.setDirty(); |
104 | 97 |
matrix.getSpecimenCache().remove(wrapper); |
105 | 98 |
} |
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/DescriptionTreeFormat.java | ||
---|---|---|
14 | 14 |
|
15 | 15 |
import ca.odell.glazedlists.TreeList; |
16 | 16 |
import eu.etaxonomy.cdm.api.service.dto.RowWrapperDTO; |
17 |
import eu.etaxonomy.cdm.api.service.dto.SpecimenRowWrapperDTO; |
|
18 |
import eu.etaxonomy.cdm.api.service.dto.TaxonRowWrapperDTO; |
|
19 | 17 |
import eu.etaxonomy.cdm.model.description.DescriptiveDataSet; |
20 | 18 |
import eu.etaxonomy.cdm.model.name.Rank; |
21 | 19 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
... | ... | |
38 | 36 |
|
39 | 37 |
@Override |
40 | 38 |
public void getPath(List path, Object element) { |
41 |
if(element instanceof SpecimenRowWrapperDTO |
|
42 |
&& ((SpecimenRowWrapperDTO) element).getDefaultTaxonDescription()!=null){ |
|
43 |
TaxonRowWrapperDTO defaultTaxonDescription = ((SpecimenRowWrapperDTO) element).getDefaultTaxonDescription(); |
|
44 |
addPathRecursive(path, defaultTaxonDescription.getTaxonNode()); |
|
45 |
path.add(defaultTaxonDescription); |
|
46 |
} |
|
47 |
else if(element instanceof RowWrapperDTO){ |
|
39 |
if(element instanceof RowWrapperDTO){ |
|
48 | 40 |
//TODO: check for multiple taxon nodes in multiple classifications |
49 | 41 |
TaxonNode taxonNode = ((RowWrapperDTO) element).getTaxonNode(); |
50 | 42 |
addPathRecursive(path, taxonNode); |
Also available in: Unified diff
ref #7589 Remove reference to default taxon desc from row wrapper