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 ar...@locus.apache.org on 2000/03/05 03:53:54 UTC

cvs commit: xml-fop/src/org/apache/fop/render/pdf PDFRenderer.java

arved       00/03/04 18:53:53

  Modified:    src/org/apache/fop/render/pdf PDFRenderer.java
  Log:
  Update: Links added to AnnotList
  
  Revision  Changes    Path
  1.10      +18 -7     xml-fop/src/org/apache/fop/render/pdf/PDFRenderer.java
  
  Index: PDFRenderer.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/PDFRenderer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- PDFRenderer.java	1999/12/02 09:37:50	1.9
  +++ PDFRenderer.java	2000/03/05 02:53:53	1.10
  @@ -1,4 +1,4 @@
  -/*-- $Id: PDFRenderer.java,v 1.9 1999/12/02 09:37:50 jtauber Exp $ -- 
  +/*-- $Id: PDFRenderer.java,v 1.10 2000/03/05 02:53:53 arved Exp $ -- 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -81,6 +81,9 @@
       /** the current stream to add PDF commands to */
       PDFStream currentStream;
   
  +    /** the current annotation list to add annotations to */
  +    PDFAnnotList currentAnnotList;
  +
       /** the current (internal) font name */
       protected String currentFontName;
   
  @@ -458,11 +461,9 @@
   	
   	currentStream.add("ET\n");
   
  -	this.pdfDoc.makePage(this.pdfResources, currentStream,
  -			     page.getWidth()/1000,
  -			     page.getHeight()/1000);
  -
   	if (page.hasLinks()) {
  +            currentAnnotList = this.pdfDoc.makeAnnotList();
  +
   	    Enumeration e = page.getLinkSets().elements();
   	    while (e.hasMoreElements()) {
   		LinkSet linkSet = (LinkSet) e.nextElement();
  @@ -470,10 +471,20 @@
   		Enumeration f = linkSet.getRects().elements();
   		while (f.hasMoreElements()) {
   		    Rectangle rect = (Rectangle) f.nextElement();
  -		    this.pdfDoc.makeLink(rect, dest);
  +		    currentAnnotList.addLink(
  +                        this.pdfDoc.makeLink(rect, dest)
  +                    );
   		}
   	    }
  -	}
  +	} else {
  +            currentAnnotList = null;
  +        }
  +
  +	this.pdfDoc.makePage(this.pdfResources, currentStream,
  +                             currentAnnotList,
  +			     page.getWidth()/1000,
  +			     page.getHeight()/1000);
  +
       }
   
       /**