dgraham 2003/08/02 14:07:33 Modified: src/share/org/apache/struts/taglib TagUtils.java Log: Replace RequestUtils calls with ModuleUtils. Revision Changes Path 1.20 +9 -7 jakarta-struts/src/share/org/apache/struts/taglib/TagUtils.java Index: TagUtils.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/TagUtils.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- TagUtils.java 2 Aug 2003 20:40:18 -0000 1.19 +++ TagUtils.java 2 Aug 2003 21:07:33 -0000 1.20 @@ -91,6 +91,7 @@ import org.apache.struts.config.ModuleConfig; import org.apache.struts.taglib.html.Constants; import org.apache.struts.util.MessageResources; +import org.apache.struts.util.ModuleUtils; import org.apache.struts.util.RequestUtils; /** @@ -167,6 +168,7 @@ public static TagUtils getInstance() { return instance; } + /** * Compute a set of query parameters that will be dynamically added to * a generated URL. The returned Map is keyed by parameter name, and the @@ -700,7 +702,7 @@ HttpServletRequest request = (HttpServletRequest) pageContext.getRequest(); StringBuffer value = new StringBuffer(request.getContextPath()); - ModuleConfig config = RequestUtils.getRequestModuleConfig(request); + ModuleConfig config = ModuleUtils.getInstance().getRequestModuleConfig(request); if (config != null) { value.append(config.getPrefix()); @@ -801,7 +803,7 @@ * @return the ModuleConfig object */ public ModuleConfig getModuleConfig(PageContext pageContext) { - return RequestUtils.getModuleConfig( + return ModuleUtils.getInstance().getModuleConfig( (HttpServletRequest) pageContext.getRequest(), pageContext.getServletContext()); } @@ -1025,7 +1027,7 @@ public String pageURL(HttpServletRequest request, String page) { StringBuffer sb = new StringBuffer(); - ModuleConfig moduleConfig = RequestUtils.getRequestModuleConfig(request); + ModuleConfig moduleConfig = ModuleUtils.getInstance().getRequestModuleConfig(request); String pagePattern = moduleConfig.getControllerConfig().getPagePattern(); if (pagePattern == null) {
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]