Project

General

Profile

« Previous | Next » 

Revision 18754eca

Added by Patrick Plitzner almost 7 years ago

Only allow taxa >= species in selection view #5458

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/presenter/dbstatus/DistributionSelectionPresenter.java
16 16
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
17 17
import eu.etaxonomy.cdm.model.common.TermType;
18 18
import eu.etaxonomy.cdm.model.common.TermVocabulary;
19
import eu.etaxonomy.cdm.model.name.Rank;
19 20
import eu.etaxonomy.cdm.model.taxon.Classification;
20 21
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
21 22
import eu.etaxonomy.cdm.vaadin.util.CdmSpringContextHelper;
......
47 48

  
48 49
	@Override
49 50
	public List<TaxonNode> getTaxonNodeList() {
51
		List<TaxonNode> nodes = new ArrayList<TaxonNode>();
52

  
50 53
		IClassificationService classificationService = CdmSpringContextHelper.getClassificationService();
51 54
		ITaxonNodeService taxonNodeService = CdmSpringContextHelper.getTaxonNodeService();
52 55
		List<Classification> classificationList = classificationService.listClassifications(null, null, null, NODE_INIT_STRATEGY());
53
		List<TaxonNode> nodes = new ArrayList<TaxonNode>();
54 56
		for (Classification classification : classificationList) {
55
			nodes.addAll(taxonNodeService.listAllNodesForClassification(classification, null, null));
57
			nodes.add(classification.getRootNode());
58
			List<TaxonNode> allNodesForClassification = taxonNodeService.listAllNodesForClassification(classification, null, null);
59
			for (TaxonNode taxonNode : allNodesForClassification) {
60
				if(taxonNode.getTaxon()!=null && taxonNode.getTaxon().getName()!=null && taxonNode.getTaxon().getName().getRank()!=null){
61
					Rank rank = taxonNode.getTaxon().getName().getRank();
62
					if(rank.isHigher(Rank.SPECIES()) || rank.equals(Rank.SPECIES())){
63
						nodes.add(taxonNode);
64
					}
65
				}
66
			}
56 67
		}
57 68
		return nodes;
58 69
	}

Also available in: Unified diff