This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit ab9872f9654519f958450f82f5f7a444422a9fed Author: juanpablo <juanpa...@apache.org> AuthorDate: Mon Oct 29 00:51:18 2018 +0100 use generics --- .../main/java/org/apache/wiki/search/BasicSearchProvider.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/BasicSearchProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/search/BasicSearchProvider.java index 1dd2970..0d95d7f 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/search/BasicSearchProvider.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/search/BasicSearchProvider.java @@ -149,12 +149,12 @@ public class BasicSearchProvider implements SearchProvider return ""; } - private Collection findPages( QueryItem[] query, WikiContext wikiContext ) + private Collection< SearchResult > findPages( QueryItem[] query, WikiContext wikiContext ) { - TreeSet<SearchResult> res = new TreeSet<SearchResult>( new SearchResultComparator() ); + TreeSet<SearchResult> res = new TreeSet<>( new SearchResultComparator() ); SearchMatcher matcher = new SearchMatcher( m_engine, query ); - Collection allPages = null; + Collection< WikiPage > allPages = null; try { allPages = m_engine.getPageManager().getAllPages(); } catch( ProviderException pe ) { @@ -164,7 +164,7 @@ public class BasicSearchProvider implements SearchProvider AuthorizationManager mgr = m_engine.getAuthorizationManager(); - Iterator it = allPages.iterator(); + Iterator< WikiPage > it = allPages.iterator(); while( it.hasNext() ) { try { WikiPage page = (WikiPage) it.next(); @@ -195,7 +195,7 @@ public class BasicSearchProvider implements SearchProvider /** * {@inheritDoc} */ - public Collection findPages(String query, WikiContext wikiContext) { + public Collection< SearchResult > findPages(String query, WikiContext wikiContext) { return findPages(parseQuery(query), wikiContext); }