Author: tchemit Date: 2014-04-03 19:41:11 +0200 (Thu, 03 Apr 2014) New Revision: 1825 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1825 Log: add common method Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-04-03 15:51:24 UTC (rev 1824) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-04-03 17:41:11 UTC (rev 1825) @@ -79,4 +79,26 @@ return applicationConfig.isGoogleAnalyticsEnabled(); } + /** + * From the full url of the action (a=with all get parameters), obtain the pagination url (ending with parameter + * {@code parger.pageIndex=}. + * + * @param fullUrl the full url + * @return the pagination url + */ + public String getPaginationUrl(String fullUrl) { + // remove pageIndex parameter + String paginationUrl = fullUrl.replaceAll("pager\\.pageIndex=([^&])+[&]*", ""); + // clean & + paginationUrl = paginationUrl.replaceAll("&&", "&"); + // add [?|&]pageIndex= + if (!paginationUrl.contains("?")) { + paginationUrl += "?"; + } else if (!paginationUrl.endsWith("?")) { + paginationUrl += "&"; + } + paginationUrl += "pager.pageIndex="; + return paginationUrl; + } + } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-04-03 15:51:24 UTC (rev 1824) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-04-03 17:41:11 UTC (rev 1825) @@ -82,19 +82,4 @@ return SUCCESS; } - - public String getPaginationUrl(String fullUrl) { - // remove pageIndex parameter - String paginationUrl = fullUrl.replaceAll("pager\\.pageIndex=([^&])+[&]", ""); - // clean & - paginationUrl = paginationUrl.replaceAll("&&", "&"); - // add [?|&]pageIndex= - if (!paginationUrl.contains("?")) { - paginationUrl += "?"; - } else if (!paginationUrl.endsWith("?")) { - paginationUrl += "&"; - } - paginationUrl += "pager.pageIndex="; - return paginationUrl; - } }