From a2fe60531a3b42210a5286a2f33e75b1e95ebaba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Sat, 5 Dec 2009 19:21:12 +0100 Subject: [PATCH] applyIfMatches now returns if the url matches any of the entry points --- .../web/common/entrypoints/URLHandler.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java index 9c8ee177a..34cc418fa 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java @@ -181,9 +181,9 @@ public class URLHandler { } } - public void applyIfMatches(S controller) { + public boolean applyIfMatches(S controller) { String uri = getRequest().getRequestURI(); - applyIfMatches(controller, uri); + return applyIfMatches(controller, uri); } private HttpServletRequest getRequest() { @@ -193,9 +193,9 @@ public class URLHandler { return request; } - public void applyIfMatches(S controller, String fragment) { + public boolean applyIfMatches(S controller, String fragment) { if (isFlagedInThisRequest()) { - return; + return false; } flagAlreadyExecutedInThisRequest(); String string = insertSemicolonIfNeeded(fragment); @@ -211,9 +211,10 @@ public class URLHandler { entryPointAnnotation, entryPointMetadata.method .getParameterTypes()); callMethod(controller, entryPointMetadata.method, arguments); - return; + return true; } } + return false; } public void registerListener(final S controller, Page page) {