Revision 4f7ccb87
Added by Patrick Plitzner over 7 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/presenter/dbstatus/DistributionTablePresenter.java | ||
|---|---|---|
| 20 | 20 |
import eu.etaxonomy.cdm.api.service.ITaxonService; |
| 21 | 21 |
import eu.etaxonomy.cdm.api.service.ITermService; |
| 22 | 22 |
import eu.etaxonomy.cdm.api.service.IVocabularyService; |
| 23 |
import eu.etaxonomy.cdm.common.CdmUtils; |
|
| 23 | 24 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 24 | 25 |
import eu.etaxonomy.cdm.model.common.DefinedTermBase; |
| 25 | 26 |
import eu.etaxonomy.cdm.model.common.Language; |
| ... | ... | |
| 147 | 148 |
// Collections.sort(list); |
| 148 | 149 |
return list; |
| 149 | 150 |
} |
| 150 |
|
|
| 151 |
private List<String> getNamedAreas(){
|
|
| 151 |
|
|
| 152 |
public List<String> getNamedAreas(){
|
|
| 152 | 153 |
String selectedAreas = (String) VaadinSession.getCurrent().getAttribute("selectedAreas");
|
| 154 |
if(CdmUtils.isBlank(selectedAreas)){
|
|
| 155 |
return getTermList(); |
|
| 156 |
} |
|
| 153 | 157 |
return Arrays.asList(selectedAreas.split(","));
|
| 154 | 158 |
} |
| 155 | 159 |
|
| ... | ... | |
| 227 | 231 |
for (TaxonNode taxonNode : getAllNodes()) {
|
| 228 | 232 |
nodeIds.add(taxonNode.getId()); |
| 229 | 233 |
} |
| 230 |
List<String> termList = getTermList(); |
|
| 231 | 234 |
List<String> namesAreaUuids = getNamedAreas(); |
| 232 |
CdmSQLContainer container = new CdmSQLContainer(CdmQueryFactory.generateTaxonDistributionQuery(termList, nodeIds, namesAreaUuids));
|
|
| 235 |
CdmSQLContainer container = new CdmSQLContainer(CdmQueryFactory.generateTaxonDistributionQuery(nodeIds, namesAreaUuids)); |
|
| 233 | 236 |
return container; |
| 234 | 237 |
} |
| 235 | 238 |
|
Also available in: Unified diff
ref #5458 Implement multi select for NamedArea selection