pbwest 2004/01/24 20:40:34 Modified: src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FObjects.java FOPropertySets.java FObjectNames.java FONode.java Log: Used Fop.fopPackage Revision Changes Path No revision No revision 1.1.2.8 +7 -7 xml-fop/src/java/org/apache/fop/fo/Attic/FObjects.java Index: FObjects.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FObjects.java,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- FObjects.java 15 Jan 2004 03:10:58 -0000 1.1.2.7 +++ FObjects.java 25 Jan 2004 04:40:34 -0000 1.1.2.8 @@ -1,6 +1,4 @@ /* - * $Id$ - * * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,9 +46,7 @@ * James Tauber <[EMAIL PROTECTED]>. For more information on the Apache * Software Foundation, please see <http://www.apache.org/>. * - * - * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a> - * @version $Id$ + * $Id$ */ package org.apache.fop.fo; @@ -61,6 +57,7 @@ import java.util.StringTokenizer; import org.apache.fop.apps.FOPException; +import org.apache.fop.apps.Fop; import org.apache.fop.datatypes.Ints; import org.apache.fop.fo.flow.FoPcdata; import org.apache.fop.xml.FoXmlEvent; @@ -68,6 +65,9 @@ /** * Data class for common data and methods relating to Flow Objects. + * + * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a> + * @version $Id$ */ public class FObjects { @@ -75,7 +75,7 @@ private static final String tag = "$Name$"; private static final String revision = "$Revision$"; - public static final String packageNamePrefix = "org.apache.fop"; + public static final String packageNamePrefix = Fop.fopPackage; /** * Create a singleton FObjects object 1.1.2.2 +7 -7 xml-fop/src/java/org/apache/fop/fo/Attic/FOPropertySets.java Index: FOPropertySets.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FOPropertySets.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- FOPropertySets.java 5 Jul 2003 19:26:05 -0000 1.1.2.1 +++ FOPropertySets.java 25 Jan 2004 04:40:34 -0000 1.1.2.2 @@ -1,6 +1,4 @@ /* - * $Id$ - * * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,9 +46,7 @@ * James Tauber <[EMAIL PROTECTED]>. For more information on the Apache * Software Foundation, please see <http://www.apache.org/>. * - * - * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a> - * @version $Id$ + * $Id$ */ package org.apache.fop.fo; @@ -58,10 +54,14 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; +import org.apache.fop.apps.Fop; import org.apache.fop.datastructs.ROBitSet; /** * Data class relating sets of properties to Flow Objects. + * + * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a> + * @version $Id$ */ public class FOPropertySets { @@ -69,7 +69,7 @@ private static final String tag = "$Name$"; private static final String revision = "$Revision$"; - public static final String packageNamePrefix = "org.apache.fop"; + public static final String packageNamePrefix = Fop.fopPackage; public static String getAttrSetName(int ancestry) throws FOPException { if ((ancestry & FONode.MC_MARKER) != 0) 1.1.2.5 +6 -7 xml-fop/src/java/org/apache/fop/fo/Attic/FObjectNames.java Index: FObjectNames.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FObjectNames.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- FObjectNames.java 14 Jan 2004 15:20:43 -0000 1.1.2.4 +++ FObjectNames.java 25 Jan 2004 04:40:34 -0000 1.1.2.5 @@ -1,6 +1,4 @@ /* - * $Id$ - * * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,9 +46,7 @@ * James Tauber <[EMAIL PROTECTED]>. For more information on the Apache * Software Foundation, please see <http://www.apache.org/>. * - * - * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a> - * @version $Rev$ $Name$ + * $Id$ */ package org.apache.fop.fo; @@ -63,6 +59,9 @@ /** * Data class containing the Flow Object names and associated integer * constants. + * + * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a> + * @version $Rev$ $Name$ */ public class FObjectNames { @@ -143,7 +142,7 @@ * Array containing the local names of all of the elements in the * <i>FO</i> namespace and the package name suffix of the Object * representing the FO. The current package name prefix is - * "org.apache.fop", but this may be varied without affecting the array. + * Fop.fopPackage, but this may be varied without affecting the array. * The array is effectively 1-based as the zero * index does not correspond to any FO element. The list of * <tt>int</tt> constants must be kept in sync with this array, as the 1.2.2.11 +2 -1 xml-fop/src/java/org/apache/fop/fo/FONode.java Index: FONode.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v retrieving revision 1.2.2.10 retrieving revision 1.2.2.11 diff -u -r1.2.2.10 -r1.2.2.11 --- FONode.java 25 Jan 2004 02:40:11 -0000 1.2.2.10 +++ FONode.java 25 Jan 2004 04:40:34 -0000 1.2.2.11 @@ -61,6 +61,7 @@ import java.util.logging.Logger; import org.apache.fop.apps.FOPException; +import org.apache.fop.apps.Fop; import org.apache.fop.datastructs.Node; import org.apache.fop.datastructs.ROBitSet; import org.apache.fop.datastructs.TreeException; @@ -88,7 +89,7 @@ private static final String tag = "$Name$"; private static final String revision = "$Revision$"; - protected static final Logger logger = Logger.getLogger("org.apache.fop"); + protected static final Logger logger = Logger.getLogger(Fop.fopPackage); /** * State flags: a bit set of states applicable during FO tree build. * N.B. States must be powers of 2.
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]