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 jo...@locus.apache.org on 2000/07/06 01:04:25 UTC

cvs commit: xml-fop/src/org/apache/fop/datatypes IDNode.java IDReferences.java

jordan      00/07/05 16:04:23

  Modified:    src/org/apache/fop/datatypes IDNode.java IDReferences.java
  Log:
  Added basic support for forward page-number-citations
  
  Revision  Changes    Path
  1.3       +2 -2      xml-fop/src/org/apache/fop/datatypes/IDNode.java
  
  Index: IDNode.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/IDNode.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IDNode.java	2000/06/28 17:48:14	1.2
  +++ IDNode.java	2000/07/05 23:04:21	1.3
  @@ -1,4 +1,4 @@
  -/*-- $Id: IDNode.java,v 1.2 2000/06/28 17:48:14 jordan Exp $ -- 
  +/*-- $Id: IDNode.java,v 1.3 2000/07/05 23:04:21 jordan Exp $ -- 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -96,7 +96,7 @@
        * 
        * @return page number of this node
        */
  -    protected String getPageNumber()
  +    public String getPageNumber()
       {             
           return(pageNumber != -1)?new Integer(pageNumber).toString():null;
       }
  
  
  
  1.5       +3 -2      xml-fop/src/org/apache/fop/datatypes/IDReferences.java
  
  Index: IDReferences.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/IDReferences.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- IDReferences.java	2000/06/28 18:22:17	1.4
  +++ IDReferences.java	2000/07/05 23:04:21	1.5
  @@ -1,4 +1,4 @@
  -/*-- $Id: IDReferences.java,v 1.4 2000/06/28 18:22:17 jordan Exp $ -- 
  +/*-- $Id: IDReferences.java,v 1.5 2000/07/05 23:04:21 jordan Exp $ -- 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -52,6 +52,7 @@
   package org.apache.fop.datatypes;
   
   import org.apache.fop.pdf.PDFGoTo;
  +import org.apache.fop.layout.AreaContainer;
   
   
   // Java
  @@ -125,7 +126,7 @@
       public void configureID(String id, Area area)
       {
           if ( id!=null && !id.equals("") ) {
  -            setPosition(id,area.getPage().getBody().getXPosition()-ID_PADDING,area.getPage().getBody().getYPosition() - area.getAbsoluteHeight()+ID_PADDING);                                                
  +            setPosition(id,area.getPage().getBody().getXPosition()+area.getTableCellXOffset()-ID_PADDING,area.getPage().getBody().getYPosition() - area.getAbsoluteHeight()+ID_PADDING);                                                
               setPageNumber(id,area.getPage().getNumber());
                   area.getPage().addToIDList(id);                                    
               }