gmazza 2004/05/12 16:19:53
Modified: src/java/org/apache/fop/apps Driver.java FOUserAgent.java
src/java/org/apache/fop/fo FOTreeBuilder.java
src/java/org/apache/fop/fo/flow ExternalGraphic.java
src/java/org/apache/fop/image AbstractFopImage.java
FopImage.java GifImage.java ImageFactory.java
src/java/org/apache/fop/image/analyser
ImageReaderFactory.java SVGReader.java
XMLReader.java
src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java
BlockContainerLayoutManager.java
FlowLayoutManager.java
InlineStackingLayoutManager.java
LineLayoutManager.java PageLayoutManager.java
RetrieveMarkerLayoutManager.java
StaticContentLayoutManager.java
TextLayoutManager.java
src/java/org/apache/fop/layoutmgr/table Body.java Cell.java
src/java/org/apache/fop/render/awt AWTRenderer.java
src/java/org/apache/fop/render/pdf PDFRenderer.java
PDFXMLHandler.java
src/java/org/apache/fop/render/ps PSGraphics2D.java
PSRenderer.java PSXMLHandler.java
src/java/org/apache/fop/svg PDFImageElementBridge.java
SVGUserAgent.java
src/java/org/apache/fop/tools AreaTreeBuilder.java
TestConverter.java
src/java/org/apache/fop/tools/anttasks Fop.java
Log:
Removed the getLogger() and setLogger() from FOUserAgent; replaced with Commons
Logging
equivalents in places where previously used.
Revision Changes Path
1.58 +0 -1 xml-fop/src/java/org/apache/fop/apps/Driver.java
Index: Driver.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- Driver.java 24 Apr 2004 07:03:56 -0000 1.57
+++ Driver.java 12 May 2004 23:19:52 -0000 1.58
@@ -245,7 +245,6 @@
public FOUserAgent getUserAgent() {
if (userAgent == null) {
userAgent = new FOUserAgent();
- userAgent.setLogger(getLogger());
}
return userAgent;
}
1.7 +1 -20 xml-fop/src/java/org/apache/fop/apps/FOUserAgent.java
Index: FOUserAgent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/FOUserAgent.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FOUserAgent.java 31 Mar 2004 10:55:05 -0000 1.6
+++ FOUserAgent.java 12 May 2004 23:19:52 -0000 1.7
@@ -23,8 +23,6 @@
import java.io.IOException;
import java.io.InputStream;
-import org.apache.commons.logging.Log;
-
// FOP
import org.apache.fop.pdf.PDFEncryptionParams;
@@ -50,7 +48,6 @@
*/
public class FOUserAgent {
- private Log log;
/** Map containing various default values */
public Map defaults = new java.util.HashMap();
/** Map containing XML handlers for various document types */
@@ -58,22 +55,6 @@
private String baseURL;
private PDFEncryptionParams pdfEncryptionParams;
private float px2mm = 0.35277777777777777778f; //72dpi (=25.4/dpi)
-
- /**
- * Sets the logger.
- * @param log Logger to use
- */
- public void setLogger(Log log) {
- this.log = log;
- }
-
- /**
- * Returns the logger to use.
- * (todo) This breaks IoC/SoC. Should be improved.
- */
- public Log getLogger() {
- return this.log;
- }
/**
* Sets the base URL.
1.25 +7 -1 xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java
Index: FOTreeBuilder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- FOTreeBuilder.java 31 Mar 2004 10:55:06 -0000 1.24
+++ FOTreeBuilder.java 12 May 2004 23:19:52 -0000 1.25
@@ -30,6 +30,7 @@
import java.util.Set;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.fo.ElementMapping.Maker;
@@ -54,6 +55,11 @@
protected Map fobjTable = new java.util.HashMap();
/**
+ * logging instance
+ */
+ protected Log log = LogFactory.getLog(FOTreeBuilder.class);
+
+ /**
* Set of mapped namespaces.
*/
protected Set namespaces = new java.util.HashSet();
@@ -90,7 +96,7 @@
}
private Log getLogger() {
- return userAgent.getLogger();
+ return log;
}
/**
1.23 +1 -1 xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
Index: ExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ExternalGraphic.java 27 Feb 2004 17:44:24 -0000 1.22
+++ ExternalGraphic.java 12 May 2004 23:19:52 -0000 1.23
@@ -124,7 +124,7 @@
return;
}
// load dimensions
- if (!fopimage.load(FopImage.DIMENSIONS, getUserAgent().getLogger())) {
+ if (!fopimage.load(FopImage.DIMENSIONS)) {
// error
url = null;
return;
1.7 +14 -7 xml-fop/src/java/org/apache/fop/image/AbstractFopImage.java
Index: AbstractFopImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/AbstractFopImage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractFopImage.java 31 Mar 2004 10:55:06 -0000 1.6
+++ AbstractFopImage.java 12 May 2004 23:19:52 -0000 1.7
@@ -26,6 +26,7 @@
// FOP
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Base class to implement the FopImage interface.
@@ -34,6 +35,12 @@
* @see FopImage
*/
public abstract class AbstractFopImage implements FopImage {
+
+ /**
+ * logging instance
+ */
+ protected static Log log = LogFactory.getLog(AbstractFopImage.class);
+
/**
* Keeps track of what has been loaded.
*/
@@ -125,13 +132,13 @@
* @param ua the user agent for handling logging etc.
* @return true if the loading was successful
*/
- public synchronized boolean load(int type, Log logger) {
+ public synchronized boolean load(int type) {
if ((loaded & type) != 0) {
return true;
}
boolean success = true;
if (((type & DIMENSIONS) != 0) && ((loaded & DIMENSIONS) == 0)) {
- success = success && loadDimensions(logger);
+ success = success && loadDimensions();
if (!success) {
return false;
@@ -139,13 +146,13 @@
loaded = loaded | DIMENSIONS;
}
if (((type & BITMAP) != 0) && ((loaded & BITMAP) == 0)) {
- success = success && loadBitmap(logger);
+ success = success && loadBitmap();
if (success) {
loaded = loaded | BITMAP;
}
}
if (((type & ORIGINAL_DATA) != 0) && ((loaded & ORIGINAL_DATA) == 0)) {
- success = success && loadOriginalData(logger);
+ success = success && loadOriginalData();
if (success) {
loaded = loaded | ORIGINAL_DATA;
}
@@ -161,7 +168,7 @@
* @param ua the user agent
* @return true if the loading was successful
*/
- protected boolean loadDimensions(Log logger) {
+ protected boolean loadDimensions() {
return false;
}
@@ -173,7 +180,7 @@
* @param ua the user agent
* @return true if the loading was successful
*/
- protected boolean loadBitmap(Log logger) {
+ protected boolean loadBitmap() {
return false;
}
@@ -185,7 +192,7 @@
* @param ua the user agent
* @return true if the loading was successful
*/
- protected boolean loadOriginalData(Log logger) {
+ protected boolean loadOriginalData() {
return false;
}
1.9 +1 -2 xml-fop/src/java/org/apache/fop/image/FopImage.java
Index: FopImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/FopImage.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FopImage.java 31 Mar 2004 10:55:06 -0000 1.8
+++ FopImage.java 12 May 2004 23:19:52 -0000 1.9
@@ -61,10 +61,9 @@
* the information.
*
* @param type the type of loading required
- * @param logger the Commons-logging component
* @return boolean true if the information could be loaded
*/
- boolean load(int type, Log logger);
+ boolean load(int type);
/**
* Returns the image width.
1.7 +3 -3 xml-fop/src/java/org/apache/fop/image/GifImage.java
Index: GifImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/GifImage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GifImage.java 31 Mar 2004 10:55:06 -0000 1.6
+++ GifImage.java 12 May 2004 23:19:52 -0000 1.7
@@ -58,7 +58,7 @@
* @param ua the user agent for loading
* @return True if the load process succeeded
*/
- protected boolean loadBitmap(Log logger) {
+ protected boolean loadBitmap() {
int[] tmpMap = null;
try {
URLConnection con = new DummyConnection(inputStream);
@@ -81,7 +81,7 @@
try {
tmpMap = consumer.getImage();
} catch (Exception ex) {
- logger.error("Image grabbing interrupted : "
+ log.error("Image grabbing interrupted : "
+ ex.getMessage(), ex);
return false;
}
@@ -146,7 +146,7 @@
this.isTransparent = false;
}
} catch (Exception ex) {
- logger.error("Error while loading image "
+ log.error("Error while loading image "
+ "" + " : "
+ ex.getClass() + " - "
+ ex.getMessage(), ex);
1.7 +7 -2 xml-fop/src/java/org/apache/fop/image/ImageFactory.java
Index: ImageFactory.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/ImageFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ImageFactory.java 31 Mar 2004 10:55:06 -0000 1.6
+++ ImageFactory.java 12 May 2004 23:19:52 -0000 1.7
@@ -30,6 +30,7 @@
import java.util.Iterator;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
// FOP
import org.apache.fop.image.analyser.ImageReaderFactory;
@@ -42,6 +43,11 @@
*/
public class ImageFactory {
+ /**
+ * logging instance
+ */
+ protected static Log log = LogFactory.getLog(FopImage.class);
+
private static ImageFactory factory = new ImageFactory();
private ImageCache cache = new ContextImageCache(true);
@@ -129,7 +135,6 @@
* @return the fop image instance
*/
public static FopImage loadImage(String href, FOUserAgent ua) {
- Log log = ua.getLogger();
InputStream in = openStream(href, ua);
@@ -214,7 +219,7 @@
* @return a new FopImage object
*/
protected static InputStream openStream(String href, FOUserAgent ua) {
- Log log = ua.getLogger();
+
// Get the absolute URL
URL absoluteURL = null;
InputStream in = null;
1.4 +8 -3
xml-fop/src/java/org/apache/fop/image/analyser/ImageReaderFactory.java
Index: ImageReaderFactory.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/image/analyser/ImageReaderFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ImageReaderFactory.java 27 Feb 2004 17:47:30 -0000 1.3
+++ ImageReaderFactory.java 12 May 2004 23:19:52 -0000 1.4
@@ -27,6 +27,10 @@
import org.apache.fop.image.FopImage;
import org.apache.fop.apps.FOUserAgent;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
/**
* Factory for ImageReader objects.
*
@@ -37,6 +41,8 @@
private static ArrayList formats = new ArrayList();
+ protected static Log log = LogFactory.getLog(ImageReaderFactory.class);
+
static {
registerFormat(new JPEGReader());
registerFormat(new BMPReader());
@@ -80,9 +86,8 @@
}
}
} catch (IOException ex) {
- ua.getLogger().error(
- "Error while recovering Image Informations ("
- + uri + ")", ex);
+ log.error("Error while recovering Image Informations ("
+ + uri + ")", ex);
}
return null;
}
1.8 +3 -3 xml-fop/src/java/org/apache/fop/image/analyser/SVGReader.java
Index: SVGReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/analyser/SVGReader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SVGReader.java 31 Mar 2004 10:55:06 -0000 1.7
+++ SVGReader.java 12 May 2004 23:19:52 -0000 1.8
@@ -89,7 +89,7 @@
if (batik) {
try {
Loader loader = new Loader();
- return loader.getImage(uri, bis, ua.getLogger(),
+ return loader.getImage(uri, bis,
ua.getPixelUnitToMillimeter());
} catch (NoClassDefFoundError e) {
batik = false;
@@ -107,7 +107,7 @@
*/
class Loader {
private FopImage.ImageInfo getImage(String uri, InputStream fis,
- Log logger, float pixelUnitToMM) {
+ float pixelUnitToMM) {
// parse document and get the size attributes of the svg element
try {
@@ -177,7 +177,7 @@
Element e = doc.getRootElement();
String s;
- SVGUserAgent userAg = new SVGUserAgent(logger, pixelUnitToMM,
+ SVGUserAgent userAg = new SVGUserAgent(pixelUnitToMM,
new AffineTransform());
BridgeContext ctx = new BridgeContext(userAg);
UnitProcessor.Context uctx =
1.5 +11 -2 xml-fop/src/java/org/apache/fop/image/analyser/XMLReader.java
Index: XMLReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/analyser/XMLReader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLReader.java 27 Feb 2004 17:47:30 -0000 1.4
+++ XMLReader.java 12 May 2004 23:19:52 -0000 1.5
@@ -32,9 +32,18 @@
import org.apache.fop.image.FopImage;
import org.apache.fop.apps.FOUserAgent;
+// Commons-Logging
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/** ImageReader object for XML document image type. */
public class XMLReader implements ImageReader {
+ /**
+ * logging instance
+ */
+ private Log log = LogFactory.getLog(XMLReader.class);
+
private static Map converters = new java.util.HashMap();
/**
@@ -108,7 +117,7 @@
info.data = doc;
Element root = doc.getDocumentElement();
- ua.getLogger().debug("XML image namespace: " +
root.getAttribute("xmlns"));
+ log.debug("XML image namespace: " + root.getAttribute("xmlns"));
String ns = root.getAttribute("xmlns");
info.str = ns;
@@ -120,7 +129,7 @@
}
}
} catch (Exception e) {
- ua.getLogger().warn("Error while constructing image from XML", e);
+ log.warn("Error while constructing image from XML", e);
try {
is.reset();
} catch (IOException ioe) {
1.11 +6 -4
xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
Index: AbstractLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractLayoutManager.java 31 Mar 2004 10:55:06 -0000 1.10
+++ AbstractLayoutManager.java 12 May 2004 23:19:52 -0000 1.11
@@ -28,6 +28,7 @@
import org.apache.fop.fo.PropertyManager;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import java.util.ListIterator;
import java.util.Map;
@@ -49,6 +50,11 @@
protected boolean bInited = false;
/**
+ * logging instance
+ */
+ protected static Log log = LogFactory.getLog(AbstractLayoutManager.class);
+
+ /**
* Abstract layout manager.
*/
public AbstractLayoutManager() {
@@ -91,10 +97,6 @@
*/
public FOUserAgent getUserAgent() {
return userAgent;
- }
-
- protected Log getLogger() {
- return userAgent.getLogger();
}
public void setParent(LayoutManager lm) {
1.17 +1 -1
xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
Index: BlockContainerLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BlockContainerLayoutManager.java 21 Mar 2004 12:03:07 -0000 1.16
+++ BlockContainerLayoutManager.java 12 May 2004 23:19:52 -0000 1.17
@@ -245,7 +245,7 @@
if (overflow == Overflow.HIDDEN) {
clip = true;
} else if (overflow == Overflow.ERROR_IF_OVERFLOW) {
- getLogger().error("contents overflows block-container viewport:
clipping");
+ log.error("contents overflows block-container viewport: clipping");
clip = true;
}
}
1.6 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
Index: FlowLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FlowLayoutManager.java 21 Mar 2004 12:03:08 -0000 1.5
+++ FlowLayoutManager.java 12 May 2004 23:19:52 -0000 1.6
@@ -60,7 +60,7 @@
while ((curLM = getChildLM()) != null) {
if (curLM.generatesInlineAreas()) {
- getLogger().error("inline area not allowed under flow - ignoring");
+ log.error("inline area not allowed under flow - ignoring");
curLM.setFinished(true);
continue;
}
@@ -169,7 +169,7 @@
*/
public Marker retrieveMarker(String name, int pos, int boundary) {
// error cannot retrieve markers in flow
- getLogger().error("Cannot retrieve a marker from the flow");
+ log.error("Cannot retrieve a marker from the flow");
return null;
}
}
1.7 +1 -1
xml-fop/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java
Index: InlineStackingLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InlineStackingLayoutManager.java 21 Mar 2004 12:03:08 -0000 1.6
+++ InlineStackingLayoutManager.java 12 May 2004 23:19:52 -0000 1.7
@@ -267,7 +267,7 @@
// ignore nested blocks for now
if (!curLM.generatesInlineAreas()) {
- getLogger().warn("ignoring block inside inline fo");
+ log.warn("ignoring block inside inline fo");
curLM.setFinished(true);
continue;
}
1.19 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
Index: LineLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- LineLayoutManager.java 26 Apr 2004 14:28:30 -0000 1.18
+++ LineLayoutManager.java 12 May 2004 23:19:52 -0000 1.19
@@ -448,7 +448,7 @@
while (bpIter.hasPrevious() && bpIter.previous() != prev) {
}
if (prev != null && bpIter.next() != prev) {
- getLogger().error("findHyphenPoss: problem!");
+ log.error("findHyphenPoss: problem!");
return null;
}
StringBuffer sbChars = new StringBuffer(30);
@@ -465,7 +465,7 @@
prev = bp;
}
vecInlineBreaks.remove(vecInlineBreaks.size() - 1); // remove last
- getLogger().debug("Word to hyphenate: " + sbChars.toString());
+ log.debug("Word to hyphenate: " + sbChars.toString());
// Now find all hyphenation points in this word (get in an array of offsets)
// hyphProps are from the block level?. Note that according to the spec,
1.35 +3 -3 xml-fop/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
Index: PageLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- PageLayoutManager.java 9 May 2004 20:45:15 -0000 1.34
+++ PageLayoutManager.java 12 May 2004 23:19:52 -0000 1.35
@@ -458,7 +458,7 @@
}
RegionViewport reg = curPage.getPage().getRegionViewport(regionClass);
if (reg == null) {
- getLogger().error("no region viewport: shouldn't happen");
+ log.error("no region viewport: shouldn't happen");
}
StaticContentLayoutManager lm = getStaticContentLayoutManager(flow);
lm.setUserAgent(getUserAgent());
@@ -476,7 +476,7 @@
lm.addAreas(new BreakPossPosIter(vecBreakPoss, 0,
vecBreakPoss.size()), null);
} else {
- getLogger().error("bp==null cls=" + regionClass);
+ log.error("bp==null cls=" + regionClass);
}
}
//lm.flush();
@@ -836,7 +836,7 @@
if ((columnCount > 1) && (r.overflow == Overflow.SCROLL)) {
// recover by setting 'column-count' to 1. This is allowed but
// not required by the spec.
- getLogger().error("Setting 'column-count' to 1 because "
+ log.error("Setting 'column-count' to 1 because "
+ "'overflow' is set to 'scroll'");
columnCount = 1;
}
1.7 +2 -2
xml-fop/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java
Index: RetrieveMarkerLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RetrieveMarkerLayoutManager.java 21 Mar 2004 12:03:08 -0000 1.6
+++ RetrieveMarkerLayoutManager.java 12 May 2004 23:19:52 -0000 1.7
@@ -97,9 +97,9 @@
replaceLM = (LayoutManager)list.get(0);
replaceLM.setParent(this);
replaceLM.initialize();
- getLogger().debug("retrieved: " + replaceLM + ":" +
list.size());
+ log.debug("retrieved: " + replaceLM + ":" + list.size());
} else {
- getLogger().debug("found no marker with name: " + name);
+ log.debug("found no marker with name: " + name);
}
}
}
1.4 +2 -2
xml-fop/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
Index: StaticContentLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StaticContentLayoutManager.java 21 Mar 2004 12:03:08 -0000 1.3
+++ StaticContentLayoutManager.java 12 May 2004 23:19:52 -0000 1.4
@@ -62,7 +62,7 @@
if ((bp = curLM.getNextBreakPoss(childLC)) != null) {
blockBreaks.add(bp);
if (bp.isForcedBreak()) {
- getLogger().error("Forced breaks are not allowed in "
+ log.error("Forced breaks are not allowed in "
+ "static content - ignoring");
return null;
}
@@ -128,7 +128,7 @@
*/
public void addMarker(Map marks, boolean start, boolean isfirst) {
// error markers not allowed in static
- getLogger().error("Cannot add marker to static areas");
+ log.error("Cannot add marker to static areas");
}
}
1.16 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java
Index: TextLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TextLayoutManager.java 25 Apr 2004 04:45:28 -0000 1.15
+++ TextLayoutManager.java 12 May 2004 23:19:52 -0000 1.16
@@ -172,7 +172,7 @@
if (prevPos != null) {
// ASSERT (prevPos.getLM() == this)
if (prevPos.getLM() != this) {
- getLogger().error(
+ log.error(
"TextLayoutManager.resetPosition: " + "LM mismatch!!!");
}
LeafPosition tbp = (LeafPosition) prevPos;
1.7 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/table/Body.java
Index: Body.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Body.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Body.java 21 Mar 2004 12:03:08 -0000 1.6
+++ Body.java 12 May 2004 23:19:52 -0000 1.7
@@ -96,7 +96,7 @@
if (columns == null) {
setFinished(true);
- getLogger().warn("ignoring fo:table-body with undefined
fo:table-columns");
+ log.warn("ignoring fo:table-body with undefined fo:table-columns");
return null;
}
1.7 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/table/Cell.java
Index: Cell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Cell.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Cell.java 21 Mar 2004 12:03:08 -0000 1.6
+++ Cell.java 12 May 2004 23:19:52 -0000 1.7
@@ -89,7 +89,7 @@
while ((curLM = getChildLM()) != null) {
if (curLM.generatesInlineAreas()) {
- getLogger().error("table-cell must contain block areas - ignoring");
+ log.error("table-cell must contain block areas - ignoring");
curLM.setFinished(true);
continue;
}
1.23 +1 -1 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- AWTRenderer.java 22 Apr 2004 21:38:40 -0000 1.22
+++ AWTRenderer.java 12 May 2004 23:19:53 -0000 1.23
@@ -377,7 +377,7 @@
if (back.getURL() != null) { // TODO: implement
ImageFactory fact = ImageFactory.getInstance();
FopImage fopimage = fact.getImage(back.getURL(), userAgent);
- if (fopimage != null && fopimage.load(FopImage.DIMENSIONS,
userAgent.getLogger())) {
+ if (fopimage != null && fopimage.load(FopImage.DIMENSIONS)) {
if (back.getRepeat() == BackgroundRepeat.REPEAT) {
// create a pattern for the image
} else {
1.43 +7 -7 xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java
Index: PDFRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- PDFRenderer.java 25 Apr 2004 04:45:28 -0000 1.42
+++ PDFRenderer.java 12 May 2004 23:19:53 -0000 1.43
@@ -594,7 +594,7 @@
if (back.getURL() != null) {
ImageFactory fact = ImageFactory.getInstance();
FopImage fopimage = fact.getImage(back.getURL(), userAgent);
- if (fopimage != null && fopimage.load(FopImage.DIMENSIONS,
userAgent.getLogger())) {
+ if (fopimage != null && fopimage.load(FopImage.DIMENSIONS)) {
if (back.getRepeat() == BackgroundRepeat.REPEAT) {
// create a pattern for the image
} else {
@@ -1118,12 +1118,12 @@
if (fopimage == null) {
return;
}
- if (!fopimage.load(FopImage.DIMENSIONS, userAgent.getLogger())) {
+ if (!fopimage.load(FopImage.DIMENSIONS)) {
return;
}
String mime = fopimage.getMimeType();
if ("text/xml".equals(mime)) {
- if (!fopimage.load(FopImage.ORIGINAL_DATA, userAgent.getLogger())) {
+ if (!fopimage.load(FopImage.ORIGINAL_DATA)) {
return;
}
Document doc = ((XMLImage) fopimage).getDocument();
@@ -1131,7 +1131,7 @@
renderDocument(doc, ns, pos);
} else if ("image/svg+xml".equals(mime)) {
- if (!fopimage.load(FopImage.ORIGINAL_DATA, userAgent.getLogger())) {
+ if (!fopimage.load(FopImage.ORIGINAL_DATA)) {
return;
}
Document doc = ((XMLImage) fopimage).getDocument();
@@ -1139,14 +1139,14 @@
renderDocument(doc, ns, pos);
} else if ("image/eps".equals(mime)) {
- if (!fopimage.load(FopImage.ORIGINAL_DATA, userAgent.getLogger())) {
+ if (!fopimage.load(FopImage.ORIGINAL_DATA)) {
return;
}
FopPDFImage pdfimage = new FopPDFImage(fopimage, url);
int xobj = pdfDoc.addImage(currentContext, pdfimage).getXNumber();
fact.releaseImage(url, userAgent);
} else if ("image/jpeg".equals(mime)) {
- if (!fopimage.load(FopImage.ORIGINAL_DATA, userAgent.getLogger())) {
+ if (!fopimage.load(FopImage.ORIGINAL_DATA)) {
return;
}
FopPDFImage pdfimage = new FopPDFImage(fopimage, url);
@@ -1158,7 +1158,7 @@
placeImage((int) pos.getX() / 1000,
(int) pos.getY() / 1000, w, h, xobj);
} else {
- if (!fopimage.load(FopImage.BITMAP, userAgent.getLogger())) {
+ if (!fopimage.load(FopImage.BITMAP)) {
return;
}
FopPDFImage pdfimage = new FopPDFImage(fopimage, url);
1.11 +15 -5 xml-fop/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java
Index: PDFXMLHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PDFXMLHandler.java 22 Apr 2004 21:38:40 -0000 1.10
+++ PDFXMLHandler.java 12 May 2004 23:19:53 -0000 1.11
@@ -32,8 +32,13 @@
import org.apache.fop.svg.SVGUserAgent;
import org.apache.fop.fonts.FontInfo;
+// Commons-Logging
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
/* org.w3c.dom.Document is not imported to avoid conflict with
- org.apache.fop.control.Document */
+ org.apache.fop.apps.Document */
import java.io.OutputStream;
@@ -55,6 +60,12 @@
* The properties from the PDF renderer are subject to change.
*/
public class PDFXMLHandler implements XMLHandler {
+
+ /**
+ * logging instance
+ */
+ private Log log = LogFactory.getLog(PDFXMLHandler.class);
+
/**
* The PDF document that is being drawn into.
*/
@@ -220,8 +231,7 @@
int yOffset = pdfInfo.currentYPosition;
SVGUserAgent ua
- = new SVGUserAgent(context.getUserAgent().getLogger(),
- context.getUserAgent().getPixelUnitToMillimeter(),
+ = new
SVGUserAgent(context.getUserAgent().getPixelUnitToMillimeter(),
new AffineTransform());
GVTBuilder builder = new GVTBuilder();
@@ -240,7 +250,7 @@
try {
root = builder.build(ctx, doc);
} catch (Exception e) {
- context.getUserAgent().getLogger().error("svg graphic could not be
built: "
+ log.error("svg graphic could not be built: "
+ e.getMessage(), e);
return;
}
@@ -298,7 +308,7 @@
root.paint(graphics);
pdfInfo.currentStream.add(graphics.getString());
} catch (Exception e) {
- context.getUserAgent().getLogger().error("svg graphic could not be
rendered: "
+ log.error("svg graphic could not be rendered: "
+ e.getMessage(), e);
}
1.11 +1 -1 xml-fop/src/java/org/apache/fop/render/ps/PSGraphics2D.java
Index: PSGraphics2D.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSGraphics2D.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PSGraphics2D.java 24 Apr 2004 06:08:13 -0000 1.10
+++ PSGraphics2D.java 12 May 2004 23:19:53 -0000 1.11
@@ -320,7 +320,7 @@
/**
* @see org.apache.fop.image.FopImage#load(int,
org.apache.commons.logging.Log)
*/
- public boolean load(int type, Log logger) {
+ public boolean load(int type) {
switch (type) {
case FopImage.DIMENSIONS: break;
case FopImage.BITMAP: break;
1.27 +1 -1 xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java
Index: PSRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- PSRenderer.java 22 Apr 2004 21:38:40 -0000 1.26
+++ PSRenderer.java 12 May 2004 23:19:53 -0000 1.27
@@ -698,7 +698,7 @@
if (back.getURL() != null) {
ImageFactory fact = ImageFactory.getInstance();
FopImage fopimage = fact.getImage(back.getURL(), userAgent);
- if (fopimage != null && fopimage.load(FopImage.DIMENSIONS,
userAgent.getLogger())) {
+ if (fopimage != null && fopimage.load(FopImage.DIMENSIONS)) {
if (back.getRepeat() == BackgroundRepeat.REPEAT) {
// create a pattern for the image
} else {
1.14 +16 -6 xml-fop/src/java/org/apache/fop/render/ps/PSXMLHandler.java
Index: PSXMLHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSXMLHandler.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PSXMLHandler.java 24 Apr 2004 06:08:13 -0000 1.13
+++ PSXMLHandler.java 12 May 2004 23:19:53 -0000 1.14
@@ -33,12 +33,17 @@
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.ViewBox;
import org.apache.batik.gvt.GraphicsNode;
+
// FOP
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.render.XMLHandler;
import org.apache.fop.render.RendererContext;
import org.apache.fop.svg.SVGUserAgent;
+// Commons-Logging
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* PostScript XML handler.
* This handler handles XML for foreign objects when rendering to PostScript.
@@ -51,6 +56,11 @@
public class PSXMLHandler implements XMLHandler {
/**
+ * logging instance
+ */
+ private Log log = LogFactory.getLog(PSXMLHandler.class);
+
+ /**
* The PostScript generator that is being used to drawn into.
*/
public static final String PS_GENERATOR = "psGenerator";
@@ -258,9 +268,9 @@
PSGenerator gen = psInfo.psGenerator;
SVGUserAgent ua
- = new SVGUserAgent(context.getUserAgent().getLogger(),
- context.getUserAgent().getPixelUnitToMillimeter(),
- new AffineTransform());
+ = new SVGUserAgent(
+ context.getUserAgent().getPixelUnitToMillimeter(),
+ new AffineTransform());
GVTBuilder builder = new GVTBuilder();
BridgeContext ctx = new BridgeContext(ua);
@@ -280,7 +290,7 @@
try {
root = builder.build(ctx, doc);
} catch (Exception e) {
- context.getUserAgent().getLogger().error("SVG graphic could not be
built: "
+ log.error("SVG graphic could not be built: "
+ e.getMessage(), e);
return;
}
@@ -337,7 +347,7 @@
root.paint(graphics);
//psInfo.currentStream.add(graphics.getString());
} catch (Exception e) {
- context.getUserAgent().getLogger().error("SVG graphic could not
be rendered: "
+ log.error("SVG graphic could not be rendered: "
+ e.getMessage(), e);
}
@@ -345,7 +355,7 @@
//psInfo.pdfState.pop();
gen.writeln("%SVG graphic end ---");
} catch (IOException ioe) {
- context.getUserAgent().getLogger().error("SVG graphic could not be
rendered: "
+ log.error("SVG graphic could not be rendered: "
+ ioe.getMessage(), ioe);
}
}
1.9 +1 -1 xml-fop/src/java/org/apache/fop/svg/PDFImageElementBridge.java
Index: PDFImageElementBridge.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/svg/PDFImageElementBridge.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PDFImageElementBridge.java 31 Mar 2004 10:55:07 -0000 1.8
+++ PDFImageElementBridge.java 12 May 2004 23:19:53 -0000 1.9
@@ -68,7 +68,7 @@
JpegImage jpeg = new JpegImage(ii);
SimpleLog logger = new SimpleLog("FOP/SVG");
logger.setLevel(SimpleLog.LOG_LEVEL_INFO);
- jpeg.load(FopImage.ORIGINAL_DATA, logger);
+ jpeg.load(FopImage.ORIGINAL_DATA);
PDFJpegNode node = new PDFJpegNode(jpeg, origGN);
Rectangle2D imgBounds = getImageBounds(ctx, e);
1.12 +10 -3 xml-fop/src/java/org/apache/fop/svg/SVGUserAgent.java
Index: SVGUserAgent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/svg/SVGUserAgent.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SVGUserAgent.java 31 Mar 2004 10:55:07 -0000 1.11
+++ SVGUserAgent.java 12 May 2004 23:19:53 -0000 1.12
@@ -27,6 +27,10 @@
import java.awt.geom.Dimension2D;
import java.awt.Dimension;
+// Commons-Logging
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* The SVG user agent.
* This is an implementation of the batik svg user agent
@@ -34,18 +38,21 @@
*/
public class SVGUserAgent extends UserAgentAdapter {
private AffineTransform currentTransform = null;
- private Log logger;
private float pixelUnitToMillimeter = 0.0f;
/**
+ * logging instance
+ */
+ private Log logger = LogFactory.getLog(SVGUserAgent.class);
+
+ /**
* Creates a new SVGUserAgent.
* @param log an Commons logging instance
* @param pixelUnitToMM The pixel to millimeter conversion factor
* currently in effect
* @param at the current transform
*/
- public SVGUserAgent(Log log, float pixelUnitToMM, AffineTransform at) {
- logger = log;
+ public SVGUserAgent(float pixelUnitToMM, AffineTransform at) {
pixelUnitToMillimeter = pixelUnitToMM;
currentTransform = at;
}
1.16 +0 -1 xml-fop/src/java/org/apache/fop/tools/AreaTreeBuilder.java
Index: AreaTreeBuilder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/AreaTreeBuilder.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AreaTreeBuilder.java 22 Apr 2004 21:38:41 -0000 1.15
+++ AreaTreeBuilder.java 12 May 2004 23:19:53 -0000 1.16
@@ -163,7 +163,6 @@
org.apache.fop.apps.Document doc = new org.apache.fop.apps.Document(null);
rend.setupFontInfo(doc.getFontInfo());
FOUserAgent ua = new FOUserAgent();
- ua.setLogger(logger);
rend.setUserAgent(ua);
StorePagesModel sm = AreaTree.createStorePagesModel();
1.13 +0 -1 xml-fop/src/java/org/apache/fop/tools/TestConverter.java
Index: TestConverter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/TestConverter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TestConverter.java 31 Mar 2004 10:55:07 -0000 1.12
+++ TestConverter.java 12 May 2004 23:19:53 -0000 1.13
@@ -307,7 +307,6 @@
Driver driver = new Driver();
FOUserAgent userAgent = new FOUserAgent();
- userAgent.setLogger(getLogger());
userAgent.setBaseURL(baseURL);
driver.setUserAgent(userAgent);
if (outputPDF) {
1.14 +0 -1 xml-fop/src/java/org/apache/fop/tools/anttasks/Fop.java
Index: Fop.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/anttasks/Fop.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Fop.java 31 Mar 2004 10:55:07 -0000 1.13
+++ Fop.java 12 May 2004 23:19:53 -0000 1.14
@@ -535,7 +535,6 @@
driver.setLogger(getLogger());
FOUserAgent userAgent = new FOUserAgent();
userAgent.setBaseURL(this.baseURL);
- userAgent.setLogger(getLogger());
driver.setUserAgent(userAgent);
driver.setRenderer(renderer);
driver.setOutputStream(out);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
