Revision 56dde679
Added by Andreas Müller almost 6 years ago
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java | ||
---|---|---|
45 | 45 |
import org.eclipse.ui.swt.IFocusService; |
46 | 46 |
|
47 | 47 |
import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator; |
48 |
import eu.etaxonomy.cdm.model.taxon.TaxonBase; |
|
49 | 48 |
import eu.etaxonomy.taxeditor.model.AbstractUtility; |
50 | 49 |
import eu.etaxonomy.taxeditor.model.IContextListener; |
51 | 50 |
import eu.etaxonomy.taxeditor.model.MessagingUtils; |
... | ... | |
214 | 213 |
} |
215 | 214 |
|
216 | 215 |
|
217 |
IFindTaxaAndNamesConfigurator configurator = configurationListener.getConfigurator(); |
|
216 |
IFindTaxaAndNamesConfigurator<?> configurator = configurationListener.getConfigurator();
|
|
218 | 217 |
configurator.setTitleSearchString(searchString); |
219 | 218 |
openSearchResultsView(configurator); |
220 | 219 |
|
... | ... | |
233 | 232 |
* |
234 | 233 |
* @param searchResult |
235 | 234 |
*/ |
236 |
private void openSearchResultsView(IFindTaxaAndNamesConfigurator configurator) { |
|
235 |
private void openSearchResultsView(IFindTaxaAndNamesConfigurator<?> configurator) {
|
|
237 | 236 |
boolean openResultInSeparateWindows = PreferencesUtil.getPreferenceStore().getBoolean((IPreferenceKeys.SEARCH_OPEN_RESULTS_IN_SEPARATE_WINDOWS)); |
238 | 237 |
String partId = AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_NAVIGATION_SEARCH_E4_SEARCHRESULTVIEWE4; |
239 | 238 |
|
... | ... | |
322 | 321 |
*/ |
323 | 322 |
class ConfigurationSelectionListener extends SelectionAdapter { |
324 | 323 |
|
325 |
private IFindTaxaAndNamesConfigurator configurator = PreferencesUtil.getSearchConfigurator(); |
|
324 |
private IFindTaxaAndNamesConfigurator<?> configurator = PreferencesUtil.getSearchConfigurator();
|
|
326 | 325 |
|
327 | 326 |
@Override |
328 | 327 |
public void widgetSelected(SelectionEvent e) { |
... | ... | |
346 | 345 |
saveConfigurator(); |
347 | 346 |
} |
348 | 347 |
|
349 |
public IFindTaxaAndNamesConfigurator getConfigurator() { |
|
348 |
public IFindTaxaAndNamesConfigurator<?> getConfigurator() {
|
|
350 | 349 |
return configurator; |
351 | 350 |
} |
352 | 351 |
|
Also available in: Unified diff
cleanup