fix compile error

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
index a6ada38382d8c42d441e4cb9b8ef74f6148f84a4..5d4591d4f34f5d6955b096159ecf294fa5c1abbf 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
@@ -213,7 +213,7 @@ public class SearchBar implements IContextListener{
                }
 
 
-               IFindTaxaAndNamesConfigurator<?> configurator = configurationListener.getConfigurator();
+               IFindTaxaAndNamesConfigurator configurator = configurationListener.getConfigurator();
                configurator.setTitleSearchString(searchString);
                openSearchResultsView(configurator);
 
@@ -232,7 +232,7 @@ public class SearchBar implements IContextListener{
         *
         * @param searchResult
         */
-       private void openSearchResultsView(IFindTaxaAndNamesConfigurator<?> configurator) {
+       private void openSearchResultsView(IFindTaxaAndNamesConfigurator configurator) {
                boolean openResultInSeparateWindows = PreferencesUtil.getPreferenceStore().getBoolean((IPreferenceKeys.SEARCH_OPEN_RESULTS_IN_SEPARATE_WINDOWS));
                String partId = AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_NAVIGATION_SEARCH_E4_SEARCHRESULTVIEWE4;
 
@@ -321,7 +321,7 @@ public class SearchBar implements IContextListener{
         */
        class ConfigurationSelectionListener extends SelectionAdapter {
 
-               private IFindTaxaAndNamesConfigurator<?> configurator = PreferencesUtil.getSearchConfigurator();
+               private IFindTaxaAndNamesConfigurator configurator = PreferencesUtil.getSearchConfigurator();
 
                @Override
                public void widgetSelected(SelectionEvent e) {
@@ -345,7 +345,7 @@ public class SearchBar implements IContextListener{
                        saveConfigurator();
                }
 
-               public IFindTaxaAndNamesConfigurator<?> getConfigurator() {
+               public IFindTaxaAndNamesConfigurator getConfigurator() {
                        return configurator;
                }
 

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/e4/SearchResultViewE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/e4/SearchResultViewE4.java
index 957209217bed4557aaf0da00872e7728f2e1ae50..9810460aa59187b25d9e598a3f784c83c9f7257c 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/e4/SearchResultViewE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/e4/SearchResultViewE4.java
@@ -244,7 +244,7 @@ public class SearchResultViewE4 implements IConversationEnabled{
         *
         * @param result a {@link java.util.List} object.
         */
-       protected void displaySearchResult(List<UuidAndTitleCache<IdentifiableEntity>> result) {
+       protected void displaySearchResult(List<UuidAndTitleCache<? extends IdentifiableEntity>> result) {
                if(result.size() > 0){
                        resultViewer.setInput(result);
                        status.setText(String.format(Messages.SearchResultView_CNT_ENTITIES_FOUND, result.size()));
@@ -333,7 +333,7 @@ public class SearchResultViewE4 implements IConversationEnabled{
                        monitor.beginTask("", 100); //$NON-NLS-1$
                        monitor.worked(20);
 
-                       final List<UuidAndTitleCache<IdentifiableEntity>> searchResult = CdmStore.getSearchManager().findTaxaAndNames(configurator);
+                       List<UuidAndTitleCache<? extends IdentifiableEntity>> searchResult = CdmStore.getSearchManager().findTaxaAndNames(configurator);
                        monitor.worked(40);
 
                        if(! monitor.isCanceled()){