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

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

Revision: 11829
          http://sourceforge.net/p/foray/code/11829
Author:   victormote
Date:     2021-01-18 20:43:30 +0000 (Mon, 18 Jan 2021)
Log Message:
-----------
Remove loggers from some method APIs.

Modified Paths:
--------------
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/BatikUaDocument.java
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PdfTextPainter.java
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgJava2d.java
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgPdf.java
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgPs.java
    trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformSvg.java

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/BatikUaDocument.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/BatikUaDocument.java	2021-01-18 20:03:09 UTC (rev 11828)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/BatikUaDocument.java	2021-01-18 20:43:30 UTC (rev 11829)
@@ -33,6 +33,7 @@
 
 import org.apache.batik.bridge.UserAgentAdapter;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.awt.Dimension;
 import java.awt.geom.AffineTransform;
@@ -54,8 +55,8 @@
     /** The current AffineTransform. */
     private AffineTransform currentTransform = null;
 
-    /** The logger. */
-    private Logger log;
+    /** The lazily-loaded logger. Use {@link #getLogger()} to obtain the instance. */
+    private Logger logger;
 
     /**
      * Creates a new SVGUserAgent.
@@ -65,28 +66,19 @@
         this.currentTransform = at;
     }
 
-    /**
-     * Sets the logger.
-     * @param logger The new logger.
-     */
-    public void setLogger(final Logger logger) {
-        this.log = logger;
-    }
-
     @Override
     public void displayError(final String message) {
-        this.log.error(message);
+        getLogger().error(message);
     }
 
     @Override
     public void displayError(final Exception ex) {
-        this.log.error("SVG Error" + ex.getMessage());
-        this.log.error(ex.getMessage());
+        getLogger().error("SVG Error", ex);
     }
 
     @Override
     public void displayMessage(final String message) {
-        this.log.info(message);
+        getLogger().info(message);
     }
 
     @Override
@@ -137,5 +129,11 @@
         return true;
     }
 
+    private Logger getLogger() {
+        if (this.logger == null) {
+            this.logger = LoggerFactory.getLogger(BatikUaDocument.class);
+        }
+        return this.logger;
+    }
 }
 

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PdfTextPainter.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PdfTextPainter.java	2021-01-18 20:03:09 UTC (rev 11828)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PdfTextPainter.java	2021-01-18 20:43:30 UTC (rev 11829)
@@ -50,6 +50,7 @@
 import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
 import org.apache.batik.gvt.text.TextPaintInfo;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.awt.Color;
 import java.awt.Graphics2D;
@@ -82,17 +83,15 @@
     /** The font family name used by this text. */
     private String fontFamily = null;
 
-    /** The logger. */
+    /** Lazily-loaded logger. Use {@link #getLogger()} to obtain the instance. */
     private Logger logger;
 
     /**
      * Constructor.
      * @param consumer The FontConsumer that should be used for font resolution.
-     * @param logger The logger.
      */
-    public PdfTextPainter(final FontConsumer consumer, final Logger logger) {
+    public PdfTextPainter(final FontConsumer consumer) {
         this.fontConsumer = consumer;
-        this.logger = logger;
     }
 
     @Override
@@ -264,7 +263,7 @@
         try {
             fontToUse = getFontToUse(aci, g2d, taFontSize, isItalic, isBold);
         } catch (final FontException e) {
-            this.logger.error(e.getMessage());
+            getLogger().error(e.getMessage());
         }
 
         final String awtFontFamily = this.fontFamily;
@@ -405,4 +404,11 @@
         return PdfTextPainter.PROXY_PAINTER.getOutline(node);
     }
 
+    private Logger getLogger() {
+        if (this.logger == null) {
+            this.logger = LoggerFactory.getLogger(PdfTextPainter.class);
+        }
+        return this.logger;
+    }
+
 }

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgJava2d.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgJava2d.java	2021-01-18 20:03:09 UTC (rev 11828)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgJava2d.java	2021-01-18 20:43:30 UTC (rev 11829)
@@ -119,7 +119,6 @@
      */
     public BridgeContext makeBridgeContextAWT() {
         final BatikUaAwt userAgent = new BatikUaAwt(new AffineTransform());
-        userAgent.setLogger(getLogger());
         return new BridgeContext(userAgent);
     }
 

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgPdf.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgPdf.java	2021-01-18 20:03:09 UTC (rev 11828)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgPdf.java	2021-01-18 20:43:30 UTC (rev 11829)
@@ -111,9 +111,7 @@
                     + "required to process SVG. Skipping.");
             return null;
         }
-        final BatikUaDocument userAgent = new BatikUaDocument(
-                new AffineTransform());
-        userAgent.setLogger(this.svg.getLogger());
+        final BatikUaDocument userAgent = new BatikUaDocument(new AffineTransform());
         BridgeContext ctx = new BridgeContext(userAgent);
         GVTBuilder builder = new GVTBuilder();
         TextPainter textPainter = null;
@@ -120,7 +118,7 @@
         if (strokeSVGText) {
             textPainter = new StrokingTextPainter();
         } else {
-            textPainter = new PdfTextPainter(fontConsumer, this.svg.getLogger());
+            textPainter = new PdfTextPainter(fontConsumer);
         }
         ctx.setTextPainter(textPainter);
 
@@ -127,8 +125,7 @@
         final PdfaElementBridge aBridge = new PdfaElementBridge();
         ctx.putBridge(aBridge);
 
-        final GraphicsNode root;
-        root = builder.build(ctx, svgDocument);
+        final GraphicsNode root = builder.build(ctx, svgDocument);
         ctx = null;
         builder = null;
 

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgPs.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgPs.java	2021-01-18 20:03:09 UTC (rev 11828)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgPs.java	2021-01-18 20:43:30 UTC (rev 11829)
@@ -107,9 +107,7 @@
      * @return A Batik BridgeContext instance.
      */
     public BridgeContext makeBridgeContext() {
-        final BatikUaDocument userAgent = new BatikUaDocument(
-                new AffineTransform());
-        userAgent.setLogger(getLogger());
+        final BatikUaDocument userAgent = new BatikUaDocument(new AffineTransform());
         return new BridgeContext(userAgent);
     }
 

Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformSvg.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformSvg.java	2021-01-18 20:03:09 UTC (rev 11828)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformSvg.java	2021-01-18 20:43:30 UTC (rev 11829)
@@ -64,10 +64,9 @@
      * SVG.
      * @param strokeText Set to true if text should be stroked, false if it
      * should be drawn with a font.
-     * @throws GraphicException For errors getting the appropriate filter.
      */
-    public PdfXformSvg(final PdfDocument4a doc, final SvgGraphic graphic,
-            final FontConsumer fontConsumer, final boolean strokeText) {
+    public PdfXformSvg(final PdfDocument4a doc, final SvgGraphic graphic, final FontConsumer fontConsumer,
+            final boolean strokeText) {
         super(doc, graphic);
         this.graphic = graphic;
         this.fontConsumer = fontConsumer;

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