pbwest 2004/01/24 18:49:41 Modified: src/java/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design ColorCommon.java Border.java Font.java Property.java Background.java Log: Switch to java.util.logging Revision Changes Path No revision No revision 1.1.2.3 +2 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/ColorCommon.java Index: ColorCommon.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/ColorCommon.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- ColorCommon.java 5 Jan 2004 04:01:09 -0000 1.1.2.2 +++ ColorCommon.java 25 Jan 2004 02:49:41 -0000 1.1.2.3 @@ -58,7 +58,6 @@ import org.apache.fop.fo.FONode; import org.apache.fop.fo.PropNames; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.messaging.MessageHandler; /** * Pseudo-property class for common color values occurring in a @@ -136,7 +135,7 @@ enum = new EnumType(property, name); } catch (PropertyException e) { System.out.println("PropertyException: " + e.getMessage()); - MessageHandler.logln(name + + logger.warning(name + " is not a standard color for '" + PropNames.getPropertyName(property) + "'. Trying as a system-color."); 1.1.2.3 +4 -5 xml-fop/src/java/org/apache/fop/fo/properties/Attic/Border.java Index: Border.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/Border.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- Border.java 3 Jan 2004 10:48:34 -0000 1.1.2.2 +++ Border.java 25 Jan 2004 02:49:41 -0000 1.1.2.3 @@ -60,7 +60,6 @@ import org.apache.fop.fo.PropertyConsts; import org.apache.fop.fo.ShorthandPropSets; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.messaging.MessageHandler; public class Border extends Property { public static final int dataTypes = SHORTHAND; @@ -128,7 +127,7 @@ pv = PropertyConsts.pconsts.refineParsing (PropNames.BORDER_WIDTH, foNode, val, IS_NESTED); if (width != null) - MessageHandler.log("border: duplicate" + + logger.info("border: duplicate" + "width overrides previous width"); width = pv; continue; @@ -137,7 +136,7 @@ pv = PropertyConsts.pconsts.refineParsing (PropNames.BORDER_STYLE, foNode, val, IS_NESTED); if (style != null) - MessageHandler.log("border: duplicate" + + logger.info("border: duplicate" + "style overrides previous style"); style = pv; continue; @@ -146,7 +145,7 @@ pv = PropertyConsts.pconsts.refineParsing (PropNames.BORDER_COLOR, foNode, val, IS_NESTED); if (color != null) - MessageHandler.log("border: duplicate" + + logger.info("border: duplicate" + "color overrides previous color"); color = pv; continue; 1.1.2.4 +4 -5 xml-fop/src/java/org/apache/fop/fo/properties/Attic/Font.java Index: Font.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/Font.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- Font.java 5 Jan 2004 04:01:09 -0000 1.1.2.3 +++ Font.java 25 Jan 2004 02:49:41 -0000 1.1.2.4 @@ -67,7 +67,6 @@ import org.apache.fop.fo.ShorthandPropSets; import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.expr.SystemFontFunction; -import org.apache.fop.messaging.MessageHandler; public class Font extends Property { public static final int dataTypes = SHORTHAND; @@ -476,7 +475,7 @@ (PropNames.FONT_STYLE, foNode, propvals[i], IS_NESTED); if (style != null) - MessageHandler.log("font: duplicate" + + logger.info("font: duplicate" + "style overrides previous style"); style = pv; continue; @@ -487,7 +486,7 @@ (PropNames.FONT_VARIANT, foNode, propvals[i], IS_NESTED); if (variant != null) - MessageHandler.log("font: duplicate" + + logger.info("font: duplicate" + "variant overrides previous variant"); variant = pv; continue; @@ -498,7 +497,7 @@ (PropNames.FONT_WEIGHT, foNode, propvals[i], IS_NESTED); if (weight != null) - MessageHandler.log("font: duplicate" + + logger.info("font: duplicate" + "weight overrides previous weight"); weight = pv; continue; 1.1.2.5 +11 -9 xml-fop/src/java/org/apache/fop/fo/properties/Attic/Property.java Index: Property.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/Property.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- Property.java 5 Jan 2004 03:58:51 -0000 1.1.2.4 +++ Property.java 25 Jan 2004 02:49:41 -0000 1.1.2.5 @@ -57,6 +57,7 @@ import java.util.Iterator; import java.util.Map; +import java.util.logging.Logger; import org.apache.fop.datatypes.Auto; import org.apache.fop.datatypes.ColorType; @@ -81,7 +82,6 @@ import org.apache.fop.fo.ShorthandPropSets; import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.expr.PropertyNotImplementedException; -import org.apache.fop.messaging.MessageHandler; /** * Parent class for all of the individual property classes. It also contains @@ -92,6 +92,8 @@ private static final String tag = "$Name$"; private static final String revision = "$Revision$"; + + protected static final Logger logger = Logger.getLogger("org.apache.fop"); /* * The list of property data types. These are used to form a bitmap of @@ -806,13 +808,13 @@ int type = pval.getType(); switch (type) { case PropertyValue.COLOR_TYPE: - if (color != null) MessageHandler.logln(propName + + if (color != null) logger.info(propName + ": duplicate color overrides previous color"); color = pval; color.setProperty(colorProp); continue scanning_elements; case PropertyValue.NUMERIC: - if (width != null) MessageHandler.logln(propName + + if (width != null) logger.info(propName + ": duplicate width overrides previous width"); width = pval; width.setProperty(widthProp); @@ -828,7 +830,7 @@ styleFound = new EnumType(styleProp, ncname); } catch (PropertyException e) {} if (styleFound != null) { - if (style != null) MessageHandler.logln(propName + + if (style != null) logger.info(propName + ": duplicate style overrides previous style"); style = styleFound; continue scanning_elements; @@ -840,7 +842,7 @@ (foNode, widthProp, ncname)).getMappedNumValue(); } catch (PropertyException e) {} if (widthFound != null) { - if (width != null) MessageHandler.logln(propName + + if (width != null) logger.info(propName + ": duplicate width overrides previous width"); width = widthFound; continue scanning_elements; @@ -850,7 +852,7 @@ colorFound = new ColorType(colorProp, ncname); } catch (PropertyException e) {} if (colorFound != null) { - if (color != null) MessageHandler.logln(propName + + if (color != null) logger.info(propName + ": duplicate color overrides previous color"); color = colorFound; continue scanning_elements; 1.1.2.5 +8 -9 xml-fop/src/java/org/apache/fop/fo/properties/Attic/Background.java Index: Background.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/Background.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- Background.java 5 Jan 2004 04:01:09 -0000 1.1.2.4 +++ Background.java 25 Jan 2004 02:49:41 -0000 1.1.2.5 @@ -65,7 +65,6 @@ import org.apache.fop.fo.PropertyConsts; import org.apache.fop.fo.ShorthandPropSets; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.messaging.MessageHandler; public class Background extends Property { public static final int dataTypes = SHORTHAND | INHERIT; @@ -190,19 +189,19 @@ int type = pval.getType(); switch (type) { case PropertyValue.COLOR_TYPE: - if (color != null) MessageHandler.log("background: " + + if (color != null) logger.info("background: " + "duplicate color overrides previous color"); color = pval; continue scanning_elements; case PropertyValue.URI_TYPE: - if (image != null) MessageHandler.log("background: " + + if (image != null) logger.info("background: " + "duplicate image uri overrides previous image spec"); image = pval; continue scanning_elements; case PropertyValue.NONE: - if (image != null) MessageHandler.log("background: " + + if (image != null) logger.info("background: " + "duplicate image spec overrides previous image spec"); image = pval; continue scanning_elements; @@ -230,7 +229,7 @@ } // Now send one or two Numerics to BackgroundPosition if (position != null) - MessageHandler.log("background: duplicate" + + logger.info("background: duplicate" + "position overrides previous position"); if (tmpval == null) position = PropertyConsts.pconsts.refineParsing @@ -260,7 +259,7 @@ (PropNames.BACKGROUND_COLOR, ncname); } catch (PropertyException e) {} if (colorval != null) { - if (color != null) MessageHandler.log("background: " + + if (color != null) logger.info("background: " + "duplicate color overrides previous color"); color = colorval; continue scanning_elements; @@ -274,7 +273,7 @@ } catch (PropertyException e) {} if (enum != null) { if (attachment != null) - MessageHandler.log("background: duplicate" + + logger.info("background: duplicate" + "attachment overrides previous attachment"); attachment = enum; continue scanning_elements; @@ -314,7 +313,7 @@ if (pos1ok) { if (position != null) - MessageHandler.log("background: duplicate" + + logger.info("background: duplicate" + "position overrides previous position"); // Is it followed by another position NCName? if (pos2ok) {
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]