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 <[EMAIL PROTECTED]> wrote:
Is it just too early in the morning for me? I don't see any difference
other than spacing?
Ralph
[EMAIL PROTECTED] 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!
