[FOray-commit] SF.net SVN: foray: [7725] trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java

[<vic...@us...>]

Revision: 7725
Author:   victormote
Date:     2006-06-19 17:18:40 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7725&view=rev

Log Message:
-----------
Conform to axsl change: Remove font-specific information from SVG method. This should come from the SVG itself.

Modified Paths:
--------------
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java	2006-06-20 00:10:18 UTC (rev 7724)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java	2006-06-20 00:18:40 UTC (rev 7725)
@@ -31,7 +31,7 @@
 import org.foray.pdf.svg.batik.PDFGraphics2D;
 import org.foray.pdf.svg.batik.PDFTextPainter;
 
-import org.axsl.fontR.FontUse;
+import org.axsl.fontR.FontConsumer;
 import org.axsl.graphicR.Graphic;
 import org.axsl.graphicR.GraphicException;
 import org.axsl.graphicR.SVGGraphic;
@@ -268,10 +268,10 @@
      */
     public void drawSVGDocument(SVGDocument doc,
             Rectangle2D.Float contentRectangle, Rectangle2D.Float clipRectangle,
-            FontUse font, boolean strokeSVGText) {
+            FontConsumer fontConsumer, boolean strokeSVGText) {
         closeTextObject();
-        PDFGraphics2D graphics = getPDFContent4SVG(contentRectangle, font,
-                doc, strokeSVGText);
+        PDFGraphics2D graphics = getPDFContent4SVG(contentRectangle,
+                fontConsumer, doc, strokeSVGText);
         if (graphics == null) {
             // Error messages have already been logged.
             return;
@@ -327,7 +327,7 @@
     }
 
     public PDFGraphics2D getPDFContent4SVG(Rectangle2D.Float contentRectangle,
-            FontUse font,
+            FontConsumer fontConsumer,
             SVGDocument svgDocument, boolean strokeSVGText) {
         /* If not running in a graphical environment, log an error message
          * and skip the SVG. */
@@ -344,8 +344,7 @@
         if (strokeSVGText) {
             textPainter = new StrokingTextPainter();
         } else {
-            textPainter = new PDFTextPainter(getLogger(),
-                    font.getFontConsumer());
+            textPainter = new PDFTextPainter(getLogger(), fontConsumer);
         }
         ctx.setTextPainter(textPainter);
 
@@ -367,7 +366,7 @@
         builder = null;
 
         PDFGraphics2D graphics = new PDFGraphics2D(true, this.getPDFDocument(),
-                contentRectangle, svgDocument, font.getFontConsumer());
+                contentRectangle, svgDocument, fontConsumer);
         graphics.setGraphicContext(new GraphicContext());
 
         try {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.