cvs commit: cocoon-2.2/src/java/org/apache/cocoon/generation JXTemplateGenerator.java

[coliver]

coliver     2003/12/10 08:46:26

  Modified:    src/java/org/apache/cocoon/generation
                        JXTemplateGenerator.java
  Log:
  Fix loop tag status
  
  Revision  Changes    Path
  1.23      +9 -5      
cocoon-2.2/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
  
  Index: JXTemplateGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- JXTemplateGenerator.java  10 Dec 2003 02:26:06 -0000      1.22
  +++ JXTemplateGenerator.java  10 Dec 2003 16:46:26 -0000      1.23
  @@ -403,8 +403,8 @@
       public class LocatorFacade implements Locator {
           private Locator locator;
      
  -        public LocatorFacade(Locator intialLocator) {
  -            this.locator = intialLocator;
  +        public LocatorFacade(Locator initialLocator) {
  +            this.locator = initialLocator;
           }
           
           public void setDocumentLocator(Locator newLocator) {
  @@ -2776,7 +2776,7 @@
           cocoon.put("context", 
                      FOM_JavaScriptFlowHelper.getFOM_Context(objectModel));
           cocoon.put("continuation", kont);
  -        cocoon.put("parameters", parameters.toProperties(parameters));
  +        cocoon.put("parameters", Parameters.toProperties(parameters));
           this.variables = new MyVariables(cocoon,
                                            contextObject,
                                            kont,
  @@ -3025,6 +3025,9 @@
           public boolean isLast() {
               return last;
           }
  +        public int getBegin() {
  +            return begin;
  +        }
           public int getEnd() {
               return end;
           }
  @@ -3243,6 +3246,7 @@
                   LoopTagStatus status = null;
                   if (startForEach.varStatus != null) {
                       status = new LoopTagStatus();
  +                    status.begin = begin;
                       status.end = end;
                       status.step = step;
                       status.first = true;
  @@ -3251,7 +3255,7 @@
                       
localJXPathVariables.declareVariable(startForEach.varStatus,
                                                            status);
                   }
  -                for (int count = 1; i <= end && iter.hasNext(); i++, 
count++) {
  +                for (int count = 1; i <= end && iter.hasNext(); i+=step, 
count++) {
                       Object value;
                       JXPathContext localJXPathContext = null;
                       value = iter.next();