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 gm...@apache.org on 2004/06/22 02:44:46 UTC
cvs commit: xml-fop/src/java/org/apache/fop/tools TestConverter.java
gmazza 2004/06/21 17:44:46
Modified: src/java/org/apache/fop/apps CommandLineOptions.java
FOUserAgent.java Fop.java
src/java/org/apache/fop/fo/pagination
ConditionalPageMasterReference.java
src/java/org/apache/fop/render AbstractRenderer.java
Renderer.java
src/java/org/apache/fop/render/xml XMLRenderer.java
src/java/org/apache/fop/tools TestConverter.java
Log:
1. Moved renderer options to within FOUserAgent
2. Validity checking on fo:conditional-page-master-reference added.
Revision Changes Path
1.20 +10 -8 xml-fop/src/java/org/apache/fop/apps/CommandLineOptions.java
Index: CommandLineOptions.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/CommandLineOptions.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- CommandLineOptions.java 20 Jun 2004 12:35:17 -0000 1.19
+++ CommandLineOptions.java 22 Jun 2004 00:44:46 -0000 1.20
@@ -78,8 +78,8 @@
/* output mode */
private int outputmode = NOT_SET;
- private java.util.HashMap rendererOptions;
-
+ private FOUserAgent foUserAgent;
+
private Log log;
private Vector xsltParams = null;
@@ -96,7 +96,9 @@
log = LogFactory.getLog("FOP");
boolean optionsParsed = true;
- rendererOptions = new java.util.HashMap();
+
+ foUserAgent = new FOUserAgent();
+
try {
optionsParsed = parseOptions(args);
if (optionsParsed) {
@@ -454,7 +456,7 @@
case SVG_OUTPUT:
return Driver.RENDER_SVG;
case AREA_OUTPUT:
- rendererOptions.put("fineDetail", isCoarseAreaXml());
+ foUserAgent.getRendererOptions().put("fineDetail", isCoarseAreaXml());
return Driver.RENDER_XML;
case RTF_OUTPUT:
return Driver.RENDER_RTF;
@@ -480,11 +482,11 @@
}
/**
- * Get the renderer specific options.
- * @return hash map with option/value pairs.
+ * Get the FOUserAgent for this Command-Line run
+ * @return FOUserAgent instance
*/
- public java.util.HashMap getRendererOptions() {
- return rendererOptions;
+ protected FOUserAgent getFOUserAgent() {
+ return foUserAgent;
}
/**
1.8 +11 -1 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FOUserAgent.java 12 May 2004 23:19:52 -0000 1.7
+++ FOUserAgent.java 22 Jun 2004 00:44:46 -0000 1.8
@@ -19,6 +19,7 @@
package org.apache.fop.apps;
// Java
+import java.util.HashMap;
import java.util.Map;
import java.io.IOException;
import java.io.InputStream;
@@ -55,6 +56,15 @@
private String baseURL;
private PDFEncryptionParams pdfEncryptionParams;
private float px2mm = 0.35277777777777777778f; //72dpi (=25.4/dpi)
+ private HashMap rendererOptions = new java.util.HashMap();
+
+ /**
+ * Returns the renderer options
+ * @return renderer options
+ */
+ public HashMap getRendererOptions() {
+ return rendererOptions;
+ }
/**
* Sets the base URL.
1.12 +2 -4 xml-fop/src/java/org/apache/fop/apps/Fop.java
Index: Fop.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Fop.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Fop.java 20 Jun 2004 12:35:17 -0000 1.11
+++ Fop.java 22 Jun 2004 00:44:46 -0000 1.12
@@ -45,6 +45,7 @@
Driver driver = new Driver();
options = new CommandLineOptions(args);
+ driver.setUserAgent(options.getFOUserAgent());
inputHandler = options.getInputHandler();
try {
@@ -60,9 +61,6 @@
}
}
- if (driver.getRenderer() != null) {
- driver.getRenderer().setOptions(options.getRendererOptions());
- }
driver.render(inputHandler);
} finally {
if (bos != null) {
1.11 +9 -0 xml-fop/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
Index: ConditionalPageMasterReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ConditionalPageMasterReference.java 12 Jun 2004 23:18:52 -0000 1.10
+++ ConditionalPageMasterReference.java 22 Jun 2004 00:44:46 -0000 1.11
@@ -20,6 +20,7 @@
// XML
import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
// FOP
import org.apache.fop.fo.FONode;
@@ -50,6 +51,14 @@
*/
public ConditionalPageMasterReference(FONode parent) {
super(parent);
+ }
+
+ /**
+ * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * XSL/FOP Content Model: empty
+ */
+ protected void validateChildNode(Locator loc, String nsURI, String localName) {
+ invalidChildError(loc, nsURI, localName);
}
/**
1.29 +0 -10 xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- AbstractRenderer.java 20 Jun 2004 12:35:17 -0000 1.28
+++ AbstractRenderer.java 22 Jun 2004 00:44:46 -0000 1.29
@@ -105,11 +105,6 @@
protected Date creationDate = null;
/**
- * renderer configuration
- */
- protected Map options;
-
- /**
* block progression position
*/
protected int currentBPPosition = 0;
@@ -177,11 +172,6 @@
*/
public void setCreationDate(Date date) {
creationDate = date;
- }
-
- /** @see org.apache.fop.render.Renderer */
- public void setOptions(Map opt) {
- options = opt;
}
/** @see org.apache.fop.render.Renderer */
1.12 +0 -7 xml-fop/src/java/org/apache/fop/render/Renderer.java
Index: Renderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/Renderer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Renderer.java 20 Jun 2004 07:46:13 -0000 1.11
+++ Renderer.java 22 Jun 2004 00:44:46 -0000 1.12
@@ -97,13 +97,6 @@
void setupFontInfo(FontInfo fontInfo);
/**
- * Set up renderer options.
- *
- * @param options The Configuration for the renderer
- */
- void setOptions(Map options);
-
- /**
* Set the producer of the rendering. If this method isn't called the
* renderer uses a default. Note: Not all renderers support this feature.
*
1.23 +2 -1 xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
Index: XMLRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- XMLRenderer.java 15 Jun 2004 06:26:56 -0000 1.22
+++ XMLRenderer.java 22 Jun 2004 00:44:46 -0000 1.23
@@ -180,7 +180,8 @@
}
private boolean isCoarseXml() {
- return ((Boolean) options.get("fineDetail")).booleanValue();
+ return ((Boolean)
+ userAgent.getRendererOptions().get("fineDetail")).booleanValue();
}
/**
1.14 +2 -4 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TestConverter.java 12 May 2004 23:19:53 -0000 1.13
+++ TestConverter.java 22 Jun 2004 00:44:46 -0000 1.14
@@ -315,10 +315,8 @@
driver.setRenderer(Driver.RENDER_XML);
}
- Map rendererOptions = new java.util.HashMap();
- rendererOptions.put("fineDetail", new Boolean(false));
- rendererOptions.put("consistentOutput", new Boolean(true));
- driver.getRenderer().setOptions(rendererOptions);
+ userAgent.getRendererOptions().put("fineDetail", new Boolean(false));
+ userAgent.getRendererOptions().put("consistentOutput", new Boolean(true));
driver.getRenderer().setProducer("Testsuite Converter");
String outname = res;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org