User: ara_e_w Date: 02/06/08 05:37:27 Modified: core/src/xdoclet/template TemplateEngine.java TemplateTagHandler.java Log: - fixes second-generation-run-fails bug - fixes isOfType problem (type is comma-separated, code was lost during xjavadoc transition) Revision Changes Path 1.29 +1 -6 xdoclet/core/src/xdoclet/template/TemplateEngine.java Index: TemplateEngine.java =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/template/TemplateEngine.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -w -r1.28 -r1.29 --- TemplateEngine.java 31 May 2002 20:44:01 -0000 1.28 +++ TemplateEngine.java 8 Jun 2002 12:37:26 -0000 1.29 @@ -35,7 +35,7 @@ * @author Ara Abrahamian ([EMAIL PROTECTED]) * @author Dmitri Colebatch ([EMAIL PROTECTED]) * @created July 14, 2001 - * @version $Revision: 1.28 $ + * @version $Revision: 1.29 $ * @see #generate(java.lang.String) */ public class TemplateEngine @@ -269,11 +269,6 @@ if (log.isDebugEnabled()) { log.debug("prefix=" + prefix); log.debug("tagHandler=" + tagHandler); - } - - tagHandler.setEngine(this); - if (this instanceof TemplateParser) { - tagHandler.setParser((TemplateParser) this); } tagMappings.put(prefix, tagHandler); 1.10 +1 -70 xdoclet/core/src/xdoclet/template/TemplateTagHandler.java Index: TemplateTagHandler.java =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/template/TemplateTagHandler.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -w -r1.9 -r1.10 --- TemplateTagHandler.java 31 May 2002 20:44:01 -0000 1.9 +++ TemplateTagHandler.java 8 Jun 2002 12:37:27 -0000 1.10 @@ -11,77 +11,8 @@ /** * @author Ara Abrahamian ([EMAIL PROTECTED]) * @created Oct 14, 2001 - * @version $Revision: 1.9 $ + * @version $Revision: 1.10 $ */ public abstract class TemplateTagHandler { - /** - * TemplateEngine used for callbacks. - */ - private TemplateEngine engine; - - /** - * TemplateParser used for callbacks. - */ - private TemplateParser parser; - - /** - * Gets the Engine attribute of the TemplateTagHandler object. - * - * @return The Engine value - */ - public TemplateEngine getEngine() - { - return engine; - } - - /** - * Gets the Parser attribute of the TemplateTagHandler object. - * - * @return The Parser value - */ - public TemplateParser getParser() - { - return parser; - } - - /** - * Sets the Engine attribute of the TemplateTagHandler object. - * - * @param engine The new Engine value - */ - public void setEngine(TemplateEngine engine) - { - this.engine = engine; - } - - /** - * Sets the Parser attribute of the TemplateTagHandler object. - * - * @param parser The new Parser value - */ - public void setParser(TemplateParser parser) - { - this.parser = parser; - } - - /** - * @param template - * @exception XDocletException - * @todo throw TemplateException instead - */ - public void generate(String template) throws XDocletException - { - try { - getEngine().generate(template); - } - catch (TemplateException e) { - if (e instanceof XDocletException) { - throw (XDocletException) e; - } - else { - throw new XDocletException(e, Translator.getString(XDocletMessages.class, XDocletMessages.RUNNING_FAILED)); - } - } - } }
_______________________________________________________________ Don't miss the 2002 Sprint PCS Application Developer's Conference August 25-28 in Las Vegas - http://devcon.sprintpcs.com/adp/index.cfm?source=osdntextlink _______________________________________________ Xdoclet-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/xdoclet-devel