Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 3212 invoked from network); 6 Nov 2003 20:23:13 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 6 Nov 2003 20:23:13 -0000 Received: (qmail 22823 invoked by uid 500); 6 Nov 2003 20:22:55 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 22780 invoked by uid 500); 6 Nov 2003 20:22:55 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 22748 invoked by uid 500); 6 Nov 2003 20:22:54 -0000 Delivered-To: apmail-cocoon-2.1-cvs@apache.org Received: (qmail 22734 invoked from network); 6 Nov 2003 20:22:54 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 6 Nov 2003 20:22:54 -0000 Received: (qmail 3156 invoked by uid 1260); 6 Nov 2003 20:23:04 -0000 Date: 6 Nov 2003 20:23:04 -0000 Message-ID: <20031106202304.3155.qmail@minotaur.apache.org> From: cziegeler@apache.org To: cocoon-2.1-cvs@apache.org Subject: cvs commit: cocoon-2.1/src/java/org/apache/cocoon/generation JXTemplateGenerator.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N cziegeler 2003/11/06 12:23:04 Modified: src/java/org/apache/cocoon/generation JXTemplateGenerator.java Log: Cleaning up code Revision Changes Path 1.17 +23 -11 cocoon-2.1/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java Index: JXTemplateGenerator.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- JXTemplateGenerator.java 24 Oct 2003 14:12:18 -0000 1.16 +++ JXTemplateGenerator.java 6 Nov 2003 20:23:04 -0000 1.17 @@ -795,8 +795,8 @@ } - final static String NS = - "http://apache.org/cocoon/templates/jx/1.0"; + /** The namespace used by this generator */ + public final static String NS = "http://apache.org/cocoon/templates/jx/1.0"; final static String TEMPLATE = "template"; final static String FOR_EACH = "forEach"; @@ -875,8 +875,11 @@ } return new Expression(inStr, null); } - // Compile an integer expression (returns either a Compiled Expression - // or an Integer literal) + + /* + * Compile an integer expression (returns either a Compiled Expression + * or an Integer literal) + */ private static Expression compileInt(String val, String msg, Locator location) throws SAXException { Expression res = compileExpr(val, msg, location); @@ -2103,7 +2106,7 @@ } StartDocument getStartEvent() { - return startEvent; + return this.startEvent; } private void addEvent(Event ev) throws SAXException { @@ -2589,6 +2592,9 @@ return globalJexlContext; } + /* (non-Javadoc) + * @see org.apache.avalon.excalibur.pool.Recyclable#recycle() + */ public void recycle() { if ( this.resolver != null) { this.resolver.release(this.inputSource); @@ -2601,9 +2607,12 @@ super.recycle(); } + /* (non-Javadoc) + * @see org.apache.cocoon.sitemap.SitemapModelComponent#setup(org.apache.cocoon.environment.SourceResolver, java.util.Map, java.lang.String, org.apache.avalon.framework.parameters.Parameters) + */ public void setup(SourceResolver resolver, Map objectModel, String src, Parameters parameters) - throws ProcessingException, SAXException, IOException { + throws ProcessingException, SAXException, IOException { super.setup(resolver, objectModel, src, parameters); if (src != null) { @@ -2612,7 +2621,7 @@ } catch (SourceException se) { throw SourceUtil.handle("Error during resolving of '" + src + "'.", se); } - String uri = inputSource.getURI(); + final String uri = inputSource.getURI(); synchronized (cache) { StartDocument startEvent = (StartDocument)cache.get(uri); if (startEvent != null) { @@ -2726,9 +2735,12 @@ } } + /* (non-Javadoc) + * @see org.apache.cocoon.generation.Generator#generate() + */ public void generate() - throws IOException, SAXException, ProcessingException { - final String cacheKey = inputSource.getURI(); + throws IOException, SAXException, ProcessingException { + final String cacheKey = this.inputSource.getURI(); StartDocument startEvent; synchronized (cache) { @@ -2738,7 +2750,7 @@ Parser parser = new Parser(); SourceUtil.parse(this.manager, this.inputSource, parser); startEvent = parser.getStartEvent(); - startEvent.compileTime = inputSource.getValidity(); + startEvent.compileTime = this.inputSource.getValidity(); synchronized (cache) { cache.put(cacheKey, startEvent); }