cvs commit: xml-fop/src/java/org/apache/fop/svg PDFTextPainter.java

[gmazza]

gmazza      2003/09/09 12:44:22

  Modified:    src/java/org/apache/fop/svg PDFTextPainter.java
  Log:
  Changes to PDFTextPainter to accomodate new Batik library.
  
  Revision  Changes    Path
  1.7       +13 -7     xml-fop/src/java/org/apache/fop/svg/PDFTextPainter.java
  
  Index: PDFTextPainter.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/svg/PDFTextPainter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PDFTextPainter.java       20 Aug 2003 18:09:46 -0000      1.6
  +++ PDFTextPainter.java       9 Sep 2003 19:44:22 -0000       1.7
  @@ -68,6 +68,7 @@
   import org.apache.batik.gvt.TextPainter;
   import org.apache.batik.gvt.TextNode;
   import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
  +import org.apache.batik.gvt.text.TextPaintInfo;
   import org.apache.batik.gvt.font.GVTFontFamily;
   import org.apache.batik.bridge.SVGFontFamily;
   import org.apache.batik.gvt.renderer.StrokingTextPainter;
  @@ -118,7 +119,7 @@
           // System.out.println("PDFText paint");
           String txt = node.getText();
           Point2D loc = node.getLocation();
  -
  +        
           AttributedCharacterIterator aci =
             node.getAttributedCharacterIterator();
           // reset position to start of char iterator
  @@ -135,17 +136,22 @@
   
           List gvtFonts;
           gvtFonts = (List) aci.getAttribute(
  -                      
GVTAttributedCharacterIterator.TextAttribute.GVT_FONT_FAMILIES);
  +            GVTAttributedCharacterIterator.TextAttribute.GVT_FONT_FAMILIES);
  +
           Paint forg = (Paint) aci.getAttribute(TextAttribute.FOREGROUND);
  -        Paint strokePaint;
  -        strokePaint = (Paint) aci.getAttribute(
  -                     GVTAttributedCharacterIterator.TextAttribute.STROKE_PAINT);
  +        TextPaintInfo tpi = (TextPaintInfo) aci.getAttribute(
  +            GVTAttributedCharacterIterator.TextAttribute.PAINT_INFO);
  +        
  +        if (tpi == null) {
  +            return;
  +        }        
  +        
  +        Paint strokePaint = tpi.strokePaint;
           Float size = (Float) aci.getAttribute(TextAttribute.SIZE);
           if (size == null) {
               return;
           }
  -        Stroke stroke = (Stroke) aci.getAttribute(
  -                          GVTAttributedCharacterIterator.TextAttribute.STROKE);
  +        Stroke stroke = tpi.strokeStroke;
           /*
           Float xpos = (Float) aci.getAttribute(
                          GVTAttributedCharacterIterator.TextAttribute.X);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]