[WebMacro-cvs] webmacro/src/org/webmacro/servlet TemplateServlet.java, 1.10, 1.11

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1824/src/org/webmacro/servlet

Modified Files:
	TemplateServlet.java 
Log Message:
Checkstyle: field hiding

Index: TemplateServlet.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/TemplateServlet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TemplateServlet.java	18 Mar 2008 21:28:42 -0000	1.10
--- TemplateServlet.java	19 Mar 2008 12:40:55 -0000	1.11
***************
*** 64,67 ****
--- 64,70 ----
   * magic in a super-class.
   * </p>
+  * 
+  * @since 24 Jan 2004
+  * @author lanesharman
   */
  public class TemplateServlet extends HttpServlet {
***************
*** 107,111 ****
  	 * The delegate to populate the context for the application.
  	 */
! 	private ServletRouter sr;
  	
      protected Log log;
--- 110,114 ----
  	 * The delegate to populate the context for the application.
  	 */
! 	private ServletRouter servletRouter;
  	
      protected Log log;
***************
*** 138,142 ****
  			String sr = settings.getSetting("TemplateServlet.ServletRouter");
  			if (sr != null) {
! 				this.sr = (ServletRouter) Class.forName(sr).newInstance();
  			}
  			refreshGlobalContext();
--- 141,145 ----
  			String sr = settings.getSetting("TemplateServlet.ServletRouter");
  			if (sr != null) {
! 				this.servletRouter = (ServletRouter) Class.forName(sr).newInstance();
  			}
  			refreshGlobalContext();
***************
*** 254,262 ****
  			HttpServletRequest request, HttpServletResponse resp)
  			throws ServletException {
! 		if (this.sr != null) {
  			try {
! 				sr.handleWebRequest(this, context, template);
  			} catch (Exception e) {
! 				this.log("Unable to process router " + sr.getClass().getName(),
  						e);
  				throw new ServletException(e.toString());
--- 257,265 ----
  			HttpServletRequest request, HttpServletResponse resp)
  			throws ServletException {
! 		if (this.servletRouter != null) {
  			try {
! 				servletRouter.handleWebRequest(this, context, template);
  			} catch (Exception e) {
! 				this.log("Unable to process router " + servletRouter.getClass().getName(),
  						e);
  				throw new ServletException(e.toString());