[FOray-commit] SF.net SVN: foray: [9767] trunk/foray

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

Revision: 9767
          http://svn.sourceforge.net/foray/?rev=9767&view=rev
Author:   victormote
Date:     2007-06-12 18:58:06 -0700 (Tue, 12 Jun 2007)

Log Message:
-----------
1. Conform to axsl changes making some parameters more generic.
2. Change internals of PDF Graphics State to store the FOray implementation instead of an aXSL interface.

Modified Paths:
--------------
    trunk/foray/foray-pdf/src/java/org/foray/pdf/PDFGraphicsState.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java
    trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/PDFGraphicsState.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/PDFGraphicsState.java	2007-06-13 01:01:12 UTC (rev 9766)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/PDFGraphicsState.java	2007-06-13 01:58:06 UTC (rev 9767)
@@ -28,8 +28,9 @@
 
 package org.foray.pdf;
 
-import org.axsl.pdfW.PDFColor;
-import org.axsl.pdfW.PDFFont;
+import org.foray.pdf.object.PDFColor;
+import org.foray.pdf.object.PDFFont;
+
 import org.axsl.pdfW.PDFLineCapStyle;
 
 import java.awt.Color;

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	2007-06-13 01:01:12 UTC (rev 9766)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java	2007-06-13 01:58:06 UTC (rev 9767)
@@ -36,12 +36,11 @@
 import org.foray.pdf.svg.batik.PDFTextPainter;
 
 import org.axsl.fontR.FontConsumer;
+import org.axsl.fontR.FontUse;
 import org.axsl.graphicR.Graphic;
 import org.axsl.graphicR.GraphicException;
 import org.axsl.graphicR.GraphicLink;
 import org.axsl.graphicR.SVGGraphic;
-import org.axsl.pdfW.PDFColor;
-import org.axsl.pdfW.PDFFont;
 import org.axsl.pdfW.PDFLineCapStyle;
 import org.axsl.pdfW.PDFPathPaint;
 
@@ -54,6 +53,7 @@
 
 import org.w3c.dom.svg.SVGDocument;
 
+import java.awt.Color;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Line2D;
 import java.awt.geom.Rectangle2D;
@@ -142,29 +142,32 @@
     /**
      * {@inheritDoc}
      */
-    public void setFont(final PDFFont newFont, final float newFontSize) {
+    public void setFont(final FontUse newFont, final float newFontSize) {
+        final PDFFont pdfFont = this.getPDFDocument().getPDFFont(newFont);
         openTextObject();
         boolean anyChange = false;
-        anyChange |= this.getGS().setFont(newFont);
+        anyChange |= this.getGS().setFont(pdfFont);
         anyChange |= this.getGS().setFontSize(newFontSize);
         if (! anyChange) {
             // Nothing needs to change.
             return;
         }
-        final String psStyleName = newFont.getName();
+        final String psStyleName = pdfFont.getName();
         add("/" + psStyleName + " " + newFontSize + " Tf" + EOL);
     }
 
     /**
      * {@inheritDoc}
      */
-    public void setStrokeColor(final PDFColor newStrokeColor) {
-        if (! this.getGS().setStrokeColor(newStrokeColor)) {
+    public void setStrokeColor(final Color newStrokeColor) {
+        final PDFColor newPDFColor = this.getPDFDocument().createPDFColor(
+                newStrokeColor);
+        if (! this.getGS().setStrokeColor(newPDFColor)) {
             // Nothing needs to change.
             return;
         }
         /* TODO: Why isn't the parameter on the next statement "false"?? */
-        add(newStrokeColor.getSetterString(true));
+        add(newPDFColor.getSetterString(true));
     }
 
     /**

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java	2007-06-13 01:01:12 UTC (rev 9766)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java	2007-06-13 01:58:06 UTC (rev 9767)
@@ -40,7 +40,6 @@
 
 import org.axsl.fontR.Font;
 import org.axsl.fontR.FontUse;
-import org.axsl.pdfW.PDFColor;
 import org.axsl.pdfW.PDFPage;
 import org.axsl.pdfW.PDFVersion;
 import org.axsl.psR.Encoding;
@@ -725,7 +724,7 @@
     public PDFColor createPDFColor(final Color color) {
         org.foray.pdf.object.PDFColor pdfColor = null;
         for (int i = 0; i < this.usedColors.size(); i++) {
-            pdfColor = (org.foray.pdf.object.PDFColor) this.usedColors.get(i);
+            pdfColor = this.usedColors.get(i);
             if (pdfColor.getColor().equals(color)) {
                 return pdfColor;
             }

Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2007-06-13 01:01:12 UTC (rev 9766)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2007-06-13 01:58:06 UTC (rev 9767)
@@ -60,7 +60,6 @@
 import org.axsl.pdfW.PDFDocument;
 import org.axsl.pdfW.PDFEncryption;
 import org.axsl.pdfW.PDFExplicitDestination;
-import org.axsl.pdfW.PDFFont;
 import org.axsl.pdfW.PDFLineCapStyle;
 import org.axsl.pdfW.PDFOutlineItem;
 import org.axsl.pdfW.PDFOutlineParent;
@@ -296,8 +295,7 @@
 
         /* Set the color. */
         final Color color = area.traitColor();
-        final PDFColor areaColor = this.getPDFDocument().createPDFColor(color);
-        getContentStream().setStrokeColor(areaColor);
+        getContentStream().setStrokeColor(color);
 
         /* Set the word-spacing and letter-spacing. */
         final float wordSpacing = toPoints(area.wordSpacing());
@@ -395,9 +393,7 @@
         if (size < 1) {
             return;
         }
-        PDFFont pdfFont;
-        pdfFont = this.pdfDoc.getPDFFont(fontUse);
-        getContentStream().setFont(pdfFont, toPoints(area.traitFontSize()));
+        getContentStream().setFont(fontUse, toPoints(area.traitFontSize()));
 
         /* Paint the text. */
         final String textToWrite = new String(text, startIndex, size);


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