svn commit: r1624312 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf: PDFDocumentHandler.java PDFPainter.java PDFRenderingContext.java

[ssteiner]

Author: ssteiner
Date: Thu Sep 11 15:05:00 2014
New Revision: 1624312

URL: http://svn.apache.org/r1624312
Log:
FOP-2411: PDF to PDF Link not working

Modified:
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFPainter.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderingContext.java

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java?rev=1624312&r1=1624311&r2=1624312&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
 Thu Sep 11 15:05:00 2014
@@ -38,6 +38,7 @@ import org.apache.fop.accessibility.Stru
 import org.apache.fop.apps.MimeConstants;
 import org.apache.fop.fo.extensions.xmp.XMPMetadata;
 import org.apache.fop.pdf.PDFAnnotList;
+import org.apache.fop.pdf.PDFArray;
 import org.apache.fop.pdf.PDFDocument;
 import org.apache.fop.pdf.PDFPage;
 import org.apache.fop.pdf.PDFResources;
@@ -94,6 +95,8 @@ public class PDFDocumentHandler extends 
     private final PDFDocumentNavigationHandler documentNavigationHandler
             = new PDFDocumentNavigationHandler(this);
 
+    private Map<Integer, PDFArray> pageNumbers = new HashMap<Integer, 
PDFArray>();
+
     /**
      * Default constructor.
      */
@@ -352,4 +355,8 @@ public class PDFDocumentHandler extends 
         }
         return structureTreeBuilder;
     }
+
+    public Map<Integer, PDFArray> getPageNumbers() {
+        return pageNumbers;
+    }
 }

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFPainter.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFPainter.java?rev=1624312&r1=1624311&r2=1624312&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFPainter.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFPainter.java 
Thu Sep 11 15:05:00 2014
@@ -188,6 +188,7 @@ public class PDFPainter extends Abstract
         PDFRenderingContext pdfContext = new PDFRenderingContext(
                 getUserAgent(), generator, 
getDocumentHandler().getCurrentPage(), getFontInfo());
         pdfContext.setMarkedContentInfo(imageMCI);
+        pdfContext.setPageNumbers(getDocumentHandler().getPageNumbers());
         return pdfContext;
     }
 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderingContext.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderingContext.java?rev=1624312&r1=1624311&r2=1624312&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderingContext.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderingContext.java
 Thu Sep 11 15:05:00 2014
@@ -19,10 +19,13 @@
 
 package org.apache.fop.render.pdf;
 
+import java.util.Map;
+
 import org.apache.xmlgraphics.util.MimeConstants;
 
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.fonts.FontInfo;
+import org.apache.fop.pdf.PDFArray;
 import org.apache.fop.pdf.PDFPage;
 import org.apache.fop.render.AbstractRenderingContext;
 import org.apache.fop.render.pdf.PDFLogicalStructureHandler.MarkedContentInfo;
@@ -36,6 +39,7 @@ public class PDFRenderingContext extends
     private FontInfo fontInfo;
     private PDFPage page;
     private MarkedContentInfo mci;
+    private Map<Integer, PDFArray> pageNumbers;
 
     /**
      * Main constructor.
@@ -88,4 +92,12 @@ public class PDFRenderingContext extends
     MarkedContentInfo getMarkedContentInfo() {
         return mci;
     }
+
+    public Map<Integer, PDFArray> getPageNumbers() {
+        return pageNumbers;
+    }
+
+    public void setPageNumbers(Map<Integer, PDFArray> pageNumbers) {
+        this.pageNumbers = pageNumbers;
+    }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscr...@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-h...@xmlgraphics.apache.org