Project

General

Profile

« Previous | Next » 

Revision 09b45523

Added by Patrick Plitzner about 6 years ago

ref #7095 Add taxon filter combo to specimen selection dialog

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/SpecimenSelectionDialog.java
30 30
import org.eclipse.swt.widgets.Control;
31 31
import org.eclipse.swt.widgets.Shell;
32 32
import org.eclipse.swt.widgets.Table;
33
import org.eclipse.swt.widgets.Text;
33 34

  
34 35
import eu.etaxonomy.cdm.api.service.IOccurrenceService;
35 36
import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
......
40 41
import eu.etaxonomy.taxeditor.editor.l10n.Messages;
41 42
import eu.etaxonomy.taxeditor.model.ImageResources;
42 43
import eu.etaxonomy.taxeditor.store.CdmStore;
44
import eu.etaxonomy.taxeditor.ui.combo.taxon.TaxonNodeCombo;
43 45

  
44 46
/**
45 47
 * Dialog to choose specimens for the character matrix.<br>
......
54 56

  
55 57
    private Collection<SpecimenOrObservationBase> selectedSpecimens = new ArrayList<>();
56 58
    private CharacterMatrix matrix;
59
    private Text txtTextFilter;
60

  
61
    private TaxonNodeCombo comboTaxon;
57 62

  
58 63
    protected SpecimenSelectionDialog(Shell parentShell, CharacterMatrix matrix) {
59 64
        super(parentShell);
......
63 68
    @Override
64 69
    protected Control createDialogArea(Composite parent) {
65 70
        Composite composite = (Composite) super.createDialogArea(parent);
66
        composite.setLayout(new GridLayout());
71
        GridLayout gl_composite = new GridLayout();
72
        composite.setLayout(gl_composite);
67 73

  
68
        Button btnRefreshButton = new Button(composite, SWT.NONE);
69
        btnRefreshButton.setToolTipText(Messages.SpecimenSelectionDialog_REFRESH);
74
        Composite composite_1 = new Composite(composite, SWT.NONE);
75
        composite_1.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
76
        composite_1.setLayout(new GridLayout(3, false));
77

  
78
        txtTextFilter = new Text(composite_1, SWT.BORDER);
79
        txtTextFilter.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
80

  
81
        comboTaxon = new TaxonNodeCombo(composite_1, SWT.NONE);
82
        comboTaxon.setInput(matrix.getWorkingSet().getTaxonSubtreeFilter());
83

  
84
        Button btnRefreshButton = new Button(composite_1, SWT.NONE);
70 85
        btnRefreshButton.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
86
        btnRefreshButton.setToolTipText(Messages.SpecimenSelectionDialog_REFRESH);
71 87
        btnRefreshButton.setImage(ImageResources.getImage(ImageResources.REFRESH));
72 88
        btnRefreshButton.addSelectionListener(new SelectionAdapter() {
73 89
            @Override

Also available in: Unified diff