Return-Path: Delivered-To: apmail-cocoon-dev-archive@www.apache.org Received: (qmail 24922 invoked from network); 11 Oct 2005 13:44:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Oct 2005 13:44:45 -0000 Received: (qmail 59483 invoked by uid 500); 11 Oct 2005 13:44:42 -0000 Delivered-To: apmail-cocoon-dev-archive@cocoon.apache.org Received: (qmail 59138 invoked by uid 500); 11 Oct 2005 13:44:41 -0000 Mailing-List: contact dev-help@cocoon.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@cocoon.apache.org List-Id: Delivered-To: mailing list dev@cocoon.apache.org Received: (qmail 58829 invoked by uid 99); 11 Oct 2005 13:44:41 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Oct 2005 06:44:40 -0700 X-ASF-Spam-Status: No, hits=1.4 required=10.0 tests=SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (asf.osuosl.org: 64.151.110.219 is neither permitted nor denied by domain of Ralph.Goers@dslextreme.com) Received: from [64.151.110.219] (HELO mail.gosmtp.com) (64.151.110.219) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Oct 2005 06:44:42 -0700 Received: from [192.168.10.132] (adsl-66-51-196-164.dslextreme.com [66.51.196.164]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.gosmtp.com (Postfix) with ESMTP id CFAF1D9 for ; Tue, 11 Oct 2005 06:21:13 -0700 (PDT) Message-ID: <434BC1B2.6090901@dslextreme.com> Date: Tue, 11 Oct 2005 06:44:18 -0700 From: Ralph Goers User-Agent: Mozilla Thunderbird 1.0.6 (Windows/20050716) X-Accept-Language: en-us, en MIME-Version: 1.0 To: dev@cocoon.apache.org Subject: Re: svn commit: r312820 - /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/CalendarGenerator.java References: <20051011070208.59331.qmail@minotaur.apache.org> <434BB2A8.1090609@dslextreme.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Does this patch also need to be applied to trunk (2.2) ? Ralph Patrick Ahles wrote: >Hi Ralph, > >this indeed looks somewhat confusing, but the IF is now _inside_ the >while loop... > > > >On 10/11/05, Ralph Goers wrote: > > >>Is it just too early in the morning for me? I don't see any difference >>other than spacing? >> >>Ralph >> >>hepabolu@apache.org wrote: >> >> >> >>>Author: hepabolu >>>Date: Tue Oct 11 00:02:02 2005 >>>New Revision: 312820 >>> >>>URL: http://svn.apache.org/viewcvs?rev=312820&view=rev >>>Log: >>>Bug 35413, patch applied, thanks to Patrick Ahles, now properly applied ;-) >>> >>>Modified: >>> cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/CalendarGenerator.java >>> >>>Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/CalendarGenerator.java >>>URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/CalendarGenerator.java?rev=312820&r1=312819&r2=312820&view=diff >>>============================================================================== >>>--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/CalendarGenerator.java (original) >>>+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/CalendarGenerator.java Tue Oct 11 00:02:02 2005 >>>@@ -308,11 +308,11 @@ >>> this.contentHandler.endElement(URI, DAY_NODE_NAME, >>> PREFIX + ':' + DAY_NODE_NAME); >>> end.add(Calendar.DAY_OF_MONTH, 1); >>>+ if (firstDay == end.get(Calendar.DAY_OF_WEEK)) { >>>+ this.contentHandler.endElement(URI, WEEK_NODE_NAME, >>>+ PREFIX + ':' + WEEK_NODE_NAME); >>>+ } >>> } >>>- if (firstDay == end.get(Calendar.DAY_OF_WEEK)) { >>>- this.contentHandler.endElement(URI, WEEK_NODE_NAME, >>>- PREFIX + ':' + WEEK_NODE_NAME); >>>- } >>> } >>> this.contentHandler.endElement(URI, CALENDAR_NODE_NAME, >>> PREFIX + ':' + CALENDAR_NODE_NAME); >>> >>> >>> >>> >>> >>> > > >-- >Patrick > >---- >Neutiquam erro. Magister mundi sum! > >