pbwest 2004/02/08 06:11:25 Added: src/java/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design PageNumberGenerator.java Log: Borrowed from HEAD Revision Changes Path No revision No revision 1.1.2.1 +10 -5 xml-fop/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java Index: PageNumberGenerator.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- PageNumberGenerator.java 11 Mar 2003 13:05:31 -0000 1.1 +++ PageNumberGenerator.java 8 Feb 2004 14:11:25 -0000 1.1.2.1 @@ -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 @@ 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 @@ // 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 {
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]