Revision a1b92e88
Added by Patrick Plitzner almost 6 years ago
| eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorSearchE4.java | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
package eu.etaxonomy.taxeditor.bulkeditor.e4; |
| 11 | 11 |
|
| 12 |
import java.util.Comparator; |
|
| 13 |
|
|
| 14 | 12 |
import org.eclipse.swt.SWT; |
| 15 | 13 |
import org.eclipse.swt.events.FocusEvent; |
| 16 | 14 |
import org.eclipse.swt.events.FocusListener; |
| ... | ... | |
| 29 | 27 |
|
| 30 | 28 |
import eu.etaxonomy.cdm.common.CdmUtils; |
| 31 | 29 |
import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorQuery; |
| 32 |
import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorSortCombo; |
|
| 33 | 30 |
import eu.etaxonomy.taxeditor.l10n.Messages; |
| 34 | 31 |
import eu.etaxonomy.taxeditor.model.ColorResources; |
| 35 | 32 |
import eu.etaxonomy.taxeditor.preference.Resources; |
| ... | ... | |
| 51 | 48 |
private final BulkEditorE4 editor; |
| 52 | 49 |
|
| 53 | 50 |
private Text text; |
| 54 |
private BulkEditorSortCombo sortCombo; |
|
| 55 | 51 |
|
| 56 | 52 |
private Button button; |
| 57 | 53 |
|
| ... | ... | |
| 76 | 72 |
|
| 77 | 73 |
createSearchTextField(container, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION); |
| 78 | 74 |
|
| 79 |
createSortCombo(container, style); |
|
| 80 |
|
|
| 81 | 75 |
button = new Button(container, SWT.PUSH); |
| 82 | 76 |
button.setText(SEARCH); |
| 83 | 77 |
button.addSelectionListener(new SelectionAdapter() {
|
| ... | ... | |
| 90 | 84 |
registerAtFocusService(); |
| 91 | 85 |
} |
| 92 | 86 |
|
| 93 |
private void createSortCombo(Composite parent, int style) {
|
|
| 94 |
sortCombo = new BulkEditorSortCombo(parent, editor.getEditorInput().getSortProviders()); |
|
| 95 |
|
|
| 96 |
} |
|
| 97 |
|
|
| 98 | 87 |
/** |
| 99 | 88 |
* Handles focus changes for the textfield. |
| 100 | 89 |
*/ |
| ... | ... | |
| 162 | 151 |
return; |
| 163 | 152 |
} |
| 164 | 153 |
|
| 165 |
BulkEditorQuery query = new BulkEditorQuery(searchString, getComparator());
|
|
| 154 |
BulkEditorQuery query = new BulkEditorQuery(searchString); |
|
| 166 | 155 |
editor.performSearch(query); |
| 167 | 156 |
} |
| 168 | 157 |
|
| ... | ... | |
| 174 | 163 |
return text.getText().trim(); |
| 175 | 164 |
} |
| 176 | 165 |
|
| 177 |
public Comparator getComparator() {
|
|
| 178 |
return sortCombo.getSelection(); |
|
| 179 |
} |
|
| 180 |
|
|
| 181 | 166 |
public void setFocus() {
|
| 182 | 167 |
if(text != null && ! text.isDisposed()){
|
| 183 | 168 |
text.setFocus(); |
Also available in: Unified diff
ref #7439 Remove sort type combo box