Merged 5.2.N (5.2.1) to HEAD (5.2)

128510 mmuller: Fixed some javadoc errors. REPO-466


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129291 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 13:56:54 +00:00
parent 58cb56c7c9
commit d73d4e1a71
19 changed files with 7 additions and 38 deletions

View File

@@ -198,7 +198,6 @@ public class ForumTopicsFilteredGet extends AbstractDiscussionWebScript
* @param searchQuery Pair with query string in first and query language in second
* @param sortAscending boolean
* @param paging PagingRequest
* @return PagingResults<TopicInfo>
*/
protected PagingResults<TopicInfo> doSearch(Pair<String, String> searchQuery, boolean sortAscending, PagingRequest paging)
{
@@ -317,7 +316,6 @@ public class ForumTopicsFilteredGet extends AbstractDiscussionWebScript
*
* @param finalResults ResultSet
* @param paging PagingRequest
* @return PagingResults<TopicInfo>
*/
protected PagingResults<TopicInfo> wrap(final ResultSet finalResults, PagingRequest paging)
{