|
From: Tim P <ti...@us...> - 2008-03-13 23:53:19
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/jsp In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23751/src/org/webmacro/adapter/jsp Modified Files: TemplateTag.java Log Message: Organise imports, javascript warnings Index: TemplateTag.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/jsp/TemplateTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TemplateTag.java 28 Jan 2008 16:03:59 -0000 1.2 --- TemplateTag.java 13 Mar 2008 23:53:10 -0000 1.3 *************** *** 1,7 **** package org.webmacro.adapter.jsp; ! import org.webmacro.*; ! import org.webmacro.engine.StringTemplate; ! import org.webmacro.servlet.WebContext; import javax.servlet.http.HttpServletRequest; --- 1,6 ---- package org.webmacro.adapter.jsp; ! import java.io.ByteArrayOutputStream; ! import java.util.Map; import javax.servlet.http.HttpServletRequest; *************** *** 12,17 **** import javax.servlet.jsp.tagext.BodyContent; import javax.servlet.jsp.tagext.BodyTagSupport; ! import java.io.ByteArrayOutputStream; ! import java.util.Map; /** --- 11,22 ---- import javax.servlet.jsp.tagext.BodyContent; import javax.servlet.jsp.tagext.BodyTagSupport; ! ! import org.webmacro.InitException; ! import org.webmacro.PropertyException; ! import org.webmacro.Template; ! import org.webmacro.WM; ! import org.webmacro.WebMacro; ! import org.webmacro.engine.StringTemplate; ! import org.webmacro.servlet.WebContext; /** *************** *** 93,98 **** /** ! * Get the src of an external template to use ! * @return */ public String getSrc() --- 98,103 ---- /** ! * ! * @return the src of an external template to use */ public String getSrc() *************** *** 115,120 **** /** ! * Get or create our WebMacro instance ! * @return * @throws InitException */ --- 120,124 ---- /** ! * @return a new or the existing WebMacro instance * @throws InitException */ *************** *** 126,131 **** /** * Make a WM instance using a broker with access to the ServletContext ! * for resources ! * @return * @throws InitException */ --- 130,135 ---- /** * Make a WM instance using a broker with access to the ServletContext ! * for resources. ! * @return a new WebMacro * @throws InitException */ *************** *** 143,147 **** * Called when the wm:template tag starts. If the src attribute is * specified we evaluate it now and ignore the body of the tag. ! * @return * @throws JspException */ --- 147,151 ---- * Called when the wm:template tag starts. If the src attribute is * specified we evaluate it now and ignore the body of the tag. ! * @return SKIP_BODY to stop JSP evaluation the WM script * @throws JspException */ *************** *** 164,168 **** * If this method is called, we check to see if there was no external template * used and if so process the body of the tag as a WebMacro template ! * @return * @throws JspException */ --- 168,172 ---- * If this method is called, we check to see if there was no external template * used and if so process the body of the tag as a WebMacro template ! * @return EVAL_PAGE * @throws JspException */ |