Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 30247 invoked from network); 6 Dec 2003 20:00:13 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 6 Dec 2003 20:00:13 -0000 Received: (qmail 70807 invoked by uid 500); 6 Dec 2003 20:00:02 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 70760 invoked by uid 500); 6 Dec 2003 20:00:02 -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 70741 invoked by uid 500); 6 Dec 2003 20:00:01 -0000 Delivered-To: apmail-cocoon-2.1-cvs@apache.org Received: (qmail 70735 invoked from network); 6 Dec 2003 20:00:01 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 6 Dec 2003 20:00:01 -0000 Received: (qmail 30204 invoked by uid 1348); 6 Dec 2003 20:00:11 -0000 Date: 6 Dec 2003 20:00:11 -0000 Message-ID: <20031206200011.30203.qmail@minotaur.apache.org> From: haul@apache.org To: cocoon-2.1-cvs@apache.org Subject: cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation SimpleFormTransformer.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 haul 2003/12/06 12:00:11 Modified: src/java/org/apache/cocoon/transformation SimpleFormTransformer.java Log: fix missing counting up for nested startElement events when skipping Revision Changes Path 1.10 +15 -10 cocoon-2.1/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java Index: SimpleFormTransformer.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- SimpleFormTransformer.java 15 Nov 2003 04:21:30 -0000 1.9 +++ SimpleFormTransformer.java 6 Dec 2003 20:00:10 -0000 1.10 @@ -1171,7 +1171,7 @@ * so that only the children are skipped. * * @param skip - * @param children + * @param skipChildrenOnly * @param uri * @param name * @param raw @@ -1180,26 +1180,31 @@ */ protected void relayStartElement( boolean skip, - boolean children, + boolean skipChildrenOnly, String uri, String name, String raw, Attributes attr) throws SAXException { - if (skip) - this.skipChildrenOnly = children; - if (skip && !children) - this.ignoreEventsCount++; try { - super.startTransformingElement(uri, name, raw, attr); + if (this.ignoreEventsCount > 0) { + this.ignoreEventsCount++; + super.startTransformingElement(uri, name, raw, attr); + } else { + if (skip) + this.skipChildrenOnly = skipChildrenOnly; + if (skip && !skipChildrenOnly) + this.ignoreEventsCount++; + super.startTransformingElement(uri, name, raw, attr); + if (skip && skipChildrenOnly) + this.ignoreEventsCount++; + } } catch (ProcessingException e) { throw new SAXException(e); } catch (IOException e) { throw new SAXException(e); } - if (skip && children) - this.ignoreEventsCount++; } /**