You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by pb...@apache.org on 2004/10/04 07:18:13 UTC

cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination PageSequenceMaster.java

pbwest      2004/10/03 22:18:13

  Modified:    src/java/org/apache/fop/fo/pagination Tag:
                        FOP_0-20-0_Alt-Design PageSequenceMaster.java
  Log:
  Modified for 1.5 compatibility
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.8   +7 -7      xml-fop/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
  
  Index: PageSequenceMaster.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- PageSequenceMaster.java	15 Feb 2004 03:45:52 -0000	1.1.2.7
  +++ PageSequenceMaster.java	4 Oct 2004 05:18:13 -0000	1.1.2.8
  @@ -203,24 +203,24 @@
                   for (int cond = 0; cond < numConds; cond++) {
                       FoConditionalPageMasterReference foCond;
                       int blankOrNot, oddOrEven, pagePosition;
  -                    EnumType enum;
  +                    EnumType enumval;
   
                       foCond = (FoConditionalPageMasterReference)
                                               (masterReference.getChild(cond));
                       // Get the master-reference property value
                       simplePM = getMasterReference(foCond, simplePageMasters);
  -                    enum = (EnumType)
  +                    enumval = (EnumType)
                                   (foCond.getPropertyValue
                                                (PropNames.BLANK_OR_NOT_BLANK));
  -                    blankOrNot = enum.getEnumValue();
  -                    enum = (EnumType)
  +                    blankOrNot = enumval.getEnumValue();
  +                    enumval = (EnumType)
                                   (foCond.getPropertyValue
                                                (PropNames.ODD_OR_EVEN));
  -                    oddOrEven = enum.getEnumValue();
  -                    enum = (EnumType)
  +                    oddOrEven = enumval.getEnumValue();
  +                    enumval = (EnumType)
                                   (foCond.getPropertyValue
                                                (PropNames.PAGE_POSITION));
  -                    pagePosition = enum.getEnumValue();
  +                    pagePosition = enumval.getEnumValue();
                       // Create and add a single default PageCondition
                       masterAlt.addCondition
                               (masterAlt.new PageCondition
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org