Thread: [FOray-commit] SF.net SVN: foray: [7788] trunk/foray/foray-app/src/java/org/foray/app (Page 3)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7788
Author:   victormote
Date:     2006-07-17 18:50:35 -0700 (Mon, 17 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7788&view=rev

Log Message:
-----------
Use JAXP instead of Trax.

Modified Paths:
--------------
    trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java
    trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java
Modified: trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java
===================================================================

--- trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java	2006-07-17 13:04:28 UTC (rev 7787)
+++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java	2006-07-18 01:50:35 UTC (rev 7788)
@@ -31,7 +31,6 @@
 import org.foray.core.FOrayException;
 import org.foray.core.InputHandler;
 import org.foray.core.SessionConfig;
-import org.foray.core.TraxInputHandler;
 import org.foray.output.OutputConfig;
 
 import org.apache.commons.logging.Log;
@@ -47,13 +46,13 @@
 public class CommandLineOptions {
 
     /** Constant indicating that the input mode has not been set. */
-    private static final int INPUT_NOT_SET = 0;
+    public static final int INPUT_NOT_SET = 0;
 
     /** Constant indicating that the input is XSL-FO. */
-    private static final int INPUT_FO = 1;
+    public static final int INPUT_FO = 1;
 
     /** Constant indicating that the input is XML + XSLT. */
-    private static final int INPUT_XSLT = 2;
+    public static final int INPUT_XSLT = 2;
 
     /** The user configuration file. */
     URL userConfig = null;
@@ -434,14 +433,10 @@
      *
      */
     public InputHandler getInputHandler() throws FOrayException {
-        switch (inputmode) {
-        case INPUT_FO:
+        if (inputmode == INPUT_FO) {
             return new FOInputHandler(log, foInput);
-        case INPUT_XSLT:
-            return new TraxInputHandler(log, xmlInput, xsltInput);
-        default:
-            return new FOInputHandler(log, foInput);
         }
+        return null;
     }
 
     public OutputConfig getRendererOptions() {

Modified: trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java	2006-07-17 13:04:28 UTC (rev 7787)
+++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java	2006-07-18 01:50:35 UTC (rev 7788)
@@ -44,7 +44,14 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamSource;
+
 /**
  * Superclass for all classes which start FOray from the commandline.
  */
@@ -84,15 +91,43 @@
          * Multiple documents can be instantiated, and they will be processed
          * in the order submitted.
          */
-        InputSource saxInputSource;
-        try {
-            saxInputSource = inputHandler.getInputSource();
-        } catch (IOException e) {
-            throw new FOrayException(e);
+        FOrayDocument document = null;
+        if (this.commandLineOptions.inputmode == CommandLineOptions.INPUT_FO) {
+            InputSource saxInputSource;
+            try {
+                saxInputSource = inputHandler.getInputSource();
+            } catch (IOException e) {
+                throw new FOrayException(e);
+            }
+            XMLReader parser = inputHandler.getParser();
+            document = new FOrayDocument(session, saxInputSource,
+                    parser);
+        } else {
+            InputStream xmlInputStream = null;
+            try {
+                xmlInputStream = commandLineOptions.getXMLFile()
+                        .openStream();
+            } catch (IOException e) {
+                throw new FOrayException(e);
+            }
+            Source xmlSource = new StreamSource(xmlInputStream);
+            InputStream xsltInputStream = null;
+            try {
+                xsltInputStream = commandLineOptions.getXSLFile()
+                        .openStream();
+            } catch (IOException e) {
+                throw new FOrayException(e);
+            }
+            Source xsltSource = new StreamSource(xsltInputStream);
+            TransformerFactory factory = TransformerFactory.newInstance();
+            Transformer transformer = null;
+            try {
+                transformer = factory.newTransformer(xsltSource);
+            } catch (TransformerConfigurationException e) {
+                throw new FOrayException(e);
+            }
+            document = new FOrayDocument(session, transformer, xmlSource);
         }
-        XMLReader parser = inputHandler.getParser();
-        FOrayDocument document = new FOrayDocument(session, saxInputSource,
-                parser);
 
         /*
          * Instantiate and configure the OutputTarget. The makeOutputTarget()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [FOray-commit] SF.net SVN: foray: [7788] trunk/foray/foray-app/src/java/org/foray/app (Page 3)

Modular XSL-FO Implementation for Java.

foray-commit