gmazza 2004/06/22 17:25:27
Modified: src/java/org/apache/fop/apps CommandLineOptions.java
Driver.java FOUserAgent.java Fop.java
src/java/org/apache/fop/fo/pagination RegionBody.java
src/java/org/apache/fop/fonts/apps PFMReader.java
TTFReader.java
src/java/org/apache/fop/render AbstractRenderer.java
Renderer.java
src/java/org/apache/fop/render/awt/viewer
PreviewDialogAboutBox.java
src/java/org/apache/fop/render/pdf PDFRenderer.java
src/java/org/apache/fop/render/ps EPSDocumentGraphics2D.java
PSDocumentGraphics2D.java PSRenderer.java
src/java/org/apache/fop/tools TestConverter.java
Removed: src/java/org/apache/fop/apps Version.java
Log:
1.) Moving renderer-specific customization variables (producer, creator, create
date) to FOUserAgent, those renderers which can work with these values can read them
from passed-in FOUserAgent instance.
2.) Version.getVersion() moved to Fop.getVersion().
3.) Validation added for fo:region-body.
Revision Changes Path
1.21 +1 -1 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CommandLineOptions.java 22 Jun 2004 00:44:46 -0000 1.20
+++ CommandLineOptions.java 23 Jun 2004 00:25:27 -0000 1.21
@@ -177,7 +177,7 @@
} else if (args[i].equals("-at")) {
i = i + parseAreaTreeOption(args, i);
} else if (args[i].equals("-v")) {
- System.out.println("FOP Version " + Version.getVersion());
+ System.out.println("FOP Version " + Fop.getVersion());
} else if (args[i].equals("-param")) {
if (i + 2 < args.length) {
if (xsltParams == null) {
1.74 +3 -3 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.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- Driver.java 20 Jun 2004 12:35:17 -0000 1.73
+++ Driver.java 23 Jun 2004 00:25:27 -0000 1.74
@@ -350,8 +350,8 @@
if (renderer instanceof AWTRenderer) {
rendererType = RENDER_AWT;
}
- renderer.setProducer(Version.getVersion());
renderer.setUserAgent(getUserAgent());
+ userAgent.setProducer("FOP Version" + Fop.getVersion());
this.renderer = renderer;
}
@@ -375,8 +375,8 @@
throws IllegalArgumentException {
try {
renderer = (Renderer)Class.forName(rendererClassName).newInstance();
- renderer.setProducer(Version.getVersion());
renderer.setUserAgent(getUserAgent());
+ userAgent.setProducer("FOP Version" + Fop.getVersion());
} catch (ClassNotFoundException e) {
throw new IllegalArgumentException("Could not find "
+ rendererClassName);
1.9 +65 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FOUserAgent.java 22 Jun 2004 00:44:46 -0000 1.8
+++ FOUserAgent.java 23 Jun 2004 00:25:27 -0000 1.9
@@ -19,6 +19,7 @@
package org.apache.fop.apps;
// Java
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.io.IOException;
@@ -57,6 +58,69 @@
private PDFEncryptionParams pdfEncryptionParams;
private float px2mm = 0.35277777777777777778f; //72dpi (=25.4/dpi)
private HashMap rendererOptions = new java.util.HashMap();
+
+ /** Producer: Metadata element for the system/software that produces
+ * the document. (Some renderers can store this in the document.)
+ */
+ protected String producer = "FOP " + Fop.getVersion();
+
+ /** Creator: Metadata element for the user that created the
+ * document. (Some renderers can store this in the document.)
+ */
+ protected String creator = null;
+
+ /** Creation Date: Override of the date the document was created.
+ * (Some renderers can store this in the document.)
+ */
+ protected Date creationDate = null;
+
+ /**
+ * Sets the producer of the document.
+ * @param producer source of document
+ */
+ public void setProducer(String producer) {
+ this.producer = producer;
+ }
+
+ /**
+ * Returns the producer of the document
+ * @return producer name
+ */
+ public String getProducer() {
+ return producer;
+ }
+
+ /**
+ * Sets the creator of the document.
+ * @param creator of document
+ */
+ public void setCreator(String creator) {
+ this.creator = creator;
+ }
+
+ /**
+ * Returns the creator of the document
+ * @return creator name
+ */
+ public String getCreator() {
+ return creator;
+ }
+
+ /**
+ * Sets the creation date of the document.
+ * @param creation date of document
+ */
+ public void setCreationDate(Date creationDate) {
+ this.creationDate = creationDate;
+ }
+
+ /**
+ * Returns the creation date of the document
+ * @return creation date of document
+ */
+ public Date getCreationDate() {
+ return creationDate;
+ }
/**
* Returns the renderer options
1.13 +9 -2 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Fop.java 22 Jun 2004 00:44:46 -0000 1.12
+++ Fop.java 23 Jun 2004 00:25:27 -0000 1.13
@@ -39,7 +39,6 @@
CommandLineOptions options = null;
InputHandler inputHandler = null;
BufferedOutputStream bos = null;
- String version = Version.getVersion();
try {
Driver driver = new Driver();
@@ -95,6 +94,14 @@
}
System.exit(1);
}
+ }
+
+ /**
+ * Get the version of FOP
+ * @return the version string
+ */
+ public static String getVersion() {
+ return "1.0dev";
}
}
1.22 +14 -0 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBody.java
Index: RegionBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBody.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- RegionBody.java 12 Jun 2004 23:18:52 -0000 1.21
+++ RegionBody.java 23 Jun 2004 00:25:27 -0000 1.22
@@ -18,8 +18,14 @@
package org.apache.fop.fo.pagination;
+// Java
import java.awt.Rectangle;
+// XML
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+
+// FOP
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.datatypes.FODimension;
import org.apache.fop.fo.FONode;
@@ -42,6 +48,14 @@
*/
public RegionBody(FONode parent) {
super(parent, Region.BODY_CODE);
+ }
+
+ /**
+ * @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.5 +2 -2 xml-fop/src/java/org/apache/fop/fonts/apps/PFMReader.java
Index: PFMReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/apps/PFMReader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PFMReader.java 2 Apr 2004 09:16:12 -0000 1.4
+++ PFMReader.java 23 Jun 2004 00:25:27 -0000 1.5
@@ -36,7 +36,7 @@
import org.apache.commons.logging.LogFactory;
//FOP
-import org.apache.fop.apps.Version;
+import org.apache.fop.apps.Fop;
import org.apache.fop.fonts.type1.PFMFile;
/**
@@ -144,7 +144,7 @@
PFMReader app = new PFMReader();
- System.out.println("PFM Reader for Apache FOP " + Version.getVersion() +
"\n");
+ System.out.println("PFM Reader for Apache FOP " + Fop.getVersion() + "\n");
if (options.get("-ef") != null) {
embFile = (String)options.get("-ef");
1.6 +2 -2 xml-fop/src/java/org/apache/fop/fonts/apps/TTFReader.java
Index: TTFReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/apps/TTFReader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TTFReader.java 2 Apr 2004 09:16:12 -0000 1.5
+++ TTFReader.java 23 Jun 2004 00:25:27 -0000 1.6
@@ -35,7 +35,7 @@
import org.apache.commons.logging.LogFactory;
//FOP
-import org.apache.fop.apps.Version;
+import org.apache.fop.apps.Fop;
import org.apache.fop.fonts.truetype.FontFileReader;
import org.apache.fop.fonts.truetype.TTFCmapEntry;
import org.apache.fop.fonts.truetype.TTFFile;
@@ -160,7 +160,7 @@
TTFReader app = new TTFReader();
- System.out.println("TTF Reader for Apache FOP " + Version.getVersion() +
"\n");
+ System.out.println("TTF Reader for Apache FOP " + Fop.getVersion() + "\n");
if (options.get("-enc") != null) {
String enc = (String)options.get("-enc");
1.30 +0 -34 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- AbstractRenderer.java 22 Jun 2004 00:44:46 -0000 1.29
+++ AbstractRenderer.java 23 Jun 2004 00:25:27 -0000 1.30
@@ -90,21 +90,6 @@
protected static Log logger = LogFactory.getLog("FOP");
/**
- * producer (usually "FOP")
- */
- protected String producer = "FOP";
-
- /**
- * creator of document
- */
- protected String creator = null;
-
- /**
- * creation time
- */
- protected Date creationDate = null;
-
- /**
* block progression position
*/
protected int currentBPPosition = 0;
@@ -145,16 +130,6 @@
return logger;
}
- /** @see org.apache.fop.render.Renderer */
- public void setProducer(String inProducer) {
- producer = inProducer;
- }
-
- /** @see org.apache.fop.render.Renderer */
- public void setCreator(String inCreator) {
- creator = inCreator;
- }
-
/**
* @see org.apache.fop.render.Renderer
*/
@@ -167,13 +142,6 @@
userAgent = agent;
}
- /**
- * @param date
- */
- public void setCreationDate(Date date) {
- creationDate = date;
- }
-
/** @see org.apache.fop.render.Renderer */
public void startRenderer(OutputStream outputStream)
throws IOException { }
@@ -344,9 +312,7 @@
*/
protected void renderRegion(RegionReference region) {
List blocks = region.getBlocks();
-
renderBlocks(null, blocks);
-
}
/**
1.13 +0 -28 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Renderer.java 22 Jun 2004 00:44:46 -0000 1.12
+++ Renderer.java 23 Jun 2004 00:25:27 -0000 1.13
@@ -97,34 +97,6 @@
void setupFontInfo(FontInfo fontInfo);
/**
- * Set the producer of the rendering. If this method isn't called the
- * renderer uses a default. Note: Not all renderers support this feature.
- *
- * @param producer The name of the producer (normally "FOP") to be
- * embedded in the generated file.
- */
- void setProducer(String producer);
-
- /**
- * Set the creator of the document to be rendered.
- * If this method isn't called the renderer uses a default.
- * Note: Not all renderers support this feature.
- *
- * @param creator The name of the document creator
- */
- void setCreator(String creator);
-
- /**
- * Set the creator date/timeof the document to be rendered.
- * If this method isn't called the renderer uses the current date/time
- * as default.
- * Note: Not all renderers support this feature.
- *
- * @param date The name of the document creator
- */
- void setCreationDate(Date date);
-
- /**
* Reports if out of order rendering is supported. <p>
*
* Normally, all pages of a document are rendered in their natural order
1.3 +3 -3
xml-fop/src/java/org/apache/fop/render/awt/viewer/PreviewDialogAboutBox.java
Index: PreviewDialogAboutBox.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/awt/viewer/PreviewDialogAboutBox.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PreviewDialogAboutBox.java 27 Feb 2004 17:51:22 -0000 1.2
+++ PreviewDialogAboutBox.java 23 Jun 2004 00:25:27 -0000 1.3
@@ -36,7 +36,7 @@
import java.awt.event.ActionEvent;
//FOP
-import org.apache.fop.apps.Version;
+import org.apache.fop.apps.Fop;
/**
* AWT Viewer's "About" dialog.
@@ -68,7 +68,7 @@
imageControl1.setIcon(new
ImageIcon(getClass().getResource("images/fop.gif")));
JLabel label1 = new JLabel(translator.getString("About.Product"));
JLabel label2 = new JLabel(translator.getString("About.Version")
- + " " + Version.getVersion());
+ + " " + Fop.getVersion());
JLabel label3 = new JLabel(translator.getString("About.Copyright"));
panel1.setLayout(new BorderLayout());
panel2.setLayout(new BorderLayout());
1.45 +3 -5 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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- PDFRenderer.java 16 Jun 2004 21:29:33 -0000 1.44
+++ PDFRenderer.java 23 Jun 2004 00:25:27 -0000 1.45
@@ -37,7 +37,6 @@
// FOP
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.apps.Version;
import org.apache.fop.area.Area;
import org.apache.fop.area.Block;
import org.apache.fop.area.BlockViewport;
@@ -247,10 +246,9 @@
*/
public void startRenderer(OutputStream stream) throws IOException {
ostream = stream;
- producer = "FOP " + Version.getVersion();
- this.pdfDoc = new PDFDocument(producer);
- this.pdfDoc.setCreator(creator);
- this.pdfDoc.setCreationDate(creationDate);
+ this.pdfDoc = new PDFDocument(userAgent.getProducer());
+ this.pdfDoc.setCreator(userAgent.getCreator());
+ this.pdfDoc.setCreationDate(userAgent.getCreationDate());
this.pdfDoc.setFilterMap(filterMap);
this.pdfDoc.outputHeader(stream);
1.6 +4 -4
xml-fop/src/java/org/apache/fop/render/ps/EPSDocumentGraphics2D.java
Index: EPSDocumentGraphics2D.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/ps/EPSDocumentGraphics2D.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EPSDocumentGraphics2D.java 24 Apr 2004 06:08:13 -0000 1.5
+++ EPSDocumentGraphics2D.java 23 Jun 2004 00:25:27 -0000 1.6
@@ -20,7 +20,7 @@
import java.io.IOException;
-import org.apache.fop.apps.Version;
+import org.apache.fop.apps.Fop;
/**
* This class is a wrapper for the <tt>AbstractPSDocumentGraphics2D</tt> that
@@ -55,7 +55,7 @@
//PostScript Header
gen.writeln(DSCConstants.PS_ADOBE_30 + " " + DSCConstants.EPSF_30);
gen.writeDSCComment(DSCConstants.CREATOR,
- new String[] {"Apache FOP " + Version.getVersion()
+ new String[] {"Apache FOP " + Fop.getVersion()
+ ": EPS Transcoder for SVG"});
gen.writeDSCComment(DSCConstants.CREATION_DATE,
new Object[] {new java.util.Date()});
1.14 +2 -2
xml-fop/src/java/org/apache/fop/render/ps/PSDocumentGraphics2D.java
Index: PSDocumentGraphics2D.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSDocumentGraphics2D.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PSDocumentGraphics2D.java 24 Apr 2004 06:08:13 -0000 1.13
+++ PSDocumentGraphics2D.java 23 Jun 2004 00:25:27 -0000 1.14
@@ -24,7 +24,7 @@
import java.io.IOException;
//FOP
-import org.apache.fop.apps.Version;
+import org.apache.fop.apps.Fop;
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.fonts.FontSetup;
@@ -92,7 +92,7 @@
//PostScript Header
gen.writeln(DSCConstants.PS_ADOBE_30);
gen.writeDSCComment(DSCConstants.CREATOR,
- new String[] {"Apache FOP " + Version.getVersion()
+ new String[] {"Apache FOP " + Fop.getVersion()
+ ": PostScript Transcoder for SVG"});
gen.writeDSCComment(DSCConstants.CREATION_DATE,
new Object[] {new java.util.Date()});
1.29 +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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- PSRenderer.java 15 Jun 2004 06:26:56 -0000 1.28
+++ PSRenderer.java 23 Jun 2004 00:25:27 -0000 1.29
@@ -320,7 +320,7 @@
//PostScript Header
writeln(DSCConstants.PS_ADOBE_30);
- gen.writeDSCComment(DSCConstants.CREATOR, new String[] {"FOP " +
this.producer});
+ gen.writeDSCComment(DSCConstants.CREATOR, new String[] {
userAgent.getProducer() });
gen.writeDSCComment(DSCConstants.CREATION_DATE, new Object[] {new
java.util.Date()});
gen.writeDSCComment(DSCConstants.LANGUAGE_LEVEL, new
Integer(gen.getPSLevel()));
gen.writeDSCComment(DSCConstants.PAGES, new Object[] {PSGenerator.ATEND});
1.15 +1 -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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TestConverter.java 22 Jun 2004 00:44:46 -0000 1.14
+++ TestConverter.java 23 Jun 2004 00:25:27 -0000 1.15
@@ -317,7 +317,7 @@
userAgent.getRendererOptions().put("fineDetail", new Boolean(false));
userAgent.getRendererOptions().put("consistentOutput", new
Boolean(true));
- driver.getRenderer().setProducer("Testsuite Converter");
+ userAgent.setProducer("Testsuite Converter");
String outname = res;
if (outname.endsWith(".xml") || outname.endsWith(".pdf")) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
