Revision 3c6e3fc6
Added by Patrick Plitzner over 5 years ago
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/AreasSelectionDialog.java | ||
---|---|---|
27 | 27 |
import eu.etaxonomy.cdm.model.common.TermType; |
28 | 28 |
import eu.etaxonomy.cdm.model.common.TermVocabulary; |
29 | 29 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
30 |
import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
|
|
31 |
import eu.etaxonomy.taxeditor.editor.definedterm.TermUuidAndTitleCacheContentProvider;
|
|
32 |
import eu.etaxonomy.taxeditor.editor.definedterm.TermUuidAndTitleCacheLabelProvider;
|
|
30 |
import eu.etaxonomy.cdm.persistence.dto.TermDto;
|
|
31 |
import eu.etaxonomy.taxeditor.editor.definedterm.TermDtoContentProvider;
|
|
32 |
import eu.etaxonomy.taxeditor.editor.definedterm.TermDtoLabelProvider;
|
|
33 | 33 |
import eu.etaxonomy.taxeditor.preference.wizard.CheckBoxTreeComposite; |
34 | 34 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
35 | 35 |
|
... | ... | |
42 | 42 |
|
43 | 43 |
private CheckBoxTreeComposite treeComposite; |
44 | 44 |
|
45 |
private Set<UuidAndTitleCache> selectedAreas = new HashSet<>();
|
|
45 |
private Set<TermDto> selectedAreas = new HashSet<>();
|
|
46 | 46 |
|
47 | 47 |
private Collection<TermVocabulary<NamedArea>> areaVocabularies; |
48 | 48 |
|
49 | 49 |
|
50 |
protected AreasSelectionDialog(Shell parentShell, Set<UuidAndTitleCache> selectedAreas) {
|
|
50 |
protected AreasSelectionDialog(Shell parentShell, Set<TermDto> selectedAreas) {
|
|
51 | 51 |
super(parentShell); |
52 | 52 |
this.selectedAreas = selectedAreas; |
53 | 53 |
this.areaVocabularies = CdmStore.getService(IVocabularyService.class).findByTermType(TermType.NamedArea, null); |
... | ... | |
56 | 56 |
@Override |
57 | 57 |
protected Control createDialogArea(Composite parent) { |
58 | 58 |
parent.setLayout(new GridLayout()); |
59 |
treeComposite = new CheckBoxTreeComposite(parent, new TermUuidAndTitleCacheContentProvider(), new TermUuidAndTitleCacheLabelProvider(), SWT.NONE);
|
|
59 |
treeComposite = new CheckBoxTreeComposite(parent, new TermDtoContentProvider(), new TermDtoLabelProvider(), SWT.NONE);
|
|
60 | 60 |
treeComposite.getViewer().setInput(areaVocabularies); |
61 | 61 |
treeComposite.setCheckedElements(selectedAreas.toArray()); |
62 | 62 |
treeComposite.getViewer().reveal(selectedAreas); |
... | ... | |
75 | 75 |
protected void okPressed() { |
76 | 76 |
selectedAreas.clear(); |
77 | 77 |
List<Object> checkedElements = Arrays.asList(treeComposite.getViewer().getCheckedElements()); |
78 |
checkedElements = checkedElements.stream().filter(element->element instanceof UuidAndTitleCache).collect(Collectors.toList());
|
|
78 |
checkedElements = checkedElements.stream().filter(element->element instanceof TermDto).collect(Collectors.toList());
|
|
79 | 79 |
selectedAreas = new HashSet(checkedElements); |
80 | 80 |
super.okPressed(); |
81 | 81 |
} |
... | ... | |
85 | 85 |
return true; |
86 | 86 |
} |
87 | 87 |
|
88 |
public Set<UuidAndTitleCache> getSelectedAreas(){
|
|
88 |
public Set<TermDto> getSelectedAreas(){
|
|
89 | 89 |
return selectedAreas; |
90 | 90 |
} |
91 | 91 |
} |
Also available in: Unified diff
ref #7875 Adapt to TermDto based services