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 ke...@locus.apache.org on 2000/08/03 07:44:33 UTC
cvs commit: xml-fop/src/org/apache/fop/apps CommandLine.java Driver.java PrintCommandLine.java XTCommandLine.java XalanCommandLine.java
keiron 00/08/02 22:44:33
Modified: src/org/apache/fop/apps CommandLine.java Driver.java
PrintCommandLine.java XTCommandLine.java
XalanCommandLine.java
Log:
adds property list mappings to the driver
Revision Changes Path
1.11 +3 -1 xml-fop/src/org/apache/fop/apps/CommandLine.java
Index: CommandLine.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/CommandLine.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CommandLine.java 2000/07/15 11:37:05 1.10
+++ CommandLine.java 2000/08/03 05:44:32 1.11
@@ -1,4 +1,4 @@
-/*-- $Id: CommandLine.java,v 1.10 2000/07/15 11:37:05 fotis Exp $ --
+/*-- $Id: CommandLine.java,v 1.11 2000/08/03 05:44:32 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -177,6 +177,8 @@
driver.setRenderer("org.apache.fop.render.pdf.PDFRenderer", version);
driver.addElementMapping("org.apache.fop.fo.StandardElementMapping");
driver.addElementMapping("org.apache.fop.svg.SVGElementMapping");
+ driver.addPropertyList("org.apache.fop.fo.StandardPropertyListMapping");
+ driver.addPropertyList("org.apache.fop.svg.SVGPropertyListMapping");
driver.setWriter(new PrintWriter(new FileWriter(args[1])));
driver.buildFOTree(parser, fileInputSource(args[0]));
driver.format();
1.10 +33 -2 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Driver.java 2000/07/11 02:27:05 1.9
+++ Driver.java 2000/08/03 05:44:32 1.10
@@ -1,4 +1,4 @@
-/*-- $Id: Driver.java,v 1.9 2000/07/11 02:27:05 arved Exp $ --
+/*-- $Id: Driver.java,v 1.10 2000/08/03 05:44:32 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -53,7 +53,8 @@
// FOP
import org.apache.fop.fo.FOTreeBuilder;
-import org.apache.fop.fo.ElementMapping;
+import org.apache.fop.fo.ElementMapping;
+import org.apache.fop.fo.PropertyListMapping;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.layout.FontInfo;
import org.apache.fop.render.Renderer;
@@ -203,6 +204,36 @@
MessageHandler.errorln("Could not access " + mappingClassName);
} catch (ClassCastException e) {
MessageHandler.errorln(mappingClassName + " is not an element mapping");
+ }
+ return null;
+ }
+
+ /**
+ * add the element mapping with the given class name
+ */
+ public void addPropertyList(String listClassName) {
+ createPropertyList(listClassName).addToBuilder(this.treeBuilder);
+ }
+
+ /**
+ * protected method used by addPropertyList(String) to
+ * instantiate list mapping class
+ */
+ protected PropertyListMapping createPropertyList(String listClassName) {
+ MessageHandler.logln("using property list mapping " + listClassName);
+
+ try {
+ return (PropertyListMapping)
+ Class.forName(listClassName).newInstance();
+ } catch (ClassNotFoundException e) {
+ MessageHandler.errorln("Could not find " + listClassName);
+ } catch (InstantiationException e) {
+ MessageHandler.errorln("Could not instantiate "
+ + listClassName);
+ } catch (IllegalAccessException e) {
+ MessageHandler.errorln("Could not access " + listClassName);
+ } catch (ClassCastException e) {
+ MessageHandler.errorln(listClassName + " is not an property list");
}
return null;
}
1.5 +2 -0 xml-fop/src/org/apache/fop/apps/PrintCommandLine.java
Index: PrintCommandLine.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/PrintCommandLine.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PrintCommandLine.java 2000/07/15 11:37:05 1.4
+++ PrintCommandLine.java 2000/08/03 05:44:32 1.5
@@ -72,6 +72,8 @@
driver.setRenderer(renderer);
driver.addElementMapping("org.apache.fop.fo.StandardElementMapping");
driver.addElementMapping("org.apache.fop.svg.SVGElementMapping");
+ driver.addPropertyList("org.apache.fop.fo.StandardPropertyListMapping");
+ driver.addPropertyList("org.apache.fop.svg.SVGPropertyListMapping");
driver.buildFOTree(parser, fileInputSource(args[0]));
driver.format();
driver.render();
1.9 +3 -1 xml-fop/src/org/apache/fop/apps/XTCommandLine.java
Index: XTCommandLine.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/XTCommandLine.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XTCommandLine.java 2000/07/11 02:33:04 1.8
+++ XTCommandLine.java 2000/08/03 05:44:32 1.9
@@ -1,4 +1,4 @@
-/*-- $Id: XTCommandLine.java,v 1.8 2000/07/11 02:33:04 arved Exp $ --
+/*-- $Id: XTCommandLine.java,v 1.9 2000/08/03 05:44:32 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -119,6 +119,8 @@
version);
driver.addElementMapping("org.apache.fop.fo.StandardElementMapping");
driver.addElementMapping("org.apache.fop.svg.SVGElementMapping");
+ driver.addPropertyList("org.apache.fop.fo.StandardPropertyListMapping");
+ driver.addPropertyList("org.apache.fop.svg.SVGPropertyListMapping");
driver.setWriter(new PrintWriter(new FileWriter(args[2])));
driver.buildFOTree(xslProcessor, fileInputSource(args[0]));
driver.format();
1.3 +2 -0 xml-fop/src/org/apache/fop/apps/XalanCommandLine.java
Index: XalanCommandLine.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/XalanCommandLine.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanCommandLine.java 2000/07/22 11:32:12 1.2
+++ XalanCommandLine.java 2000/08/03 05:44:32 1.3
@@ -225,6 +225,8 @@
driver.setRenderer("org.apache.fop.render.pdf.PDFRenderer", version);
driver.addElementMapping("org.apache.fop.fo.StandardElementMapping");
driver.addElementMapping("org.apache.fop.svg.SVGElementMapping");
+ driver.addPropertyList("org.apache.fop.fo.StandardPropertyListMapping");
+ driver.addPropertyList("org.apache.fop.svg.SVGPropertyListMapping");
driver.setWriter(new PrintWriter(new FileWriter(args[2])));
driver.buildFOTree(parser, new InputSource(reader));
reader.close();