Revision 2fe68f38
Added by Patrick Plitzner about 5 years ago
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrix.java | ||
|---|---|---|
| 98 | 98 |
import eu.etaxonomy.cdm.api.service.dto.RowWrapperDTO; |
| 99 | 99 |
import eu.etaxonomy.cdm.api.service.dto.SpecimenRowWrapperDTO; |
| 100 | 100 |
import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor; |
| 101 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
|
| 102 |
import eu.etaxonomy.cdm.model.common.DefinedTermBase; |
|
| 103 | 101 |
import eu.etaxonomy.cdm.model.description.Character; |
| 104 | 102 |
import eu.etaxonomy.cdm.model.description.DescriptionBase; |
| 105 | 103 |
import eu.etaxonomy.cdm.model.description.DescriptiveDataSet; |
| ... | ... | |
| 271 | 269 |
natTable.doCommand(new ClientAreaResizeCommand(natTable)); |
| 272 | 270 |
} |
| 273 | 271 |
|
| 274 |
private List<Character> initCharacterList(FeatureNode node){
|
|
| 272 |
private List<Character> initCharacterList(FeatureNode<Character> node){
|
|
| 275 | 273 |
List<Character> characters = new ArrayList<>(); |
| 276 | 274 |
node.getChildNodes().forEach(childNode-> |
| 277 | 275 |
{
|
| 278 |
DefinedTermBase term = childNode.getTerm(); |
|
| 279 |
// FIXME #8146 this is currently checked via the termType of the tree |
|
| 280 |
// in the init() method. This may be solved by adding generics to FeatureNode |
|
| 281 |
// so that getTerm is typified. This would make this check obsolete |
|
| 282 |
if(term.isInstanceOf(Character.class)){
|
|
| 283 |
characters.add(HibernateProxyHelper.deproxy(term, Character.class)); |
|
| 284 |
} |
|
| 276 |
characters.add(childNode.getTerm()); |
|
| 285 | 277 |
characters.addAll(initCharacterList(childNode)); |
| 286 | 278 |
}); |
| 287 | 279 |
return characters; |
| ... | ... | |
| 290 | 282 |
public void initDescriptiveDataSet(DescriptiveDataSet descriptiveDataSet){
|
| 291 | 283 |
this.descriptiveDataSet = descriptiveDataSet; |
| 292 | 284 |
//get features/columns stored in descriptive data set |
| 293 |
FeatureTree tree = descriptiveDataSet.getDescriptiveSystem(); |
|
| 285 |
FeatureTree<Character> tree = descriptiveDataSet.getDescriptiveSystem();
|
|
| 294 | 286 |
characters = initCharacterList(tree.getRoot()); |
| 295 | 287 |
|
| 296 | 288 |
//init state data for categorical features |
Also available in: Unified diff
ref #6794 Adapt taxeditor to model changes (feature tree/node generics)