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 f01e8542d8f137c671b87d5dc4e148aaff221860 Author: juanpablo <juanpa...@apache.org> AuthorDate: Sat Nov 3 14:26:45 2018 +0100 more use of generics --- .../org/apache/wiki/tags/IfNoSearchResultsTag.java | 16 ++++++---------- .../java/org/apache/wiki/tags/IteratorTag.java | 16 +++------------- .../apache/wiki/tags/SearchResultIteratorTag.java | 8 +++----- .../org/apache/wiki/tags/SearchResultsSizeTag.java | 10 +++------- .../org/apache/wiki/tags/SearchResultsTag.java | 22 ++++++++-------------- 5 files changed, 23 insertions(+), 49 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java index 37abd4f..19fae52 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java @@ -22,26 +22,22 @@ import java.io.IOException; import java.util.Collection; import javax.servlet.jsp.PageContext; + /** * If there have been no search results, then outputs the body text. * * @since 2.0 */ -public class IfNoSearchResultsTag - extends WikiTagBase -{ +public class IfNoSearchResultsTag extends WikiTagBase { private static final long serialVersionUID = 0L; - public final int doWikiStartTag() - throws IOException - { - Collection list = (Collection)pageContext.getAttribute( "searchresults", - PageContext.REQUEST_SCOPE ); - if( list == null || list.size() == 0 ) - { + public final int doWikiStartTag() throws IOException { + Collection< ? > list = (Collection< ? >)pageContext.getAttribute( "searchresults", PageContext.REQUEST_SCOPE ); + if( list == null || list.size() == 0 ) { return EVAL_BODY_INCLUDE; } return SKIP_BODY; } + } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java index 90935e1..49633f4 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java @@ -46,8 +46,8 @@ import org.apache.wiki.WikiPage; public abstract class IteratorTag extends BodyTagSupport implements TryCatchFinally { private static final long serialVersionUID = 8945334759300595321L; - protected String m_pageName; - protected Iterator m_iterator; + protected String m_pageName; + protected Iterator< ? > m_iterator; protected WikiContext m_wikiContext; private static final Logger log = Logger.getLogger( IteratorTag.class ); @@ -57,7 +57,7 @@ public abstract class IteratorTag extends BodyTagSupport implements TryCatchFina * * @param arg A Collection which will be iterated. */ - public void setList( Collection arg ) + public void setList( Collection< ? > arg ) { if( arg != null ) m_iterator = arg.iterator(); @@ -74,16 +74,6 @@ public abstract class IteratorTag extends BodyTagSupport implements TryCatchFina m_iterator = Arrays.asList(arg).iterator(); } } - - /** - * Sets the iterator directly that is used to form the iteration. - */ - /* - public void setList( Iterator arg ) - { - m_iterator = arg; - } - */ /** * Clears the iterator away. After calling this method doStartTag() diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorTag.java index cbb6b5a..0eb68eb 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorTag.java @@ -78,8 +78,7 @@ public class SearchResultIteratorTag // if( m_iterator == null ) { - Collection searchresults = (Collection) pageContext.getAttribute( "searchresults", - PageContext.REQUEST_SCOPE ); + Collection< ? > searchresults = (Collection< ? >)pageContext.getAttribute( "searchresults", PageContext.REQUEST_SCOPE ); setList( searchresults ); int skip = 0; @@ -89,9 +88,8 @@ public class SearchResultIteratorTag while( m_iterator.hasNext() && (skip++ < m_start) ) m_iterator.next(); } - m_count = 0; - m_wikiContext = (WikiContext) pageContext.getAttribute( WikiTagBase.ATTR_CONTEXT, - PageContext.REQUEST_SCOPE ); + m_count = 0; + m_wikiContext = (WikiContext) pageContext.getAttribute( WikiTagBase.ATTR_CONTEXT, PageContext.REQUEST_SCOPE ); return nextResult(); } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java index 7bf27fa..cc9741a 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java @@ -33,13 +33,9 @@ public class SearchResultsSizeTag { private static final long serialVersionUID = 0L; - public final int doWikiStartTag() - throws IOException - { - Collection list = (Collection)pageContext.getAttribute( "searchresults", - PageContext.REQUEST_SCOPE ); - if( list != null ) - { + public final int doWikiStartTag() throws IOException { + Collection< ? > list = ( Collection< ? > )pageContext.getAttribute( "searchresults", PageContext.REQUEST_SCOPE ); + if( list != null ) { pageContext.getOut().print( list.size() ); } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsTag.java index 0bf0471..a521278 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsTag.java @@ -22,32 +22,25 @@ import java.io.IOException; import java.util.Collection; import javax.servlet.jsp.PageContext; + /** * Includes the body content, if there are any search results. * * @since 2.0 */ -public class SearchResultsTag - extends WikiTagBase -{ +public class SearchResultsTag extends WikiTagBase { private static final long serialVersionUID = 0L; - public final int doWikiStartTag() - throws IOException - { - Collection list = (Collection)pageContext.getAttribute( "searchresults", - PageContext.REQUEST_SCOPE ); + public final int doWikiStartTag() throws IOException { + Collection< ? > list = ( Collection< ? > )pageContext.getAttribute( "searchresults", PageContext.REQUEST_SCOPE ); - if( list != null ) - { + if( list != null ) { return EVAL_BODY_INCLUDE; } - String message = (String)pageContext.getAttribute( "err", - PageContext.REQUEST_SCOPE ); + String message = (String)pageContext.getAttribute( "err", PageContext.REQUEST_SCOPE ); - if( message != null ) - { + if( message != null ) { pageContext.getOut().print("<div class='error'>"); pageContext.getOut().print( message ); pageContext.getOut().println("</div>"); @@ -55,4 +48,5 @@ public class SearchResultsTag return SKIP_BODY; } + }