Author: ssmiweve
Date: 2008-02-14 10:22:26 +0100 (Thu, 14 Feb 2008)
New Revision: 6116
Modified:
branches/2.16/view-control-spi/src/main/java/no/sesat/search/view/navigation/PagingHelper.java
branches/2.16/view-control-spi/src/main/java/no/sesat/search/view/navigation/ResultPagingNavigationController.java
Log:
make literal strings constant.
make PagingHelper package private class.
Modified:
branches/2.16/view-control-spi/src/main/java/no/sesat/search/view/navigation/PagingHelper.java
===================================================================
---
branches/2.16/view-control-spi/src/main/java/no/sesat/search/view/navigation/PagingHelper.java
2008-02-13 21:55:57 UTC (rev 6115)
+++
branches/2.16/view-control-spi/src/main/java/no/sesat/search/view/navigation/PagingHelper.java
2008-02-14 09:22:26 UTC (rev 6116)
@@ -18,10 +18,11 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Magnus Eklund</a>
+ * @version $Id$
*/
package no.sesat.search.view.navigation;
-public final class PagingHelper {
+final class PagingHelper {
private final int hitCount;
private final int pageSize;
Property changes on:
branches/2.16/view-control-spi/src/main/java/no/sesat/search/view/navigation/PagingHelper.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified:
branches/2.16/view-control-spi/src/main/java/no/sesat/search/view/navigation/ResultPagingNavigationController.java
===================================================================
---
branches/2.16/view-control-spi/src/main/java/no/sesat/search/view/navigation/ResultPagingNavigationController.java
2008-02-13 21:55:57 UTC (rev 6115)
+++
branches/2.16/view-control-spi/src/main/java/no/sesat/search/view/navigation/ResultPagingNavigationController.java
2008-02-14 09:22:26 UTC (rev 6116)
@@ -30,13 +30,21 @@
/** Paging navigation controller.
*
- * @author maek
+ * @author <a href="mailto:[EMAIL PROTECTED]">Magnus Eklund</a>
* @version $Id$
*/
public final class ResultPagingNavigationController
implements NavigationControllerFactory<ResultPagingNavigationConfig>,
NavigationController {
private static final Logger LOG =
Logger.getLogger(ResultPagingNavigationController.class);
+
+ public static final String CURRENT_PAGE = "currentPage";
+ public static final String NUMBER_OF_PAGES = "numberOfPages";
+ public static final String FIRST_VISIBLE_PAGE = "firstVisiblePage";
+ public static final String LAST_VISIBLE_PAGE = "lastVisiblePage";
+
+ private static final String MSG_PREV = "prev";
+ private static final String MSG_NEXT = "next";
private ResultPagingNavigationConfig config;
@@ -72,10 +80,10 @@
final PagingHelper pager
= new PagingHelper(hitCount, config.getPageSize(), offset,
config.getNumberOfPages());
- searchResult.addField("currentPage",
Integer.toString(pager.getCurrentPage()));
- searchResult.addField("numberOfPages",
Integer.toString(pager.getNumberOfPages()));
- searchResult.addField("firstVisiblePage",
Integer.toString(pager.getFirstVisiblePage()));
- searchResult.addField("lastVisiblePage",
Integer.toString(pager.getLastVisiblePage()));
+ searchResult.addField(CURRENT_PAGE,
Integer.toString(pager.getCurrentPage()));
+ searchResult.addField(NUMBER_OF_PAGES,
Integer.toString(pager.getNumberOfPages()));
+ searchResult.addField(FIRST_VISIBLE_PAGE,
Integer.toString(pager.getFirstVisiblePage()));
+ searchResult.addField(LAST_VISIBLE_PAGE,
Integer.toString(pager.getLastVisiblePage()));
final TextMessages messages =
TextMessages.valueOf(context.getSite());
@@ -83,7 +91,7 @@
if (pager.getCurrentPage() > 1) {
final String pageOffset =
Integer.toString(pager.getOffsetOfPage(pager.getCurrentPage() - 1));
final String url =
context.getUrlGenerator().getURL(pageOffset, config);
- item.addResult(new
BasicNavigationItem(messages.getMessage("prev"), url, config.getPageSize()));
+ item.addResult(new
BasicNavigationItem(messages.getMessage(MSG_PREV), url, config.getPageSize()));
}
// Add navigation items for the individual pages.
@@ -104,7 +112,7 @@
if (pager.getCurrentPage() < pager.getNumberOfPages()) {
final String pageOffset =
Integer.toString(pager.getOffsetOfPage(pager.getCurrentPage() + 1));
final String url =
context.getUrlGenerator().getURL(pageOffset, config);
- item.addResult(new
BasicNavigationItem(messages.getMessage("next"), url, config.getPageSize()));
+ item.addResult(new
BasicNavigationItem(messages.getMessage(MSG_NEXT), url, config.getPageSize()));
}
}
return item;
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
