Borrowed from HEAD

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

diff --git a/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java b/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java
index 55706f2b13fb9f4170795003c243d54fddda51ce..2a255d9b5572c7e3f584c7e60d6891ae8f2d3d95 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java
+++ b/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java
@@ -50,16 +50,19 @@
  */ 
 package org.apache.fop.fo.pagination;
 
-// Avalon
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import java.util.logging.Logger;
+
+import org.apache.fop.apps.Fop;
 
 /**
  * This class uses the 'format', 'groupingSeparator', 'groupingSize',
  * and 'letterValue' properties on fo:page-sequence to return a String
  * corresponding to the supplied integer page number.
  */
-public class PageNumberGenerator extends AbstractLogEnabled {
+public class PageNumberGenerator {
 
+    protected static final Logger logger = Logger.getLogger(Fop.fopPackage);
+    
     private String format;
     private char groupingSeparator;
     private int groupingSize;
@@ -113,7 +116,7 @@ public class PageNumberGenerator extends AbstractLogEnabled {
                 formatType = UPPERROMAN;
             } else {
                 // token not handled
-                //getLogger().debug("'format' token not recognized; using '1'");
+                logger.warning("'format' token not recognized; using '1'");
                 formatType = DECIMAL;
                 minPadding = 0;
             }
@@ -121,9 +124,11 @@ public class PageNumberGenerator extends AbstractLogEnabled {
             // only accepted token is '0+1'at this stage. Because of the
             // wonderful regular expression support in Java, we will resort to a
             // loop
+            // TODO fix for later Java regex support.  Note: this probably
+            // applies to the whole method.
             for (int i = 0; i < fmtLen - 1; i++) {
                 if (format.charAt(i) != '0') {
-                    //getLogger().debug("'format' token not recognized; using '1'");
+                    logger.warning("'format' token not recognized; using '1'");
                     formatType = DECIMAL;
                     minPadding = 0;
                 } else {