SAX2

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193478 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/apps/AWTCommandLine.java b/src/org/apache/fop/apps/AWTCommandLine.java
index 3350ec767c940b29edb03a3a7a01ea4fe23fc433..ca224ee63e61482e2043057feecec655f14d895c 100644 (file)
--- a/src/org/apache/fop/apps/AWTCommandLine.java
+++ b/src/org/apache/fop/apps/AWTCommandLine.java
@@ -15,7 +15,7 @@ import javax.swing.UIManager;
 import java.awt.*;
 
 // SAX
-import org.xml.sax.Parser;
+import org.xml.sax.XMLReader;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
@@ -68,7 +68,7 @@ public class AWTCommandLine {
 
 //init parser
     frame.progress(resource.getString("Init parser") + " ...");
-    Parser parser = createParser();
+    XMLReader parser = createParser();
 
 
        if (parser == null) {
@@ -109,16 +109,16 @@ public class AWTCommandLine {
   }
 
 
-    static Parser createParser() {
+    static XMLReader createParser() {
        String parserClassName =
            System.getProperty("org.xml.sax.parser");
        if (parserClassName == null) {
-           parserClassName = "com.jclark.xml.sax.Driver";
+           parserClassName = "org.apache.xerces.parsers.SAXParser";
        }
        MessageHandler.errorln("using SAX parser " + parserClassName);
 
        try {
-           return (Parser)
+           return (XMLReader)
                Class.forName(parserClassName).newInstance();
        } catch (ClassNotFoundException e) {
            MessageHandler.errorln("Could not find " + parserClassName);

diff --git a/src/org/apache/fop/apps/PDFOutputHandler.java b/src/org/apache/fop/apps/PDFOutputHandler.java
index 04b50242c79af8c77560e6433c8c1543cd9a6a04..6d54b418ee863587b8759e1332d3263d7356aea7 100644 (file)
--- a/src/org/apache/fop/apps/PDFOutputHandler.java
+++ b/src/org/apache/fop/apps/PDFOutputHandler.java
@@ -5,8 +5,8 @@ import com.jclark.xsl.sax.*;
 import java.io.*;
 
 // FOP
-import org.apache.fop.fo.FOTreeBuilder;
-import org.apache.fop.fo.ElementMapping; 
+import org.apache.fop.fo.XTFOTreeBuilder;
+import org.apache.fop.fo.XTElementMapping; 
 import org.apache.fop.layout.AreaTree;
 import org.apache.fop.layout.FontInfo;
 import org.apache.fop.render.Renderer;
@@ -22,7 +22,7 @@ import org.apache.fop.messaging.MessageHandler;
  * to your stylesheet. Now XT will automatically call FOP.
  * 
  */
-public class PDFOutputHandler extends FOTreeBuilder implements OutputDocumentHandler {
+public class PDFOutputHandler extends XTFOTreeBuilder implements OutputDocumentHandler {
   
   /** the area tree that is the result of formatting the FO tree */
   protected AreaTree areaTree;
@@ -121,7 +121,7 @@ public class PDFOutputHandler extends FOTreeBuilder implements OutputDocumentHan
    *
    * an element mapping maps element names to Java classes
    */
-  public void addElementMapping(ElementMapping mapping) {
+  public void addElementMapping(XTElementMapping mapping) {
     mapping.addToBuilder(this);
   }
     
@@ -138,11 +138,11 @@ public class PDFOutputHandler extends FOTreeBuilder implements OutputDocumentHan
    * protected method used by addElementMapping(String) to
    * instantiate element mapping class
    */
-  protected ElementMapping createElementMapping(String mappingClassName) {
+  protected XTElementMapping createElementMapping(String mappingClassName) {
     MessageHandler.logln("using element mapping " + mappingClassName);
 
     try {
-        return (ElementMapping)
+        return (XTElementMapping)
        Class.forName(mappingClassName).newInstance();
     } catch (ClassNotFoundException e) {
         MessageHandler.errorln("Could not find " + mappingClassName);

diff --git a/src/org/apache/fop/apps/PrintCommandLine.java b/src/org/apache/fop/apps/PrintCommandLine.java
index 1b286b4d101ef69b42d9fafb2627af153105d3ba..9f9be920dbb1398f61f9dd7a823d5e41e3052c46 100755 (executable)
--- a/src/org/apache/fop/apps/PrintCommandLine.java
+++ b/src/org/apache/fop/apps/PrintCommandLine.java
@@ -7,7 +7,7 @@ package org.apache.fop.apps;
  */
 
 
-import org.xml.sax.Parser;
+import org.xml.sax.XMLReader;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
@@ -50,7 +50,7 @@ public class PrintCommandLine extends CommandLine {
       System.exit(1);
     }
 
-    Parser parser = createParser();
+    XMLReader parser = createParser();
 
     if (parser == null) {
       MessageHandler.errorln("ERROR: Unable to create SAX parser");