Project

General

Profile

Revision bb9378b6

IDbb9378b682ff388e73f079b98012c08a265eb29c
Parent b7e704af
Child b4e4e474

Added by Andreas Müller about 2 years ago

fix compile error

View differences:

eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
213 213
		}
214 214

  
215 215

  
216
		IFindTaxaAndNamesConfigurator<?> configurator = configurationListener.getConfigurator();
216
		IFindTaxaAndNamesConfigurator configurator = configurationListener.getConfigurator();
217 217
		configurator.setTitleSearchString(searchString);
218 218
		openSearchResultsView(configurator);
219 219

  
......
232 232
	 *
233 233
	 * @param searchResult
234 234
	 */
235
	private void openSearchResultsView(IFindTaxaAndNamesConfigurator<?> configurator) {
235
	private void openSearchResultsView(IFindTaxaAndNamesConfigurator configurator) {
236 236
		boolean openResultInSeparateWindows = PreferencesUtil.getPreferenceStore().getBoolean((IPreferenceKeys.SEARCH_OPEN_RESULTS_IN_SEPARATE_WINDOWS));
237 237
		String partId = AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_NAVIGATION_SEARCH_E4_SEARCHRESULTVIEWE4;
238 238

  
......
321 321
	 */
322 322
	class ConfigurationSelectionListener extends SelectionAdapter {
323 323

  
324
		private IFindTaxaAndNamesConfigurator<?> configurator = PreferencesUtil.getSearchConfigurator();
324
		private IFindTaxaAndNamesConfigurator configurator = PreferencesUtil.getSearchConfigurator();
325 325

  
326 326
		@Override
327 327
		public void widgetSelected(SelectionEvent e) {
......
345 345
			saveConfigurator();
346 346
		}
347 347

  
348
		public IFindTaxaAndNamesConfigurator<?> getConfigurator() {
348
		public IFindTaxaAndNamesConfigurator getConfigurator() {
349 349
			return configurator;
350 350
		}
351 351

  
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/e4/SearchResultViewE4.java
244 244
	 *
245 245
	 * @param result a {@link java.util.List} object.
246 246
	 */
247
	protected void displaySearchResult(List<UuidAndTitleCache<IdentifiableEntity>> result) {
247
	protected void displaySearchResult(List<UuidAndTitleCache<? extends IdentifiableEntity>> result) {
248 248
		if(result.size() > 0){
249 249
			resultViewer.setInput(result);
250 250
			status.setText(String.format(Messages.SearchResultView_CNT_ENTITIES_FOUND, result.size()));
......
333 333
			monitor.beginTask("", 100); //$NON-NLS-1$
334 334
			monitor.worked(20);
335 335

  
336
			final List<UuidAndTitleCache<IdentifiableEntity>> searchResult = CdmStore.getSearchManager().findTaxaAndNames(configurator);
336
			List<UuidAndTitleCache<? extends IdentifiableEntity>> searchResult = CdmStore.getSearchManager().findTaxaAndNames(configurator);
337 337
			monitor.worked(40);
338 338

  
339 339
			if(! monitor.isCanceled()){

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)