cvs commit: xml-fop/src/java/org/apache/fop/render/mif MIFHandler.java

[gmazza]

gmazza      2005/02/04 23:39:13

  Modified:    src/java/org/apache/fop/area AreaTreeHandler.java
               src/java/org/apache/fop/fo/pagination Root.java Title.java
               src/java/org/apache/fop/render/mif MIFHandler.java
  Log:
  Switch to Root's page number counter.
  
  Revision  Changes    Path
  1.32      +2 -2      xml-fop/src/java/org/apache/fop/area/AreaTreeHandler.java
  
  Index: AreaTreeHandler.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/area/AreaTreeHandler.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- AreaTreeHandler.java      3 Feb 2005 20:44:44 -0000       1.31
  +++ AreaTreeHandler.java      5 Feb 2005 07:39:12 -0000       1.32
  @@ -272,7 +272,7 @@
               log.debug("Current heap size: " + (memoryNow / 1024L) + "Kb");
               log.debug("Total memory used: " + memoryUsed + "Kb");
               log.debug("Total time used: " + timeUsed + "ms");
  -            log.debug("Pages rendered: " + pageCount);
  +            log.debug("Pages rendered: " + 
rootFObj.getRunningPageNumberCounter());
               if (pageCount > 0) {
                   log.debug("Avg render time: " + (timeUsed / pageCount) + 
"ms/page");
               }
  
  
  
  1.38      +1 -1      xml-fop/src/java/org/apache/fop/fo/pagination/Root.java
  
  Index: Root.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Root.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- Root.java 2 Jan 2005 20:42:50 -0000       1.37
  +++ Root.java 5 Feb 2005 07:39:12 -0000       1.38
  @@ -153,7 +153,7 @@
        * Returns the number of pages generated (over all PageSequence 
instances).
        * @return the number of pages
        */
  -    protected int getRunningPageNumberCounter() {
  +    public int getRunningPageNumberCounter() {
           return this.runningPageNumberCounter;
       }
   
  
  
  
  1.32      +2 -6      xml-fop/src/java/org/apache/fop/fo/pagination/Title.java
  
  Index: Title.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Title.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- Title.java        22 Dec 2004 08:54:10 -0000      1.31
  +++ Title.java        5 Feb 2005 07:39:12 -0000       1.32
  @@ -33,7 +33,7 @@
    */
   public class Title extends InlineLevel {
       // The value of properties relevant for fo:title.
  -    // See also superclass InlineLevel
  +    // See superclass InlineLevel
       // End of property values
   
       /**
  @@ -43,10 +43,6 @@
           super(parent);
       }
   
  -    public void bind(PropertyList pList) throws FOPException {
  -        super.bind(pList);
  -    }
  -
       /**
        * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, 
String)
           XSL/FOP: (#PCDATA|%inline;)*
  
  
  
  1.16      +1 -3      
xml-fop/src/java/org/apache/fop/render/mif/MIFHandler.java
  
  Index: MIFHandler.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/render/mif/MIFHandler.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- MIFHandler.java   20 Oct 2004 13:19:25 -0000      1.15
  +++ MIFHandler.java   5 Feb 2005 07:39:12 -0000       1.16
  @@ -148,8 +148,6 @@
              textRect.addElement(prop);
              page.addElement(textRect);
   
  -
  -
              mifFile.addPage(page);
           }
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]