[FOray-commit] SF.net SVN: foray:[11839] trunk/foray/foray-pdf/src/main/java/org/foray/ pdf

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

Revision: 11839
          http://sourceforge.net/p/foray/code/11839
Author:   victormote
Date:     2021-01-20 11:06:58 +0000 (Wed, 20 Jan 2021)
Log Message:
-----------
Allow the graphics state colors to be any PdfColor, not just PdfColor4a.

Modified Paths:
--------------
    trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfColor4a.java
    trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfDocument4a.java
    trunk/foray/foray-pdf/src/main/java/org/foray/pdf/util/PdfGraphics2D.java

Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfColor4a.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfColor4a.java	2021-01-20 10:32:39 UTC (rev 11838)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfColor4a.java	2021-01-20 11:06:58 UTC (rev 11839)
@@ -82,7 +82,7 @@
             return false;
         }
         final PdfColor4a otherColor = (PdfColor4a) obj;
-        return this.getColor().equals(otherColor.getColor());
+        return this.getAwtColor().equals(otherColor.getAwtColor());
     }
 
     /**
@@ -120,11 +120,8 @@
         return false;
     }
 
-    /**
-     * Return the encapsulated Color.
-     * @return The encapsulated Color.
-     */
-    public Color getColor() {
+    @Override
+    public Color getAwtColor() {
         return this.color;
     }
 

Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfDocument4a.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfDocument4a.java	2021-01-20 10:32:39 UTC (rev 11838)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfDocument4a.java	2021-01-20 11:06:58 UTC (rev 11839)
@@ -556,7 +556,7 @@
         PdfColor4a pdfColor = null;
         for (int i = 0; i < this.usedColors.size(); i++) {
             pdfColor = this.usedColors.get(i);
-            if (pdfColor.getColor().equals(color)) {
+            if (pdfColor.getAwtColor().equals(color)) {
                 return pdfColor;
             }
         }

Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/util/PdfGraphics2D.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/util/PdfGraphics2D.java	2021-01-20 10:32:39 UTC (rev 11838)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/util/PdfGraphics2D.java	2021-01-20 11:06:58 UTC (rev 11839)
@@ -40,6 +40,7 @@
 import org.foray.common.ps.PsColor;
 import org.foray.common.ps.PsUtil;
 import org.foray.pdf.PdfConstants;
+import org.foray.pdf.object.PdfColor4a;
 
 import org.axsl.font.FontConsumer;
 import org.axsl.font.FontOptions;
@@ -46,6 +47,7 @@
 import org.axsl.font.FontUse;
 import org.axsl.font.FontUtility;
 import org.axsl.graphic.output.GraphicOutputContext;
+import org.axsl.pdf.PdfColor;
 import org.axsl.pdf.PdfPage;
 
 import org.apache.batik.ext.awt.g2d.GraphicContext;
@@ -105,10 +107,10 @@
     private final class PdfGraphicsState {
 
         /** The stroke color. */
-        private Color strokeColor;
+        private PdfColor strokeColor;
 
         /** The "non-stroke" or "other" color. */
-        private Color fillColor;
+        private PdfColor fillColor;
 
         /** The font. */
         private FontUse font;
@@ -280,7 +282,7 @@
             return false;
         }
 
-        final int numChannels = this.getGraphicsState().strokeColor.getColorSpace().getNumComponents();
+        final int numChannels = this.getGraphicsState().strokeColor.getAwtColor().getColorSpace().getNumComponents();
         final Dimension size = new Dimension(width * numChannels,
                 height * numChannels);
         final BufferedImage buf = new BufferedImage(size.width, size.height,
@@ -395,7 +397,7 @@
         this.saveGraphicsState();
         final Shape imclip = getClip();
         writeClip(imclip);
-        setNonStrokeColor(c);
+        setNonStrokeColor(new PdfColor4a(c));
 
         applyPaint(getPaint(), false);
         applyStroke(getStroke());
@@ -486,27 +488,27 @@
 
     /**
      * Set the stroke color.
-     * @param color The color to be set.
+     * @param pdfColor The color to be set.
      */
-    protected void setStrokeColor(final Color color) {
+    protected void setStrokeColor(final PdfColor4a pdfColor) {
         boolean anyChange = false;
-        anyChange = ! color.equals(this.getGraphicsState().strokeColor);
-        this.getGraphicsState().strokeColor = color;
+        anyChange = ! pdfColor.equals(this.getGraphicsState().strokeColor);
+        this.getGraphicsState().strokeColor = pdfColor;
         if (anyChange) {
-            this.write(PsColor.toPS(color, false));
+            this.write(PsColor.toPS(pdfColor.getAwtColor(), false));
         }
     }
 
     /**
      * Set the fill or non-stroke color.
-     * @param color The color to be set.
+     * @param pdfColor The color to be set.
      */
-    protected void setNonStrokeColor(final Color color) {
+    protected void setNonStrokeColor(final PdfColor4a pdfColor) {
         boolean anyChange = false;
-        anyChange = ! color.equals(this.getGraphicsState().fillColor);
-        this.getGraphicsState().fillColor = color;
+        anyChange = ! pdfColor.equals(this.getGraphicsState().fillColor);
+        this.getGraphicsState().fillColor = pdfColor;
         if (anyChange) {
-            this.write(PsColor.toPS(color, true));
+            this.write(PsColor.toPS(pdfColor.getAwtColor(), true));
         }
     }
 
@@ -657,9 +659,9 @@
         final Shape imclip = getClip();
         writeClip(imclip);
         Color c = getColor();
-        setNonStrokeColor(c);
+        setNonStrokeColor(new PdfColor4a(c));
         c = getBackground();
-        setStrokeColor(c);
+        setStrokeColor(new PdfColor4a(c));
 
         this.write("BT");
 
@@ -722,9 +724,9 @@
         final Shape imclip = getClip();
         writeClip(imclip);
         Color c = getColor();
-        setNonStrokeColor(c);
+        setNonStrokeColor(new PdfColor4a(c));
         c = getBackground();
-        setStrokeColor(c);
+        setStrokeColor(new PdfColor4a(c));
 
         this.write("BT");
 
@@ -779,9 +781,9 @@
         final Shape imclip = getClip();
         writeClip(imclip);
         c = getColor();
-        setNonStrokeColor(c);
+        setNonStrokeColor(new PdfColor4a(c));
         c = getBackground();
-        setStrokeColor(c);
+        setStrokeColor(new PdfColor4a(c));
 
         applyPaint(getPaint(), true);
 

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