You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2002/08/07 18:54:58 UTC
cvs commit: xml-fop/src/org/apache/fop/tools/anttasks Fop.java
jeremias 2002/08/07 09:54:58
Modified: src/org/apache/fop/apps AWTStarter.java
CommandLineOptions.java CommandLineStarter.java
Driver.java LayoutHandler.java Starter.java
StructureHandler.java
src/org/apache/fop/extensions Bookmarks.java Outline.java
src/org/apache/fop/fo ColorProfile.java Declarations.java
FONode.java FOTreeBuilder.java FOUserAgent.java
FObj.java FObjMixed.java Property.java
ToBeImplementedElement.java Unknown.java
XMLObj.java
src/org/apache/fop/fo/flow Block.java ExternalGraphic.java
InstreamForeignObject.java Marker.java
src/org/apache/fop/fo/pagination
ConditionalPageMasterReference.java
PageMasterReference.java PageNumberGenerator.java
PageSequence.java PageSequenceMaster.java
RegionBody.java SimplePageMaster.java
src/org/apache/fop/render AbstractRenderer.java
Renderer.java
src/org/apache/fop/render/pcl PCLRenderer.java
src/org/apache/fop/render/ps PSRenderer.java
src/org/apache/fop/render/svg SVGRenderer.java
src/org/apache/fop/render/txt TXTRenderer.java
src/org/apache/fop/render/xml XMLRenderer.java
src/org/apache/fop/svg SVGElement.java
src/org/apache/fop/tools AreaTreeBuilder.java
TestConverter.java
src/org/apache/fop/tools/anttasks Fop.java
Log:
First batch of changes for preparation for adoption of Avalon patterns. Only changes on logging for now. Mostly usage of LogEnabled contract interface. Separate mail follows.
Revision Changes Path
1.13 +3 -3 xml-fop/src/org/apache/fop/apps/AWTStarter.java
Index: AWTStarter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/AWTStarter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AWTStarter.java 20 Feb 2002 10:29:40 -0000 1.12
+++ AWTStarter.java 7 Aug 2002 16:54:56 -0000 1.13
@@ -94,7 +94,7 @@
public void run() throws FOPException {
Driver driver = new Driver();
- driver.setLogger(log);
+ setupLogger(driver);
if (errorDump) {
driver.setErrorDump(true);
}
@@ -160,7 +160,7 @@
URL url = getClass().getResource(path);
in = url.openStream();
} catch (Exception ex) {
- log.error("Can't find URL to: <" + path + "> "
+ getLogger().error("Can't find URL to: <" + path + "> "
+ ex.getMessage(), ex);
}
return new SecureResourceBundle(in);
1.18 +2 -2 xml-fop/src/org/apache/fop/apps/CommandLineOptions.java
Index: CommandLineOptions.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/CommandLineOptions.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CommandLineOptions.java 14 Jul 2002 15:23:47 -0000 1.17
+++ CommandLineOptions.java 7 Aug 2002 16:54:56 -0000 1.18
@@ -408,7 +408,7 @@
default:
starter = new CommandLineStarter(this);
}
- starter.setLogger(log);
+ starter.enableLogging(log);
return starter;
}
1.18 +3 -3 xml-fop/src/org/apache/fop/apps/CommandLineStarter.java
Index: CommandLineStarter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/CommandLineStarter.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CommandLineStarter.java 14 Jul 2002 15:23:47 -0000 1.17
+++ CommandLineStarter.java 7 Aug 2002 16:54:56 -0000 1.18
@@ -47,13 +47,13 @@
public void run() throws FOPException {
String version = Version.getVersion();
- log.info(version);
+ getLogger().info(version);
XMLReader parser = inputHandler.getParser();
setParserFeatures(parser);
Driver driver = new Driver();
- driver.setLogger(log);
+ setupLogger(driver);
driver.initialize();
if (errorDump) {
1.52 +44 -35 xml-fop/src/org/apache/fop/apps/Driver.java
Index: Driver.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Driver.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Driver.java 14 Jul 2002 15:23:47 -0000 1.51
+++ Driver.java 7 Aug 2002 16:54:56 -0000 1.52
@@ -22,6 +22,8 @@
// Avalon
import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
// DOM
import org.w3c.dom.Document;
@@ -52,6 +54,7 @@
* <PRE>
* Driver driver = new Driver(new InputSource (args[0]),
* new FileOutputStream(args[1]));
+ * driver.enableLogging(myLogger); //optional
* driver.setRenderer(RENDER_PDF);
* driver.run();
* </PRE>
@@ -81,11 +84,12 @@
*
* <PRE>
* Driver driver = new Driver();
+ * driver.enableLogging(myLogger); //optional
* driver.setRenderer(new org.apache.fop.render.awt.AWTRenderer(translator));
* driver.render(parser, fileInputSource(args[0]));
* </PRE>
*/
-public class Driver {
+public class Driver implements LogEnabled {
/**
* Render to PDF. OutputStream must be set
@@ -144,7 +148,7 @@
/**
* the structure handler
- */
+ */
private StructureHandler structHandler;
/**
@@ -170,11 +174,11 @@
/**
* the system resources that FOP will use
*/
- private Logger log;
+ private Logger log = null;
private FOUserAgent userAgent = null;
public static final String getParserClassName() {
- try {
+ try {
return javax.xml.parsers.SAXParserFactory.newInstance().newSAXParser().getXMLReader().getClass().getName();
} catch (javax.xml.parsers.ParserConfigurationException e) {
return null;
@@ -198,7 +202,7 @@
public void initialize() {
_stream = null;
- _treeBuilder = new FOTreeBuilder();
+ _treeBuilder = new FOTreeBuilder();
_treeBuilder.setUserAgent(getUserAgent());
setupDefaultMappings();
}
@@ -210,24 +214,29 @@
private FOUserAgent getUserAgent() {
if(userAgent == null) {
userAgent = new FOUserAgent();
- userAgent.setLogger(getLogger());
+ userAgent.enableLogging(getLogger());
String base = org.apache.fop.configuration.Configuration.getStringValue("baseDir");
userAgent.setBaseURL(base);
}
return userAgent;
}
- public void setLogger(Logger logger) {
- log = logger;
+ public void enableLogging(Logger log) {
+ if (this.log == null) {
+ this.log = log;
+ } else {
+ getLogger().warn("Logger is already set! Won't use the new logger.");
+ }
}
- private Logger getLogger() {
- if(log == null) {
- log = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
- log.error("Logger not set");
- }
- return log;
+ protected Logger getLogger() {
+ if(this.log == null) {
+ this.log = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
+ this.log.error("Logger not set. Using ConsoleLogger as default.");
+ }
+
+ return this.log;
}
/**
@@ -321,42 +330,40 @@
public void setRenderer(int renderer) throws IllegalArgumentException {
switch (renderer) {
case RENDER_PDF:
- setRenderer(new org.apache.fop.render.pdf.PDFRenderer());
+ setRenderer("org.apache.fop.render.pdf.PDFRenderer");
break;
case RENDER_AWT:
throw new IllegalArgumentException("Use renderer form of setRenderer() for AWT");
case RENDER_PRINT:
throw new IllegalArgumentException("Use renderer form of setRenderer() for PRINT");
case RENDER_PCL:
- setRenderer(new org.apache.fop.render.pcl.PCLRenderer());
+ setRenderer("org.apache.fop.render.pcl.PCLRenderer");
break;
case RENDER_PS:
- setRenderer(new org.apache.fop.render.ps.PSRenderer());
+ setRenderer("org.apache.fop.render.ps.PSRenderer");
break;
case RENDER_TXT:
- setRenderer(new org.apache.fop.render.txt.TXTRenderer());
+ setRenderer("org.apache.fop.render.txt.TXTRenderer()");
break;
case RENDER_MIF:
//structHandler = new org.apache.fop.mif.MIFHandler(_stream);
break;
case RENDER_XML:
- setRenderer(new org.apache.fop.render.xml.XMLRenderer());
+ setRenderer("org.apache.fop.render.xml.XMLRenderer");
break;
case RENDER_SVG:
- setRenderer(new org.apache.fop.render.svg.SVGRenderer());
+ setRenderer("org.apache.fop.render.svg.SVGRenderer");
break;
default:
throw new IllegalArgumentException("Unknown renderer type");
}
-
}
/**
- * Set the Renderer to use
- * @param renderer the renderer instance to use
+ * Set the Renderer to use.
+ * @param renderer the renderer instance to use (Note: Logger must be set at this point)
*/
public void setRenderer(Renderer renderer) {
- renderer.setLogger(getLogger());
renderer.setUserAgent(getUserAgent());
_renderer = renderer;
}
@@ -387,6 +394,9 @@
try {
_renderer =
(Renderer)Class.forName(rendererClassName).newInstance();
+ if (_renderer instanceof LogEnabled) {
+ ((LogEnabled)_renderer).enableLogging(getLogger());
+ }
_renderer.setProducer(Version.getVersion());
} catch (ClassNotFoundException e) {
throw new IllegalArgumentException("Could not find "
@@ -457,8 +467,8 @@
} else {
structHandler = new org.apache.fop.mif.MIFHandler(_stream);
}
- structHandler.setLogger(getLogger());
- _treeBuilder.setLogger(getLogger());
+ structHandler.enableLogging(getLogger());
+
_treeBuilder.setUserAgent(getUserAgent());
_treeBuilder.setStructHandler(structHandler);
@@ -511,19 +521,18 @@
*/
public void dumpError(Exception e) {
if (_errorDump) {
- Logger log = getLogger();
if (e instanceof SAXException) {
- log.error("", e);
+ getLogger().error("", e);
if (((SAXException)e).getException() != null) {
- log.error("", ((SAXException)e).getException());
+ getLogger().error("", ((SAXException)e).getException());
}
} else if (e instanceof FOPException) {
e.printStackTrace();
if (((FOPException)e).getException() != null) {
- log.error("", ((FOPException)e).getException());
+ getLogger().error("", ((FOPException)e).getException());
}
} else {
- log.error("", e);
+ getLogger().error("", e);
}
}
}
@@ -575,7 +584,7 @@
}
String serviceFile = "META-INF/services/" + cls.getName();
- // System.out.println("File: " + serviceFile);
+ // getLogger().debug("File: " + serviceFile);
Vector v = (Vector)providerMap.get(serviceFile);
if (v != null)
@@ -594,7 +603,7 @@
while (e.hasMoreElements()) {
try {
java.net.URL u = (java.net.URL)e.nextElement();
- // System.out.println("URL: " + u);
+ //getLogger().debug("URL: " + u);
InputStream is = u.openStream();
Reader r = new InputStreamReader(is, "UTF-8");
@@ -616,7 +625,7 @@
line = br.readLine();
continue;
}
- // System.out.println("Line: " + line);
+ // getLogger().debug("Line: " + line);
// Try and load the class
// Object obj = cl.loadClass(line).newInstance();
1.4 +15 -9 xml-fop/src/org/apache/fop/apps/LayoutHandler.java
Index: LayoutHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/LayoutHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LayoutHandler.java 23 Jul 2002 11:06:50 -0000 1.3
+++ LayoutHandler.java 7 Aug 2002 16:54:56 -0000 1.4
@@ -132,20 +132,26 @@
long memoryNow = runtime.totalMemory() - runtime.freeMemory();
long memoryUsed = (memoryNow - initialMemory) / 1024L;
- log.debug("Initial heap size: " + (initialMemory / 1024L) + "Kb");
- log.debug("Current heap size: " + (memoryNow / 1024L) + "Kb");
- log.debug("Total memory used: " + memoryUsed + "Kb");
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Initial heap size: " + (initialMemory / 1024L) + "Kb");
+ getLogger().debug("Current heap size: " + (memoryNow / 1024L) + "Kb");
+ getLogger().debug("Total memory used: " + memoryUsed + "Kb");
- if (!MEM_PROFILE_WITH_GC) {
- log.debug(" Memory use is indicative; no GC was performed");
- log.debug(" These figures should not be used comparatively");
+ if (!MEM_PROFILE_WITH_GC) {
+ getLogger().debug(" Memory use is indicative; no GC was performed");
+ getLogger().debug(" These figures should not be used comparatively");
+ }
}
long timeUsed = System.currentTimeMillis() - startTime;
- log.debug("Total time used: " + timeUsed + "ms");
- log.debug("Pages rendered: " + pageCount);
- //log.debug("Avg render time: " + (timeUsed / pageCount) + "ms/page");
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Total time used: " + timeUsed + "ms");
+ getLogger().debug("Pages rendered: " + pageCount);
+ if (pageCount > 0) {
+ getLogger().debug("Avg render time: " + (timeUsed / pageCount) + "ms/page");
+ }
+ }
}
public void startPageSequence(PageSequence pageSeq, org.apache.fop.fo.Title seqTitle, LayoutMasterSet lms) {
1.9 +3 -8 xml-fop/src/org/apache/fop/apps/Starter.java
Index: Starter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Starter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Starter.java 11 Apr 2002 09:33:28 -0000 1.8
+++ Starter.java 7 Aug 2002 16:54:56 -0000 1.9
@@ -8,7 +8,7 @@
package org.apache.fop.apps;
// Avalon
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
// SAX
import org.xml.sax.XMLReader;
@@ -23,18 +23,13 @@
* Creates a SAX Parser (defaulting to Xerces).
*
*/
-public abstract class Starter {
+public abstract class Starter extends AbstractLogEnabled {
Options options;
InputHandler inputHandler;
- protected Logger log;
public Starter() throws FOPException {
options = new Options();
- }
-
- public void setLogger(Logger logger) {
- log = logger;
}
public void setInputHandler(InputHandler inputHandler) {
1.4 +6 -8 xml-fop/src/org/apache/fop/apps/StructureHandler.java
Index: StructureHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/StructureHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StructureHandler.java 18 Jul 2002 09:43:20 -0000 1.3
+++ StructureHandler.java 7 Aug 2002 16:54:56 -0000 1.4
@@ -10,7 +10,10 @@
// Java
import java.util.HashSet;
-import org.apache.avalon.framework.logger.Logger;
+// Avalon
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+
+// FOP
import org.apache.fop.fo.pagination.*;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.*;
@@ -23,19 +26,14 @@
* Sub-classes can then implement various methods to handle
* the FO Tree when the SAX events occur.
*/
-public class StructureHandler {
+public class StructureHandler extends AbstractLogEnabled {
/**
The current set of id's in the FO tree
This is used so we know if the FO tree contains duplicates
*/
private HashSet idReferences = new HashSet();
- protected Logger log;
public StructureHandler() {
- }
-
- public void setLogger(Logger logger) {
- log = logger;
}
public HashSet getIDReferences() {
1.4 +2 -2 xml-fop/src/org/apache/fop/extensions/Bookmarks.java
Index: Bookmarks.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/extensions/Bookmarks.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Bookmarks.java 27 May 2002 12:34:19 -0000 1.3
+++ Bookmarks.java 7 Aug 2002 16:54:56 -0000 1.4
@@ -34,7 +34,7 @@
}
public void end() {
- log.debug("adding bookmarks to area tree");
+ getLogger().debug("adding bookmarks to area tree");
data = new BookmarkData();
for(int count = 0; count < outlines.size(); count++) {
Outline out = (Outline)outlines.get(count);
1.8 +3 -3 xml-fop/src/org/apache/fop/extensions/Outline.java
Index: Outline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/extensions/Outline.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Outline.java 17 May 2002 14:47:12 -0000 1.7
+++ Outline.java 7 Aug 2002 16:54:56 -0000 1.8
@@ -31,11 +31,11 @@
externalDestination =
attlist.getValue("external-destination");
if (externalDestination != null &&!externalDestination.equals("")) {
- log.warn("fox:outline external-destination not supported currently.");
+ getLogger().warn("fox:outline external-destination not supported currently.");
}
if (internalDestination == null || internalDestination.equals("")) {
- log.warn("fox:outline requires an internal-destination.");
+ getLogger().warn("fox:outline requires an internal-destination.");
}
}
1.9 +3 -3 xml-fop/src/org/apache/fop/fo/ColorProfile.java
Index: ColorProfile.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/ColorProfile.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ColorProfile.java 22 Nov 2001 07:11:39 -0000 1.8
+++ ColorProfile.java 7 Aug 2002 16:54:56 -0000 1.9
@@ -65,9 +65,9 @@
ICC_Profile iccProfile = ICC_Profile.getInstance(is);
colorSpace = new ICC_ColorSpace(iccProfile);
} catch(IOException ioe) {
- log.error("Could not read Color Profile src", ioe);
+ getLogger().error("Could not read Color Profile src", ioe);
} catch(IllegalArgumentException iae) {
- log.error("Color Profile src not an ICC Profile", iae);
+ getLogger().error("Color Profile src not an ICC Profile", iae);
}
}
}
1.7 +4 -4 xml-fop/src/org/apache/fop/fo/Declarations.java
Index: Declarations.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Declarations.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Declarations.java 15 Nov 2001 10:25:26 -0000 1.6
+++ Declarations.java 7 Aug 2002 16:54:56 -0000 1.7
@@ -45,11 +45,11 @@
}
if(colorProfiles.get(cp.getProfileName()) != null) {
// duplicate names
- log.warn("Duplicate fo:color-profile profile name : " + cp.getProfileName());
+ getLogger().warn("Duplicate fo:color-profile profile name : " + cp.getProfileName());
}
colorProfiles.put(cp.getProfileName(), cp);
} else {
- log.warn("color-profile-name required for color profile");
+ getLogger().warn("color-profile-name required for color profile");
}
} else if(node instanceof XMLObj) {
if(external == null) {
@@ -57,7 +57,7 @@
}
external.add(node);
} else {
- log.warn("invalid element " + node.getName() + "inside declarations");
+ getLogger().warn("invalid element " + node.getName() + "inside declarations");
}
}
children = null;
1.30 +6 -8 xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- FONode.java 20 Jun 2002 09:14:12 -0000 1.29
+++ FONode.java 7 Aug 2002 16:54:56 -0000 1.30
@@ -29,8 +29,6 @@
protected FONode parent;
protected String name;
- protected Logger log;
-
protected FONode(FONode parent) {
this.parent = parent;
}
@@ -39,8 +37,8 @@
name = str;
}
- public void setLogger(Logger logger) {
- log = logger;
+ public Logger getLogger() {
+ return userAgent.getLogger();
}
public void setUserAgent(FOUserAgent ua) {
@@ -97,7 +95,7 @@
* @return A ListIterator.
*/
public ListIterator getChildren() {
- return null;
+ return null;
}
/**
@@ -108,11 +106,11 @@
* this FObj.
*/
public ListIterator getChildren(FONode childNode) {
- return null;
+ return null;
}
public CharIterator charIterator() {
- return new OneCharIterator(CharUtilities.CODE_EOT);
+ return new OneCharIterator(CharUtilities.CODE_EOT);
}
}
1.39 +7 -9 xml-fop/src/org/apache/fop/fo/FOTreeBuilder.java
Index: FOTreeBuilder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FOTreeBuilder.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- FOTreeBuilder.java 20 Jun 2002 09:14:12 -0000 1.38
+++ FOTreeBuilder.java 7 Aug 2002 16:54:56 -0000 1.39
@@ -30,7 +30,7 @@
/**
* SAX Handler that builds the formatting object tree.
- *
+ *
* Modified by Mark Lillywhite mark-fop@inomial.com. Now uses
* StreamRenderer to automagically render the document as
* soon as it receives a page-sequence end-tag. Also,
@@ -70,13 +70,12 @@
* (mark-fop@inomial.com)
*/
private StructureHandler structHandler;
- private Logger log;
private FOUserAgent userAgent;
public FOTreeBuilder() {}
- public void setLogger(Logger logger) {
- log = logger;
+ public Logger getLogger() {
+ return userAgent.getLogger();
}
public void setUserAgent(FOUserAgent ua) {
@@ -129,13 +128,13 @@
public void startDocument()
throws SAXException {
rootFObj = null; // allows FOTreeBuilder to be reused
- log.info("building formatting object tree");
+ getLogger().info("building formatting object tree");
structHandler.startDocument();
}
public void endDocument()
throws SAXException {
- log.info("Parsing of document complete, stopping renderer");
+ getLogger().info("Parsing of document complete, stopping renderer");
structHandler.endDocument();
}
@@ -164,7 +163,7 @@
String fullName = uri + "^" + localName;
if (!this.unknownFOs.containsKey(fullName)) {
this.unknownFOs.put(fullName, "");
- log.warn("Unknown formatting object "
+ getLogger().warn("Unknown formatting object "
+ fullName);
}
if(namespaces.contains(uri.intern())) {
@@ -179,7 +178,6 @@
try {
fobj = fobjMaker.make(currentFObj);
fobj.setName(localName);
- fobj.setLogger(log);
// set the user agent for resolving user agent values
fobj.setUserAgent(userAgent);
// set the stream renderer so that appropriate
1.9 +7 -6 xml-fop/src/org/apache/fop/fo/FOUserAgent.java
Index: FOUserAgent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FOUserAgent.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FOUserAgent.java 11 Apr 2002 09:33:30 -0000 1.8
+++ FOUserAgent.java 7 Aug 2002 16:54:56 -0000 1.9
@@ -10,6 +10,7 @@
import org.apache.fop.render.XMLHandler;
import org.apache.fop.render.RendererContext;
+import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.w3c.dom.*;
@@ -31,13 +32,13 @@
* These areas may contain resolveable areas that will be processed
* with other resolveable areas
*/
-public class FOUserAgent {
+public class FOUserAgent implements LogEnabled {
HashMap defaults = new HashMap();
HashMap handlers = new HashMap();
Logger log;
String base;
- public void setLogger(Logger logger) {
+ public void enableLogging(Logger logger) {
log = logger;
}
@@ -83,7 +84,7 @@
mh.put(ns, handler);
}
- /**
+ /**
* Render the xml document with the given xml namespace.
* The Render Context is by the handle to render into the current
* rendering target.
@@ -104,11 +105,11 @@
handler.handleXML(ctx, doc, namespace);
} catch (Throwable t) {
// could not handle document
- log.error("Could not render XML", t);
+ getLogger().error("Could not render XML", t);
}
} else {
// no handler found for document
- log.debug("No handler defined for XML: " + namespace);
+ getLogger().debug("No handler defined for XML: " + namespace);
}
}
}
1.34 +3 -3 xml-fop/src/org/apache/fop/fo/FObj.java
Index: FObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FObj.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- FObj.java 20 Jun 2002 09:14:12 -0000 1.33
+++ FObj.java 7 Aug 2002 16:54:56 -0000 1.34
@@ -153,7 +153,7 @@
id = str;
idrefs.add(id);
} else {
- log.warn("duplicate id:" + str + " ignored");
+ getLogger().warn("duplicate id:" + str + " ignored");
}
}
}
@@ -348,7 +348,7 @@
if (!markers.containsKey(mcname) && children.isEmpty()) {
markers.put(mcname, marker);
} else {
- log.error("fo:marker must be an initial child," + "and 'marker-class-name' must be unique for same parent");
+ getLogger().error("fo:marker must be an initial child," + "and 'marker-class-name' must be unique for same parent");
throw new FOPException(
"fo:marker must be an initial child," + "and 'marker-class-name' must be unique for same parent");
}
1.28 +7 -7 xml-fop/src/org/apache/fop/fo/FObjMixed.java
Index: FObjMixed.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FObjMixed.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- FObjMixed.java 20 Jun 2002 09:14:12 -0000 1.27
+++ FObjMixed.java 7 Aug 2002 16:54:56 -0000 1.28
@@ -36,7 +36,7 @@
public void addLayoutManager(List lms) {
lms.add(new InlineStackingBPLayoutManager(this,
- new LMiter(children.listIterator())));
+ new LMiter(children.listIterator())));
// set start and end properties for this element, id, etc.
// int numChildren = this.children.size();
// for (int i = 0; i < numChildren; i++) {
@@ -50,14 +50,14 @@
protected void addCharacters(char data[], int start, int length) {
if(textInfo == null) {
- // Really only need one of these, but need to get fontInfo
- // stored in propMgr for later use.
- propMgr.setFontInfo(fontInfo);
- textInfo = propMgr.getTextLayoutProps(fontInfo);
+ // Really only need one of these, but need to get fontInfo
+ // stored in propMgr for later use.
+ propMgr.setFontInfo(fontInfo);
+ textInfo = propMgr.getTextLayoutProps(fontInfo);
}
FOText ft = new FOText(data, start, length, textInfo);
- ft.setLogger(log);
+ ft.setUserAgent(userAgent);
ft.setStructHandler(structHandler);
addChild(ft);
}
1.21 +5 -13 xml-fop/src/org/apache/fop/fo/Property.java
Index: Property.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Property.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Property.java 11 Apr 2002 09:33:30 -0000 1.20
+++ Property.java 7 Aug 2002 16:54:56 -0000 1.21
@@ -15,8 +15,6 @@
import org.apache.fop.apps.FOPException;
import java.util.Vector;
-import org.apache.avalon.framework.logger.Logger;
-
public class Property {
public static class Maker {
@@ -132,7 +130,7 @@
return setSubprop(baseProp, partName, p);
}
} else {
- //log.error("compound property component "
+ //getLogger().error("compound property component "
// + partName + " unknown.");
}
return baseProp;
@@ -223,10 +221,10 @@
}
} catch (FOPException e) {
- //log.error("convertShorthandProperty caught FOPException "
+ //getLogger().error("convertShorthandProperty caught FOPException "
// + e);
} catch (org.apache.fop.fo.expr.PropertyException propEx) {
- //log.error("convertShorthandProperty caught PropertyException "
+ //getLogger().error("convertShorthandProperty caught PropertyException "
// + propEx);
}
if (pret != null) {
@@ -332,7 +330,7 @@
return make(propertyList, specVal,
propertyList.getParentFObj());
} catch (FOPException e) {
- //log.error("Error computing property value for "
+ //getLogger()error("Error computing property value for "
// + propName + " from "
// + specVal);
return null;
@@ -358,12 +356,6 @@
* specified values.
*/
private String specVal;
-
- protected Logger log;
-
- public void setLogger(Logger logger) {
- log = logger;
- }
/**
* Set the original value specified for the property attribute.
1.7 +2 -2 xml-fop/src/org/apache/fop/fo/ToBeImplementedElement.java
Index: ToBeImplementedElement.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/ToBeImplementedElement.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ToBeImplementedElement.java 20 Jun 2002 09:14:12 -0000 1.6
+++ ToBeImplementedElement.java 7 Aug 2002 16:54:56 -0000 1.7
@@ -22,7 +22,7 @@
}
public void setup() {
- log.debug("This element \"" + this.name
+ getLogger().debug("This element \"" + this.name
+ "\" is not yet implemented.");
}
1.6 +2 -2 xml-fop/src/org/apache/fop/fo/Unknown.java
Index: Unknown.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Unknown.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Unknown.java 20 Jun 2002 09:14:12 -0000 1.5
+++ Unknown.java 7 Aug 2002 16:54:56 -0000 1.6
@@ -33,6 +33,6 @@
}
public void setup() {
- log.debug("Layout Unknown element");
+ getLogger().debug("Layout Unknown element");
}
}
1.12 +2 -2 xml-fop/src/org/apache/fop/fo/XMLObj.java
Index: XMLObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/XMLObj.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XMLObj.java 9 Jul 2002 09:43:14 -0000 1.11
+++ XMLObj.java 7 Aug 2002 16:54:56 -0000 1.12
@@ -138,7 +138,7 @@
// in theory someone might want to embed some defined
// xml (eg. fo) inside the foreign xml
// they could use a different namespace
- log.debug("Invalid element: " + child.getName() + " inside foreign xml markup");
+ getLogger().debug("Invalid element: " + child.getName() + " inside foreign xml markup");
}
}
1.59 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- Block.java 20 Jun 2002 09:14:12 -0000 1.58
+++ Block.java 7 Aug 2002 16:54:57 -0000 1.59
@@ -221,7 +221,7 @@
}
private void handleWhiteSpace() {
- log.debug("fo:block: handleWhiteSpace");
+ getLogger().debug("fo:block: handleWhiteSpace");
if (firstInlineChild != null) {
boolean bInWS = false;
boolean bPrevWasLF = false;
1.25 +4 -4 xml-fop/src/org/apache/fop/fo/flow/ExternalGraphic.java
Index: ExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ExternalGraphic.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ExternalGraphic.java 5 Jul 2002 09:21:47 -0000 1.24
+++ ExternalGraphic.java 7 Aug 2002 16:54:57 -0000 1.25
@@ -143,7 +143,7 @@
cheight = (int)(fopimage.getHeight() * 1000);
}
if(scaling == Scaling.UNIFORM) {
- // adjust the larger
+ // adjust the larger
double rat1 = cwidth / (fopimage.getWidth() * 1000f);
double rat2 = cheight / (fopimage.getHeight() * 1000f);
if(rat1 < rat2) {
@@ -167,7 +167,7 @@
if(overflow == Overflow.HIDDEN) {
clip = true;
} else if(overflow == Overflow.ERROR_IF_OVERFLOW) {
- log.error("Image: " + url + " overflows the viewport");
+ getLogger().error("Image: " + url + " overflows the viewport");
clip = true;
}
}
@@ -208,7 +208,7 @@
// Common Accessibility Properties
AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
- // Common Aural Properties
+ // Common Aural Properties
AuralProps mAurProps = propMgr.getAuralProps();
// Common Border, Padding, and Background Properties
1.30 +5 -5 xml-fop/src/org/apache/fop/fo/flow/InstreamForeignObject.java
Index: InstreamForeignObject.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/InstreamForeignObject.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- InstreamForeignObject.java 23 Jul 2002 11:01:59 -0000 1.29
+++ InstreamForeignObject.java 7 Aug 2002 16:54:57 -0000 1.30
@@ -157,7 +157,7 @@
}
} else {*/
cheight = len.mvalue();
- }
+ }
Point2D csize = new Point2D.Float(cwidth == -1 ? -1 : cwidth / 1000f, cheight == -1 ? -1 : cheight / 1000f);
Point2D size = child.getDimension(csize);
@@ -197,7 +197,7 @@
if(overflow == Overflow.HIDDEN) {
clip = true;
} else if(overflow == Overflow.ERROR_IF_OVERFLOW) {
- log.error("Instream foreign object overflows the viewport");
+ getLogger().error("Instream foreign object overflows the viewport");
clip = true;
}
}
@@ -262,7 +262,7 @@
// Common Accessibility Properties
AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
-
+
// Common Aural Properties
AuralProps mAurProps = propMgr.getAuralProps();
@@ -285,7 +285,7 @@
// this.properties.get("content-width");
// this.properties.get("display-align");
// this.properties.get("dominant-baseline");
- // this.properties.get("height");
+ // this.properties.get("height");
setupID();
// this.properties.get("inline-progression-dimension");
// this.properties.get("keep-with-next");
1.11 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Marker.java
Index: Marker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Marker.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Marker.java 20 Jun 2002 09:14:13 -0000 1.10
+++ Marker.java 7 Aug 2002 16:54:57 -0000 1.11
@@ -36,7 +36,7 @@
try {
((FObj)parent).addMarker(this);
} catch (FOPException fopex) {
- log.error("marker cannot be added to '" + parent
+ getLogger().error("marker cannot be added to '" + parent
+ "'");
}
}
1.10 +3 -3 xml-fop/src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
Index: ConditionalPageMasterReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ConditionalPageMasterReference.java 11 Dec 2001 12:26:15 -0000 1.9
+++ ConditionalPageMasterReference.java 7 Aug 2002 16:54:57 -0000 1.10
@@ -75,7 +75,7 @@
break;
case PagePosition.LAST:
// how the hell do you know at this point?
- log.debug("LAST PagePosition NYI");
+ getLogger().warn("LAST PagePosition NYI");
okOnPagePosition = true;
break;
case PagePosition.REST:
@@ -147,7 +147,7 @@
(RepeatablePageMasterAlternatives)parent;
if (getMasterName() == null) {
- log.warn("single-page-master-reference"
+ getLogger().warn("single-page-master-reference"
+ "does not have a master-name and so is being ignored");
} else {
this.repeatablePageMasterAlternatives.addConditionalPageMasterReference(this);
1.9 +2 -2 xml-fop/src/org/apache/fop/fo/pagination/PageMasterReference.java
Index: PageMasterReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageMasterReference.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PageMasterReference.java 15 Nov 2001 12:40:31 -0000 1.8
+++ PageMasterReference.java 7 Aug 2002 16:54:57 -0000 1.9
@@ -68,7 +68,7 @@
_pageSequenceMaster = (PageSequenceMaster)parent;
if (getMasterName() == null) {
- log.warn("" + getName()
+ getLogger().warn("" + getName()
+ " does not have a master-reference and so is being ignored");
} else {
_pageSequenceMaster.addSubsequenceSpecifier(this);
1.5 +5 -11 xml-fop/src/org/apache/fop/fo/pagination/PageNumberGenerator.java
Index: PageNumberGenerator.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageNumberGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PageNumberGenerator.java 11 Apr 2002 09:33:30 -0000 1.4
+++ PageNumberGenerator.java 7 Aug 2002 16:54:57 -0000 1.5
@@ -11,7 +11,7 @@
import org.apache.fop.fo.properties.*;
// Avalon
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
// Java
import java.util.*;
@@ -21,7 +21,7 @@
* and 'letterValue' properties on fo:page-sequence to return a String
* corresponding to the supplied integer page number.
*/
-public class PageNumberGenerator {
+public class PageNumberGenerator extends AbstractLogEnabled {
private String format;
private char groupingSeparator;
@@ -44,8 +44,6 @@
"", "0", "00", "000", "0000", "00000"
};
- private Logger log;
-
public PageNumberGenerator(String format, char groupingSeparator,
int groupingSize, int letterValue) {
this.format = format;
@@ -70,7 +68,7 @@
formatType = UPPERROMAN;
} else {
// token not handled
- //log.debug("'format' token not recognized; using '1'");
+ //getLogger().debug("'format' token not recognized; using '1'");
formatType = DECIMAL;
minPadding = 0;
}
@@ -80,7 +78,7 @@
// loop
for (int i = 0; i < fmtLen - 1; i++) {
if (format.charAt(i) != '0') {
- //log.debug("'format' token not recognized; using '1'");
+ //getLogger().debug("'format' token not recognized; using '1'");
formatType = DECIMAL;
minPadding = 0;
} else {
@@ -88,10 +86,6 @@
}
}
}
- }
-
- public void setLogger(Logger logger) {
- log = logger;
}
public String makeFormattedPageNumber(int number) {
1.53 +101 -105 xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- PageSequence.java 18 Jul 2002 09:43:20 -0000 1.52
+++ PageSequence.java 7 Aug 2002 16:54:57 -0000 1.53
@@ -180,9 +180,9 @@
masterName = this.properties.get("master-reference").getString();
- // TODO: Add code here to set a reference to the PageSequenceMaster
- // if the masterName names a page-sequence-master, else get a
- // reference to the SimplePageMaster. Throw an exception if neither?
+ // TODO: Add code here to set a reference to the PageSequenceMaster
+ // if the masterName names a page-sequence-master, else get a
+ // reference to the SimplePageMaster. Throw an exception if neither?
// get the 'format' properties
this.pageNumberGenerator =
@@ -190,6 +190,7 @@
this.properties.get("grouping-separator").getCharacter(),
this.properties.get("grouping-size").getNumber().intValue(),
this.properties.get("letter-value").getEnum());
+ this.pageNumberGenerator.enableLogging(getLogger());
this.forcePageCount =
this.properties.get("force-page-count").getEnum();
@@ -211,7 +212,7 @@
throw new FOPException("flow-names must be unique within an fo:page-sequence");
}
if (!this.layoutMasterSet.regionNameExists(flow.getFlowName())) {
- log.error("region-name '"
+ getLogger().error("region-name '"
+ flow.getFlowName()
+ "' doesn't exist in the layout-master-set.");
}
@@ -228,64 +229,59 @@
* @param child The flow object child to be added to the PageSequence.
*/
public void addChild(FONode child) {
- try {
- String childName = child.getName();
- if (childName.equals("fo:title")) {
- if (this._flowMap.size()>0) {
- log.warn("fo:title should be first in page-sequence");
- } else {
- this.titleFO = (Title)child;
- structHandler.startPageSequence(this, titleFO, layoutMasterSet);
- sequenceStarted = true;
- }
- }
- else if (childName.equals("fo:flow")) {
- if (this.mainFlow != null) {
- throw new FOPException("Only a single fo:flow permitted"
- + " per fo:page-sequence");
- }
- else {
- if(!sequenceStarted) {
+ try {
+ String childName = child.getName();
+ if (childName.equals("fo:title")) {
+ if (this._flowMap.size()>0) {
+ getLogger().warn("fo:title should be first in page-sequence");
+ } else {
+ this.titleFO = (Title)child;
+ structHandler.startPageSequence(this, titleFO, layoutMasterSet);
+ sequenceStarted = true;
+ }
+ } else if (childName.equals("fo:flow")) {
+ if (this.mainFlow != null) {
+ throw new FOPException("Only a single fo:flow permitted"
+ + " per fo:page-sequence");
+ } else {
+ if(!sequenceStarted) {
structHandler.startPageSequence(this, titleFO, layoutMasterSet);
sequenceStarted = true;
}
- this.mainFlow = (Flow)child;
- addFlow(mainFlow);
- super.addChild(child); // For getChildren
- }
- }
- else if (childName.equals("fo:static-content")) {
- if (this.mainFlow != null) {
- throw new FOPException(childName +
- " must precede fo:flow; ignoring");
- }
- else {
+ this.mainFlow = (Flow)child;
+ addFlow(mainFlow);
+ super.addChild(child); // For getChildren
+ }
+ } else if (childName.equals("fo:static-content")) {
+ if (this.mainFlow != null) {
+ throw new FOPException(childName +
+ " must precede fo:flow; ignoring");
+ } else {
if(!sequenceStarted) {
structHandler.startPageSequence(this, titleFO, layoutMasterSet);
sequenceStarted = true;
}
- addFlow((Flow)child);
- }
- }
- else {
- // Ignore it!
- log.warn("FO '" + childName +
- "' not a legal page-sequence child.");
- return;
- }
- } catch (FOPException fopex) {
- log.error("Error in PageSequence.addChild(): " +
- fopex.getMessage());
- }
+ addFlow((Flow)child);
+ }
+ } else {
+ // Ignore it!
+ getLogger().warn("FO '" + childName +
+ "' not a legal page-sequence child.");
+ return;
+ }
+ } catch (FOPException fopex) {
+ getLogger().error("Error in PageSequence.addChild(): " +
+ fopex.getMessage(), fopex);
+ }
}
public void end() {
- try {
- this.structHandler.endPageSequence(this);
- } catch (FOPException fopex) {
- log.error("Error in PageSequence.end(): " +
- fopex.getMessage());
- }
+ try {
+ this.structHandler.endPageSequence(this);
+ } catch (FOPException fopex) {
+ getLogger().error("Error in PageSequence.end(): " +
+ fopex.getMessage(), fopex);
+ }
}
@@ -315,22 +311,22 @@
* Runs the formatting of this page sequence into the given area tree
*/
public void format(AreaTree areaTree) throws FOPException {
- // Make a new PageLayoutManager and a FlowLayoutManager
- // Run the PLM in a thread
- // Wait for them to finish.
-
- // If no main flow, nothing to layout!
- if (this.mainFlow == null) return;
+ // Make a new PageLayoutManager and a FlowLayoutManager
+ // Run the PLM in a thread
+ // Wait for them to finish.
+
+ // If no main flow, nothing to layout!
+ if (this.mainFlow == null) return;
- // Initialize if already used?
+ // Initialize if already used?
this.layoutMasterSet.resetPageMasters();
int firstAvailPageNumber = 0;
- // This will layout pages and add them to the area tree
- PageLayoutManager pageLM = new PageLayoutManager(areaTree, this);
- // For now, skip the threading and just call run directly.
- pageLM.run();
+ // This will layout pages and add them to the area tree
+ PageLayoutManager pageLM = new PageLayoutManager(areaTree, this);
+ // For now, skip the threading and just call run directly.
+ pageLM.run();
// Thread layoutThread = new Thread(pageLM);
// layoutThread.start();
@@ -343,30 +339,30 @@
// } catch (InterruptedException ie) {
// log.error("PageSequence.format() interrupted waiting on layout");
// }
- // Tell the root the last page number we created.
- this.root.setRunningPageNumberCounter(this.currentPageNumber);
+ // Tell the root the last page number we created.
+ this.root.setRunningPageNumberCounter(this.currentPageNumber);
}
private void initPageNumber() {
- this.currentPageNumber = this.root.getRunningPageNumberCounter() + 1;
+ this.currentPageNumber = this.root.getRunningPageNumberCounter() + 1;
- if (this.pageNumberType == AUTO_ODD) {
- // Next page but force odd. May force empty page creation!
- // Whose master is used for this??? Assume no.
- // Use force-page-count=auto
- // on preceding page-sequence to make sure that there is no gap!
- if (currentPageNumber % 2 == 0) {
- this.currentPageNumber++;
- }
- } else if (pageNumberType == AUTO_EVEN) {
- if (currentPageNumber % 2 == 1) {
- this.currentPageNumber++;
- }
- }
- else if (pageNumberType == EXPLICIT) {
- this.currentPageNumber = this.explicitFirstNumber;
- }
- this.firstPageNumber = this.currentPageNumber;
+ if (this.pageNumberType == AUTO_ODD) {
+ // Next page but force odd. May force empty page creation!
+ // Whose master is used for this??? Assume no.
+ // Use force-page-count=auto
+ // on preceding page-sequence to make sure that there is no gap!
+ if (currentPageNumber % 2 == 0) {
+ this.currentPageNumber++;
+ }
+ } else if (pageNumberType == AUTO_EVEN) {
+ if (currentPageNumber % 2 == 1) {
+ this.currentPageNumber++;
+ }
+ }
+ else if (pageNumberType == EXPLICIT) {
+ this.currentPageNumber = this.explicitFirstNumber;
+ }
+ this.firstPageNumber = this.currentPageNumber;
}
/**
@@ -376,22 +372,22 @@
* @param bIsBlank If true, use a master for a blank page.
* @param bIsLast If true, use the master for the last page in the sequence.
*/
- public PageViewport createPage(boolean bIsBlank, boolean bIsLast)
- throws FOPException
+ public PageViewport createPage(boolean bIsBlank, boolean bIsLast)
+ throws FOPException
{
- // Set even/odd flag and first flag based on current state
- // Should do it this way, but fix it later....
- /*boolean bEvenPage = ((this.currentPageNumber %2)==0);
- currentPage = makePage(bEvenPage, */
- currentPage = makePage(this.currentPageNumber,
- this.currentPageNumber==this.firstPageNumber,
- bIsLast, bIsBlank);
- return currentPage;
- // The page will have a viewport/reference area pair defined
- // for each region in the master.
- // Set up the page itself
- // currentPage.setNumber(this.currentPageNumber);
+ // Set even/odd flag and first flag based on current state
+ // Should do it this way, but fix it later....
+ /*boolean bEvenPage = ((this.currentPageNumber %2)==0);
+ currentPage = makePage(bEvenPage, */
+ currentPage = makePage(this.currentPageNumber,
+ this.currentPageNumber==this.firstPageNumber,
+ bIsLast, bIsBlank);
+ return currentPage;
+ // The page will have a viewport/reference area pair defined
+ // for each region in the master.
+ // Set up the page itself
+ // currentPage.setNumber(this.currentPageNumber);
// SKIP ALL THIS FOR NOW!!!
// String formattedPageNumber =
// pageNumberGenerator.makeFormattedPageNumber(this.currentPageNumber);
@@ -412,7 +408,7 @@
// this.pageCount++; // used for 'force-page-count' calculations
// handle the 'force-page-count'
- //forcePage(areaTree, firstAvailPageNumber);
+ //forcePage(areaTree, firstAvailPageNumber);
}
/**
@@ -422,13 +418,13 @@
* @param isFirstPage true when this is the first page in the sequence
* @param isEmptyPage true if this page will be empty
* (e.g. forced even or odd break)
- * @return a Page layout object based on the page master selected
+ * @return a Page layout object based on the page master selected
* from the params
* TODO: modify the other methods to use even/odd flag and bIsLast
*/
private PageViewport makePage(int firstAvailPageNumber,
- boolean isFirstPage, boolean bIsLast,
- boolean isEmptyPage) throws FOPException {
+ boolean isFirstPage, boolean bIsLast,
+ boolean isEmptyPage) throws FOPException {
// layout this page sequence
// while there is still stuff in the flow, ask the
@@ -441,7 +437,7 @@
// a legal alternative is to use the last sub-sequence
// specification which should be handled in getNextSubsequence.
- // That's not done here.
+ // That's not done here.
if (pageMaster == null) {
throw new FOPException("page masters exhausted. Cannot recover.");
}
@@ -587,7 +583,7 @@
SubSequenceSpecifier nextSubsequence =
getNextSubsequence(sequenceMaster);
if (nextSubsequence == null) {
- log.error("Page subsequences exhausted. Using previous subsequence.");
+ getLogger().error("Page subsequences exhausted. Using previous subsequence.");
thisIsFirstPage =
true; // this becomes the first page in the new (old really) page master
currentSubsequence.reset();
@@ -679,7 +675,7 @@
// } else {
-// System.out.println("flow is null. regionClass = '" + regionClass
+// getLogger().error("flow is null. regionClass = '" + regionClass
// + "' currentSPM = "
// + getCurrentSimplePageMaster());
1.10 +2 -2 xml-fop/src/org/apache/fop/fo/pagination/PageSequenceMaster.java
Index: PageSequenceMaster.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequenceMaster.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PageSequenceMaster.java 15 Nov 2001 12:40:31 -0000 1.9
+++ PageSequenceMaster.java 7 Aug 2002 16:54:57 -0000 1.10
@@ -47,7 +47,7 @@
this.layoutMasterSet = (LayoutMasterSet)parent;
String pm = this.properties.get("master-name").getString();
if (pm == null) {
- log.warn("page-sequence-master does not have "
+ getLogger().warn("page-sequence-master does not have "
+ "a master-name and so is being ignored");
} else {
this.layoutMasterSet.addPageSequenceMaster(pm, this);
1.18 +30 -30 xml-fop/src/org/apache/fop/fo/pagination/RegionBody.java
Index: RegionBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionBody.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- RegionBody.java 23 Feb 2002 16:50:58 -0000 1.17
+++ RegionBody.java 7 Aug 2002 16:54:57 -0000 1.18
@@ -34,20 +34,20 @@
protected Rectangle getViewportRectangle (FODimension reldims)
{
- /*
- * Use space-before and space-after which will use corresponding
- * absolute margin properties if specified. For indents:
- * try to get corresponding absolute margin property using the
- * writing-mode on the page (not on the region-body!). If that's not
- * set but indent is explicitly set, it will return that.
- */
+ /*
+ * Use space-before and space-after which will use corresponding
+ * absolute margin properties if specified. For indents:
+ * try to get corresponding absolute margin property using the
+ * writing-mode on the page (not on the region-body!). If that's not
+ * set but indent is explicitly set, it will return that.
+ */
MarginProps mProps = propMgr.getMarginProps();
- int start = getRelMargin(PropertyList.START, "start-indent");
- return new Rectangle( start, mProps.spaceBefore,
- reldims.ipd - start -
- getRelMargin(PropertyList.END, "end-indent"),
- reldims.bpd - mProps.spaceBefore -
- mProps.spaceAfter);
+ int start = getRelMargin(PropertyList.START, "start-indent");
+ return new Rectangle( start, mProps.spaceBefore,
+ reldims.ipd - start -
+ getRelMargin(PropertyList.END, "end-indent"),
+ reldims.bpd - mProps.spaceBefore -
+ mProps.spaceAfter);
}
/**
@@ -55,18 +55,18 @@
* writing mode.
*/
private int getRelMargin(int reldir, String sRelPropName) {
- FObj parent = (FObj) getParent();
- String sPropName = "margin-" +
- parent.properties.wmRelToAbs(reldir);
- Property prop = properties.getExplicitBaseProp(sPropName);
- if (prop == null) {
- prop = properties.getExplicitBaseProp(sRelPropName);
- }
- return ((prop != null)? prop.getLength().mvalue() : 0);
+ FObj parent = (FObj) getParent();
+ String sPropName = "margin-" +
+ parent.properties.wmRelToAbs(reldir);
+ Property prop = properties.getExplicitBaseProp(sPropName);
+ if (prop == null) {
+ prop = properties.getExplicitBaseProp(sRelPropName);
+ }
+ return ((prop != null)? prop.getLength().mvalue() : 0);
}
protected void setRegionTraits(RegionReference r, Rectangle2D absRegVPRect) {
- super.setRegionTraits(r, absRegVPRect);
+ super.setRegionTraits(r, absRegVPRect);
// r.setBackgroundColor(backgroundColor);
}
@@ -88,24 +88,24 @@
* Override the inherited method.
*/
public RegionReference makeRegionReferenceArea(Rectangle2D absRegVPRect) {
- // Should set some column stuff here I think, or put it elsewhere
- BodyRegion body = new BodyRegion();
- setRegionTraits(body, absRegVPRect);
+ // Should set some column stuff here I think, or put it elsewhere
+ BodyRegion body = new BodyRegion();
+ setRegionTraits(body, absRegVPRect);
int columnCount=
this.properties.get("column-count").getNumber().intValue();
if ((columnCount > 1) && (overflow == Overflow.SCROLL)) {
// recover by setting 'column-count' to 1. This is allowed but
// not required by the spec.
- log.error("Setting 'column-count' to 1 because "
+ getLogger().error("Setting 'column-count' to 1 because "
+ "'overflow' is set to 'scroll'");
columnCount = 1;
}
- body.setColumnCount(columnCount);
+ body.setColumnCount(columnCount);
int columnGap =
this.properties.get("column-gap").getLength().mvalue();
- body.setColumnGap(columnGap);
- return body;
+ body.setColumnGap(columnGap);
+ return body;
}
}
1.25 +37 -38 xml-fop/src/org/apache/fop/fo/pagination/SimplePageMaster.java
Index: SimplePageMaster.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/SimplePageMaster.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- SimplePageMaster.java 23 Feb 2002 16:50:58 -0000 1.24
+++ SimplePageMaster.java 7 Aug 2002 16:54:57 -0000 1.25
@@ -51,7 +51,7 @@
LayoutMasterSet layoutMasterSet = (LayoutMasterSet)parent;
masterName = this.properties.get("master-name").getString();
if (masterName == null) {
- log.warn("simple-page-master does not have "
+ getLogger().warn("simple-page-master does not have "
+ "a master-name and so is being ignored");
} else {
layoutMasterSet.addSimplePageMaster(this);
@@ -79,48 +79,48 @@
// Get absolute margin properties (top, left, bottom, right)
MarginProps mProps = propMgr.getMarginProps();
- /* Create the page reference area rectangle in first quadrant coordinates
- * (ie, 0,0 is at bottom,left of the "page media" and y increases
- * when moving towards the top of the page.
- * The media rectangle itself is (0,0,pageWidth,pageHeight).
- */
- Rectangle pageRefRect =
- new Rectangle(mProps.marginLeft, mProps.marginTop,
- pageWidth - mProps.marginLeft - mProps.marginRight,
- pageHeight - mProps.marginTop - mProps.marginBottom);
+ /* Create the page reference area rectangle in first quadrant coordinates
+ * (ie, 0,0 is at bottom,left of the "page media" and y increases
+ * when moving towards the top of the page.
+ * The media rectangle itself is (0,0,pageWidth,pageHeight).
+ */
+ Rectangle pageRefRect =
+ new Rectangle(mProps.marginLeft, mProps.marginTop,
+ pageWidth - mProps.marginLeft - mProps.marginRight,
+ pageHeight - mProps.marginTop - mProps.marginBottom);
- // ??? KL shouldn't this take the viewport too???
- Page page = new Page(); // page reference area
+ // ??? KL shouldn't this take the viewport too???
+ Page page = new Page(); // page reference area
// Set up the CTM on the page reference area based on writing-mode
// and reference-orientation
- FODimension reldims=new FODimension(0,0);
- CTM pageCTM = propMgr.getCTMandRelDims(pageRefRect, reldims);
+ FODimension reldims=new FODimension(0,0);
+ CTM pageCTM = propMgr.getCTMandRelDims(pageRefRect, reldims);
- // Create a RegionViewport/ reference area pair for each page region
+ // Create a RegionViewport/ reference area pair for each page region
- boolean bHasBody=false;
+ boolean bHasBody=false;
for (Iterator regenum = _regions.values().iterator();
regenum.hasNext(); ) {
Region r = (Region)regenum.next();
- RegionViewport rvp = r.makeRegionViewport(reldims, pageCTM);
- rvp.setRegion(r.makeRegionReferenceArea(rvp.getViewArea()));
- page.setRegion(r.getRegionAreaClass(), rvp);
- if (r.getRegionAreaClass() == RegionReference.BODY) {
- bHasBody = true;
- }
+ RegionViewport rvp = r.makeRegionViewport(reldims, pageCTM);
+ rvp.setRegion(r.makeRegionReferenceArea(rvp.getViewArea()));
+ page.setRegion(r.getRegionAreaClass(), rvp);
+ if (r.getRegionAreaClass() == RegionReference.BODY) {
+ bHasBody = true;
+ }
}
- if (!bHasBody) {
- log.error("simple-page-master has no region-body");
+ if (!bHasBody) {
+ getLogger().error("simple-page-master has no region-body");
}
- this.pageMaster = new PageMaster(new PageViewport(page,
- new Rectangle(0,0,
- pageWidth,pageHeight)));
+ this.pageMaster = new PageMaster(new PageViewport(page,
+ new Rectangle(0,0,
+ pageWidth,pageHeight)));
- // _regions = null; // PageSequence access SimplePageMaster....
+ // _regions = null; // PageSequence access SimplePageMaster....
children = null;
properties = null;
}
@@ -142,19 +142,18 @@
}
protected void addChild(FONode child) {
- if (child instanceof Region) {
- addRegion((Region)child);
- }
- else {
- log.error("SimplePageMaster cannot have child of type " +
- child.getName());
- }
+ if (child instanceof Region) {
+ addRegion((Region)child);
+ } else {
+ getLogger().error("SimplePageMaster cannot have child of type " +
+ child.getName());
+ }
}
protected void addRegion(Region region) {
- String key = region.getRegionClass();
+ String key = region.getRegionClass();
if (_regions.containsKey(key)) {
- log.error("Only one region of class "
+ getLogger().error("Only one region of class "
+ key
+ " allowed within a simple-page-master.");
// throw new FOPException("Only one region of class "
1.18 +10 -15 xml-fop/src/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AbstractRenderer.java 4 Jul 2002 14:08:20 -0000 1.17
+++ AbstractRenderer.java 7 Aug 2002 16:54:57 -0000 1.18
@@ -15,7 +15,7 @@
import org.apache.fop.fo.FOUserAgent;
// Avalon
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
// Java
import java.awt.geom.Rectangle2D;
@@ -32,8 +32,7 @@
* viewports. This keeps track of the current block and inline
* position.
*/
-public abstract class AbstractRenderer implements Renderer {
- protected Logger log;
+public abstract class AbstractRenderer extends AbstractLogEnabled implements Renderer {
protected FOUserAgent userAgent;
protected HashMap options;
@@ -45,10 +44,6 @@
protected int currentBlockIPPosition = 0;
- public void setLogger(Logger logger) {
- log = logger;
- }
-
public void setUserAgent(FOUserAgent agent) {
userAgent = agent;
}
@@ -133,21 +128,21 @@
protected void renderRegionViewport(RegionViewport port) {
if (port != null) {
Rectangle2D view = port.getViewArea();
- // The CTM will transform coordinates relative to
- // this region-reference area into page coords, so
- // set origin for the region to 0,0.
+ // The CTM will transform coordinates relative to
+ // this region-reference area into page coords, so
+ // set origin for the region to 0,0.
currentBPPosition = 0; // (int) (view.getY() / 1000);
currentIPPosition = 0; // (int) (view.getX() / 1000);
currentBlockIPPosition = currentIPPosition;
RegionReference region = port.getRegion();
- startVParea(region.getCTM());
+ startVParea(region.getCTM());
if (region.getRegionClass() == RegionReference.BODY) {
renderBodyRegion((BodyRegion) region);
} else {
renderRegion(region);
}
- endVParea();
+ endVParea();
}
}
@@ -310,8 +305,8 @@
public void renderInlineParent(InlineParent ip) {
// currentBlockIPPosition += ip.getWidth();
- Iterator iter = ip.getChildAreas().iterator();
- while (iter.hasNext()) {
+ Iterator iter = ip.getChildAreas().iterator();
+ while (iter.hasNext()) {
((InlineArea)iter.next()).render(this);
}
}
1.26 +4 -9 xml-fop/src/org/apache/fop/render/Renderer.java
Index: Renderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/Renderer.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Renderer.java 10 May 2002 12:38:15 -0000 1.25
+++ Renderer.java 7 Aug 2002 16:54:57 -0000 1.26
@@ -13,9 +13,6 @@
import org.apache.fop.layout.FontInfo;
import org.apache.fop.fo.FOUserAgent;
-// Avalon
-import org.apache.avalon.framework.logger.Logger;
-
// Java
import java.io.OutputStream;
import java.io.IOException;
@@ -32,14 +29,12 @@
*/
public interface Renderer {
+ public static final String ROLE = Renderer.class.getName();
+
+
public void startRenderer(OutputStream outputStream) throws IOException;
public void stopRenderer() throws IOException;
-
- /**
- * Set the logger
- */
- public void setLogger(Logger logger);
/**
* Set the User Agent
1.17 +2 -2 xml-fop/src/org/apache/fop/render/pcl/PCLRenderer.java
Index: PCLRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pcl/PCLRenderer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- PCLRenderer.java 21 Jun 2002 14:03:42 -0000 1.16
+++ PCLRenderer.java 7 Aug 2002 16:54:57 -0000 1.17
@@ -162,7 +162,7 @@
public void startRenderer(OutputStream outputStream)
throws IOException {
- log.info("rendering areas to PCL");
+ getLogger().info("rendering areas to PCL");
currentStream = new PCLStream(outputStream);
// Set orientation.
1.25 +5 -5 xml-fop/src/org/apache/fop/render/ps/PSRenderer.java
Index: PSRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/ps/PSRenderer.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- PSRenderer.java 31 Jul 2002 08:20:40 -0000 1.24
+++ PSRenderer.java 7 Aug 2002 16:54:58 -0000 1.25
@@ -289,7 +289,7 @@
*/
public void startRenderer(OutputStream outputStream)
throws IOException {
- log.debug("rendering areas to PostScript");
+ getLogger().debug("rendering areas to PostScript");
this.out = new PSStream(outputStream);
write("%!PS-Adobe-3.0");
@@ -307,7 +307,7 @@
/* Write proc for including EPS */
write("%%BeginResource: procset EPSprocs");
write("%%Title: EPS encapsulation procs");
-
+
write("/BeginEPSF { %def");
write("/b4_Inc_state save def % Save state for cleanup");
write("/dict_count countdictstack def % Count objects on dict stack");
@@ -324,14 +324,14 @@
write("} if");
write("} if");
write("} bind def");
-
+
write("/EndEPSF { %def");
write("count op_count sub {pop} repeat % Clean up stacks");
write("countdictstack dict_count sub {end} repeat");
write("b4_Inc_state restore");
write("} bind def");
write("%%EndResource");
-
+
write("%%EndSetup");
write("FOPFonts begin");
}
1.8 +2 -2 xml-fop/src/org/apache/fop/render/svg/SVGRenderer.java
Index: SVGRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/svg/SVGRenderer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SVGRenderer.java 9 Jul 2002 09:43:14 -0000 1.7
+++ SVGRenderer.java 7 Aug 2002 16:54:58 -0000 1.8
@@ -161,7 +161,7 @@
try {
svgT.transcode(input, output);
} catch (TranscoderException e) {
- log.error("could not write svg file :" + e.getMessage(), e);
+ getLogger().error("could not write svg file :" + e.getMessage(), e);
}
ostream.flush();
ostream = null;
1.17 +4 -4 xml-fop/src/org/apache/fop/render/txt/TXTRenderer.java
Index: TXTRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/txt/TXTRenderer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TXTRenderer.java 21 Jun 2002 14:03:42 -0000 1.16
+++ TXTRenderer.java 7 Aug 2002 16:54:58 -0000 1.17
@@ -81,7 +81,7 @@
void addStr(int row, int col, String str, boolean ischar) {
if (debug)
- System.out.println("TXTRenderer.addStr(" + row + ", " + col
+ getLogger().debug("TXTRenderer.addStr(" + row + ", " + col
+ ", \"" + str + "\", " + ischar + ")");
if (suppressGraphics &&!ischar)
return;
@@ -105,14 +105,14 @@
for (int countr = sb.length(); countr < col; countr++)
sb.append(' ');
if (debug)
- System.out.println("TXTRenderer.addStr() sb.length()="
+ getLogger().debug("TXTRenderer.addStr() sb.length()="
+ sb.length());
for (int countr = col; countr < (col + str.length()); countr++) {
if (countr >= sb.length())
sb.append(str.charAt(countr - col));
else {
if (debug)
- System.out.println("TXTRenderer.addStr() sb.length()="
+ getLogger().debug("TXTRenderer.addStr() sb.length()="
+ sb.length() + " countr=" + countr);
sb.setCharAt(countr, str.charAt(countr - col));
}
1.40 +13 -13 xml-fop/src/org/apache/fop/render/xml/XMLRenderer.java
Index: XMLRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/xml/XMLRenderer.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- XMLRenderer.java 31 Jul 2002 08:20:41 -0000 1.39
+++ XMLRenderer.java 7 Aug 2002 16:54:58 -0000 1.40
@@ -159,7 +159,7 @@
*/
public void startRenderer(OutputStream outputStream)
throws IOException {
- log.debug("rendering areas to XML");
+ getLogger().debug("rendering areas to XML");
this.writer = new PrintWriter(outputStream);
this.writer.write( "<?xml version=\"1.0\"?>\n<!-- produced by " +
this.producer + " -->\n");
@@ -172,7 +172,7 @@
writeEndTag("</pageSequence>");
writeEndTag("</areaTree>");
this.writer.flush();
- log.debug("written out XML");
+ getLogger().debug("written out XML");
}
public void renderPage(PageViewport page) throws IOException,
@@ -346,7 +346,7 @@
prop = " props=\"" + getPropString(map) + "\"";
}
writeElement("<word wsadjust=\"" + word.getWSadjust() + "\"" +
- prop + ">" + word.getWord() + "</word>");
+ prop + ">" + word.getWord() + "</word>");
super.renderWord(word);
}
@@ -358,7 +358,7 @@
}
writeStartTag("<inlineparent" + prop + ">");
super.renderInlineParent(ip);
- writeEndTag("</inlineparent>");
+ writeEndTag("</inlineparent>");
}
public void renderLeader(Leader area) {
@@ -389,15 +389,15 @@
protected String getPropString(Map traitMap) {
StringBuffer strbuf = new StringBuffer();
- Iterator iter = traitMap.entrySet().iterator();
- while (iter.hasNext()) {
+ Iterator iter = traitMap.entrySet().iterator();
+ while (iter.hasNext()) {
Map.Entry traitEntry = (Map.Entry) iter.next();
- strbuf.append(Trait.getTraitName(traitEntry.getKey()));
- strbuf.append(':');
- strbuf.append(traitEntry.getValue().toString());
- strbuf.append(';');
- }
- return strbuf.toString();
+ strbuf.append(Trait.getTraitName(traitEntry.getKey()));
+ strbuf.append(':');
+ strbuf.append(traitEntry.getValue().toString());
+ strbuf.append(';');
+ }
+ return strbuf.toString();
}
}
1.29 +4 -4 xml-fop/src/org/apache/fop/svg/SVGElement.java
Index: SVGElement.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/SVGElement.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- SVGElement.java 1 Jul 2002 10:32:33 -0000 1.28
+++ SVGElement.java 7 Aug 2002 16:54:58 -0000 1.29
@@ -76,7 +76,7 @@
((SVGOMDocument)doc).setURLObject(new URL(baseDir));
}
} catch (Exception e) {
- log.error("Could not set base URL for svg", e);
+ getLogger().error("Could not set base URL for svg", e);
}
Element e = ((SVGDocument)doc).getRootElement();
@@ -142,7 +142,7 @@
str = svgRoot.getAttributeNS(null, SVGConstants.SVG_WIDTH_ATTRIBUTE);
if (str.length() == 0) str = "100%";
float width = UnitProcessor.svgHorizontalLengthToUserSpace
- (str, SVGConstants.SVG_WIDTH_ATTRIBUTE, ctx);
+ (str, SVGConstants.SVG_WIDTH_ATTRIBUTE, ctx);
str = svgRoot.getAttributeNS(null, SVGConstants.SVG_HEIGHT_ATTRIBUTE);
if (str.length() == 0) str = "100%";
@@ -163,7 +163,7 @@
protected int fontSize;
float pixeltoMM;
- public PDFUnitContext(int size, Element e, float ptmm) {
+ public PDFUnitContext(int size, Element e, float ptmm) {
this.e = e;
this.fontSize = size;
}
1.11 +25 -23 xml-fop/src/org/apache/fop/tools/AreaTreeBuilder.java
Index: AreaTreeBuilder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/tools/AreaTreeBuilder.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AreaTreeBuilder.java 23 Jul 2002 11:06:51 -0000 1.10
+++ AreaTreeBuilder.java 7 Aug 2002 16:54:58 -0000 1.11
@@ -22,7 +22,7 @@
import org.apache.fop.fo.FOUserAgent;
import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import java.io.*;
import java.util.*;
@@ -49,13 +49,13 @@
* Tests: different renderers, saving and loading pages with serialization
* out of order rendering
*/
-public class AreaTreeBuilder {
- private Logger log = new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG);
+public class AreaTreeBuilder extends AbstractLogEnabled {
/**
*/
public static void main(String[] args) {
AreaTreeBuilder atb = new AreaTreeBuilder();
+ atb.enableLogging(new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG));
atb.runTests(args[0], args[1], args[2]);
System.exit(0);
@@ -65,9 +65,9 @@
*
*/
protected void runTests(String in, String type, String out) {
- log.debug("Starting tests");
+ getLogger().debug("Starting tests");
runTest(in, type, out);
- log.debug("Finished");
+ getLogger().debug("Finished");
}
/**
@@ -81,9 +81,12 @@
} else if ("svg".equals(type)) {
rend = new SVGRenderer();
}
+ setupLogger(rend);
FontInfo fi = new FontInfo();
rend.setupFontInfo(fi);
- rend.setUserAgent(new FOUserAgent());
+ FOUserAgent ua = new FOUserAgent();
+ setupLogger(ua);
+ rend.setUserAgent(ua);
AreaTree.StorePagesModel sm = AreaTree.createStorePagesModel();
TreeLoader tl = new TreeLoader(fi);
@@ -94,7 +97,7 @@
tl.buildAreaTree(is);
renderAreaTree(sm, rend, out);
} catch (IOException e) {
- log.error("error reading file" + e.getMessage(), e);
+ getLogger().error("error reading file" + e.getMessage(), e);
}
}
@@ -104,7 +107,6 @@
OutputStream os =
new BufferedOutputStream(new FileOutputStream(out));
- rend.setLogger(log);
rend.startRenderer(os);
int count = 0;
@@ -124,7 +126,7 @@
page.savePage(tempstream);
tempstream.close();
File temp = new File("temp.ser");
- log.debug("page serialized to: " + temp.length());
+ getLogger().debug("page serialized to: " + temp.length());
temp = null;
ObjectInputStream in = new ObjectInputStream(
new BufferedInputStream(
@@ -140,7 +142,7 @@
rend.stopRenderer();
os.close();
} catch (Exception e) {
- log.error("error rendering output", e);
+ getLogger().error("error rendering output", e);
}
}
@@ -410,7 +412,7 @@
Node obj = childs.item(i);
if (obj.getNodeName().equals("block")) {
Block block = new Block();
- addTraits((Element)obj, block);
+ addTraits((Element)obj, block);
addBlockChildren(block, (Element) obj);
list.add(block);
}
@@ -436,7 +438,7 @@
// error
}
LineArea line = new LineArea();
- addTraits((Element) obj, line);
+ addTraits((Element) obj, line);
String height = ((Element) obj).getAttribute("height");
int h = Integer.parseInt(height);
line.setHeight(h);
@@ -549,7 +551,7 @@
for (int i = 0; i < childs.getLength(); i++) {
Node obj = childs.item(i);
if (obj instanceof Element) {
- //System.out.println(obj.getNodeName());
+ //getLogger().debug(obj.getNodeName());
Element rootEle = (Element) obj;
String space = rootEle.getAttribute("xmlns");
if (svgNS.equals(space)) {
@@ -649,15 +651,15 @@
String tok = st.nextToken();
int index = tok.indexOf(":");
String id = tok.substring(0, index);
- Object traitCode = Trait.getTraitCode(id);
- if (traitCode != null) {
- area.addTrait(traitCode,
- Trait.makeTraitValue(traitCode,
- tok.substring(index + 1)));
- }
- else {
- System.err.println("Unknown trait: " + id );
- }
+ Object traitCode = Trait.getTraitCode(id);
+ if (traitCode != null) {
+ area.addTrait(traitCode,
+ Trait.makeTraitValue(traitCode,
+ tok.substring(index + 1)));
+ }
+ else {
+ System.err.println("Unknown trait: " + id );
+ }
}
}
1.20 +13 -22 xml-fop/src/org/apache/fop/tools/TestConverter.java
Index: TestConverter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/tools/TestConverter.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TestConverter.java 31 Jul 2002 10:05:24 -0000 1.19
+++ TestConverter.java 7 Aug 2002 16:54:58 -0000 1.20
@@ -11,7 +11,7 @@
import org.apache.fop.configuration.*;
import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import java.io.*;
import java.util.*;
@@ -37,14 +37,13 @@
* Modified by Mark Lillywhite mark-fop@inomial.com to use the new Driver
* interface.
*/
-public class TestConverter {
+public class TestConverter extends AbstractLogEnabled {
boolean failOnly = false;
boolean outputPDF = false;
File destdir;
File compare = null;
String baseDir = "./";
HashMap differ = new HashMap();
- private Logger log;
/**
* This main method can be used to run the test converter from
@@ -61,6 +60,7 @@
System.out.println("test suite file name required");
}
TestConverter tc = new TestConverter();
+ tc.enableLogging(new ConsoleLogger(ConsoleLogger.LEVEL_ERROR));
String testFile = null;
for (int count = 0; count < args.length; count++) {
@@ -81,14 +81,6 @@
tc.runTests(testFile, "results", null);
}
- public TestConverter() {
- setupLogging();
- }
-
- private void setupLogging() {
- log = new ConsoleLogger(ConsoleLogger.LEVEL_ERROR);
- }
-
public void setOutputPDF(boolean pdf) {
outputPDF = pdf;
}
@@ -107,7 +99,7 @@
* The document is read as a dom and each testcase is covered.
*/
public HashMap runTests(String fname, String dest, String compDir) {
- log.debug("running tests in file:" + fname);
+ getLogger().debug("running tests in file:" + fname);
try {
if (compDir != null) {
compare = new File(baseDir + "/" + compDir);
@@ -131,7 +123,7 @@
if (testsuite.hasAttributes()) {
String profile =
testsuite.getAttributes().getNamedItem("profile").getNodeValue();
- log.debug("testing test suite:" + profile);
+ getLogger().debug("testing test suite:" + profile);
}
NodeList testcases = testsuite.getChildNodes();
@@ -142,7 +134,7 @@
}
}
} catch (Exception e) {
- e.printStackTrace();
+ getLogger().error("Error while running tests", e);
}
return differ;
}
@@ -157,7 +149,7 @@
if (tcase.hasAttributes()) {
String profile =
tcase.getAttributes().getNamedItem("profile").getNodeValue();
- log.debug("testing profile:" + profile);
+ getLogger().debug("testing profile:" + profile);
}
NodeList cases = tcase.getChildNodes();
@@ -201,7 +193,7 @@
if (xslNode != null) {
xsl = xslNode.getNodeValue();
}
- log.debug("converting xml:" + xml + " and xsl:" +
+ getLogger().debug("converting xml:" + xml + " and xsl:" +
xsl + " to area tree");
try {
@@ -211,7 +203,7 @@
Configuration.put("baseDir",
xmlFile.getParentFile().toURL().toExternalForm());
} catch (Exception e) {
- log.error("Error setting base directory");
+ getLogger().error("Error setting base directory");
}
InputHandler inputHandler = null;
@@ -226,9 +218,8 @@
XMLReader parser = inputHandler.getParser();
setParserFeatures(parser);
- Logger logger = log.getChildLogger("fop");
Driver driver = new Driver();
- driver.setLogger(logger);
+ setupLogger(driver, "fop");
driver.initialize();
if (outputPDF) {
driver.setRenderer(Driver.RENDER_PDF);
@@ -249,7 +240,7 @@
driver.setOutputStream(new BufferedOutputStream(
new FileOutputStream(new File(destdir,
outname + (outputPDF ? ".pdf" : ".at.xml")))));
- log.debug("ddir:" + destdir + " on:" + outname + ".pdf");
+ getLogger().debug("ddir:" + destdir + " on:" + outname + ".pdf");
driver.render(parser, inputHandler.getInputSource());
// check difference
@@ -261,7 +252,7 @@
}
}
} catch (Exception e) {
- e.printStackTrace();
+ getLogger().error("Error while running tests", e);
}
}
1.19 +13 -15 xml-fop/src/org/apache/fop/tools/anttasks/Fop.java
Index: Fop.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/tools/anttasks/Fop.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Fop.java 11 Apr 2002 09:33:31 -0000 1.18
+++ Fop.java 7 Aug 2002 16:54:58 -0000 1.19
@@ -177,6 +177,7 @@
public void execute() throws BuildException {
try {
Starter starter = new FOPTaskStarter(this);
+ starter.enableLogging(new ConsoleLogger(ConsoleLogger.LEVEL_INFO));
starter.run();
} catch (FOPException ex) {
throw new BuildException(ex);
@@ -188,12 +189,9 @@
class FOPTaskStarter extends Starter {
Fop task;
- Logger log;
FOPTaskStarter(Fop task) throws FOPException {
this.task = task;
-
- log = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
}
private int determineRenderer(String format) {
@@ -219,7 +217,7 @@
return Driver.RENDER_XML;
} else {
String err = "Couldn't determine renderer to use: "+format;
- log.error(err);
+ getLogger().error(err);
throw new BuildException(err);
}
}
@@ -240,7 +238,7 @@
return ".xml";
default:
String err = "Unknown renderer: "+renderer;
- log.error(err);
+ getLogger().error(err);
throw new BuildException(err);
}
}
@@ -267,7 +265,7 @@
toExternalForm());
}
} catch (Exception e) {
- log.error("Error setting base directory",e);
+ getLogger().error("Error setting base directory", e);
}
task.log("Using base directory: " +
@@ -337,7 +335,7 @@
try {
out = new FileOutputStream(outFile);
} catch (Exception ex) {
- log.error("Failed to open " + outFile);
+ getLogger().error("Failed to open " + outFile);
throw new BuildException(ex);
}
@@ -345,18 +343,18 @@
try {
Driver driver = new Driver(inputHandler.getInputSource(), out);
- driver.setLogger(log);
+ setupLogger(driver);
driver.setRenderer(renderer);
- if (renderer == Driver.RENDER_XML) {
- HashMap rendererOptions = new HashMap();
- rendererOptions.put("fineDetail", new Boolean(true));
- driver.getRenderer().setOptions(rendererOptions);
- }
+ if (renderer == Driver.RENDER_XML) {
+ HashMap rendererOptions = new HashMap();
+ rendererOptions.put("fineDetail", new Boolean(true));
+ driver.getRenderer().setOptions(rendererOptions);
+ }
driver.setXMLReader(parser);
driver.run();
out.close();
} catch (Exception ex) {
- log.error("Couldn't render file: " + ex.getMessage());
+ getLogger().error("Couldn't render file: " + ex.getMessage());
throw new BuildException(ex);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org