Change the way Logger is accessed

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@197424 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/fo/pagination/FoLayoutMasterSet.java b/src/java/org/apache/fop/fo/pagination/FoLayoutMasterSet.java
index 776591c54b55268857de3cd9b5ef4117b090850b..2ee649c26e150e22754668953460316ad9b9b4a8 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/FoLayoutMasterSet.java
+++ b/src/java/org/apache/fop/fo/pagination/FoLayoutMasterSet.java
@@ -26,7 +26,6 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.Fop;
 import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
@@ -256,7 +255,7 @@ public class FoLayoutMasterSet extends FONode {
     public long makePageId() {
         if (++pageId == 0) {
             ++pageId;   // 0 is invalid
-            Fop.logger.warning("Page ID rollover.");
+            log.warning("Page ID rollover.");
         }
         return pageId;
     }

diff --git a/src/java/org/apache/fop/xml/FoXmlSerialHandler.java b/src/java/org/apache/fop/xml/FoXmlSerialHandler.java
index 33fa6b916c911e21afb65e1fada57009d579249b..ae5a6370ed317d516a6f4c95977a71621757f196 100644 (file)
--- a/src/java/org/apache/fop/xml/FoXmlSerialHandler.java
+++ b/src/java/org/apache/fop/xml/FoXmlSerialHandler.java
@@ -21,6 +21,7 @@ package org.apache.fop.xml;
 
 import java.util.NoSuchElementException;
 import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -53,6 +54,7 @@ implements Runnable {
     private Namespaces namespaces;
     private InputSource source;
     private Thread foThread;
+    protected Logger log = Logger.getLogger(Fop.fopPackage);
     private boolean errorDump;
 
     /**
@@ -68,7 +70,7 @@ implements Runnable {
         this.source = source;
         namespaces = events.getNamespaces();
         parser.setContentHandler(this);
-        Level level = Fop.logger.getLevel();
+        Level level = log.getLevel();
         if (level.intValue() <= Level.FINE.intValue()) {
             errorDump = true;
         }