Revision 577e8a82
Added by Patrick Plitzner almost 6 years ago
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/SpecimenSelectionDialog.java | ||
---|---|---|
9 | 9 |
package eu.etaxonomy.taxeditor.editor.workingSet.matrix; |
10 | 10 |
|
11 | 11 |
import java.util.ArrayList; |
12 |
import java.util.Arrays; |
|
13 | 12 |
import java.util.Collection; |
14 |
import java.util.List; |
|
15 | 13 |
import java.util.stream.Collectors; |
16 | 14 |
import java.util.stream.Stream; |
17 | 15 |
|
... | ... | |
40 | 38 |
import org.eclipse.swt.widgets.Text; |
41 | 39 |
|
42 | 40 |
import eu.etaxonomy.cdm.api.service.IWorkingSetService; |
43 |
import eu.etaxonomy.cdm.api.service.dto.RowWrapperDTO;
|
|
41 |
import eu.etaxonomy.cdm.api.service.dto.SpecimenNodeWrapper;
|
|
44 | 42 |
import eu.etaxonomy.cdm.common.CdmUtils; |
45 | 43 |
import eu.etaxonomy.taxeditor.editor.l10n.Messages; |
46 | 44 |
import eu.etaxonomy.taxeditor.model.AbstractUtility; |
... | ... | |
58 | 56 |
*/ |
59 | 57 |
public class SpecimenSelectionDialog extends Dialog { |
60 | 58 |
|
61 |
private static final List<String> NODE_PROPERTY_PATH = Arrays.asList(new String[] { |
|
62 |
"taxon", |
|
63 |
"taxon.name", |
|
64 |
}); |
|
65 |
|
|
66 | 59 |
private static String TEXT_FILTER_DEFAULT = "Enter text filter"; |
67 | 60 |
|
68 | 61 |
private TableViewer list; |
69 | 62 |
|
70 |
private Collection<RowWrapperDTO> selectedSpecimens = new ArrayList<>();
|
|
63 |
private Collection<SpecimenNodeWrapper> selectedSpecimens = new ArrayList<>();
|
|
71 | 64 |
private CharacterMatrix matrix; |
72 | 65 |
private Text txtTextFilter; |
73 | 66 |
|
... | ... | |
161 | 154 |
} |
162 | 155 |
|
163 | 156 |
private void applyFilter(){ |
164 |
Stream<RowWrapperDTO> filteredWrappers =matrix.getSpecimenCache().stream();
|
|
157 |
Stream<SpecimenNodeWrapper> filteredWrappers = matrix.getSpecimenCache().stream();
|
|
165 | 158 |
if(comboTaxon.getSelection()!=null){ |
166 | 159 |
filteredWrappers = |
167 | 160 |
filteredWrappers |
... | ... | |
171 | 164 |
&&!CdmUtils.isBlank(txtTextFilter.getText())){ |
172 | 165 |
filteredWrappers = |
173 | 166 |
filteredWrappers |
174 |
.filter(wrapper->wrapper.getSpecimen().getTitleCache().toLowerCase().contains(txtTextFilter.getText().toLowerCase()));
|
|
167 |
.filter(wrapper->wrapper.getUuidAndTitleCache().getTitleCache().toLowerCase().contains(txtTextFilter.getText().toLowerCase()));
|
|
175 | 168 |
} |
176 | 169 |
list.setInput(filteredWrappers.collect(Collectors.toList())); |
177 | 170 |
} |
178 | 171 |
|
179 | 172 |
private void loadSpecimens(){ |
180 |
Collection<RowWrapperDTO> specimenCache = CdmStore.getService(IWorkingSetService.class).loadSpecimens(matrix.getWorkingSet());
|
|
173 |
Collection<SpecimenNodeWrapper> specimenCache = CdmStore.getService(IWorkingSetService.class).loadSpecimens(matrix.getWorkingSet());
|
|
181 | 174 |
matrix.setSpecimenCache(specimenCache); |
182 | 175 |
} |
183 | 176 |
|
... | ... | |
200 | 193 |
return true; |
201 | 194 |
} |
202 | 195 |
|
203 |
public Collection<RowWrapperDTO> getSpecimen(){
|
|
196 |
public Collection<SpecimenNodeWrapper> getSpecimen(){
|
|
204 | 197 |
return selectedSpecimens; |
205 | 198 |
} |
206 | 199 |
|
... | ... | |
213 | 206 |
|
214 | 207 |
@Override |
215 | 208 |
public String getColumnText(Object element, int columnIndex) { |
216 |
if(element instanceof RowWrapperDTO){
|
|
217 |
RowWrapperDTO wrapper = (RowWrapperDTO)element;
|
|
209 |
if(element instanceof SpecimenNodeWrapper){
|
|
210 |
SpecimenNodeWrapper wrapper = (SpecimenNodeWrapper)element;
|
|
218 | 211 |
switch (columnIndex) { |
219 | 212 |
case 0: |
220 | 213 |
return wrapper.getTaxonNode().getTaxon().getName().getTitleCache(); |
221 | 214 |
case 1: |
222 |
return wrapper.getSpecimen().getTitleCache();
|
|
215 |
return wrapper.getUuidAndTitleCache().getTitleCache();
|
|
223 | 216 |
default: |
224 | 217 |
break; |
225 | 218 |
} |
Also available in: Unified diff
ref #7095 Speed up specimen loading for working sets