git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196792 13f79535-47bb-0310-9956-ffa450edef68pull/30/head
@@ -491,7 +491,7 @@ public class CommandLineOptions { | |||
public InputHandler getInputHandler() throws FOPException { | |||
switch (inputmode) { | |||
case FO_INPUT: | |||
return new FOInputHandler(fofile); | |||
return new FOFileHandler(fofile); | |||
case XSLT_INPUT: | |||
return new XSLTInputHandler(xmlfile, xsltfile); | |||
default: |
@@ -648,8 +648,7 @@ public class Driver implements LogEnabled, FOTreeListener { | |||
if (reader == null) { | |||
if (!(source instanceof DocumentInputSource)) { | |||
//TODO: (gm) rename to FOFileHandler or similar | |||
reader = org.apache.fop.apps.FOInputHandler.createParser(); | |||
reader = FOFileHandler.createParser(); | |||
} | |||
} | |||
@@ -66,24 +66,24 @@ import java.net.URL; | |||
/** | |||
* Manages input if it is an XSL-FO file. | |||
*/ | |||
public class FOInputHandler extends InputHandler { | |||
public class FOFileHandler extends InputHandler { | |||
private File fofile = null; | |||
private URL foURL = null; | |||
/** | |||
* Create a FOInputHandler for a file. | |||
* Create a FOFileHandler for a file. | |||
* @param fofile the file to read the FO document. | |||
*/ | |||
public FOInputHandler(File fofile) { | |||
public FOFileHandler(File fofile) { | |||
this.fofile = fofile; | |||
} | |||
/** | |||
* Create a FOInputHandler for an URL. | |||
* Create a FOFileHandler for an URL. | |||
* @param url the URL to read the FO document. | |||
*/ | |||
public FOInputHandler(URL url) { | |||
public FOFileHandler(URL url) { | |||
this.foURL = url; | |||
} | |||
@@ -170,7 +170,7 @@ public class XSLTInputHandler extends InputHandler { | |||
saxTFactory.newXMLFilter(xsltSource); | |||
// Create an XMLReader. | |||
XMLReader parser = FOInputHandler.createParser(); | |||
XMLReader parser = FOFileHandler.createParser(); | |||
if (parser == null) { | |||
throw new FOPException("Unable to create SAX parser"); | |||
} |
@@ -54,7 +54,7 @@ package org.apache.fop.image; | |||
import org.w3c.dom.Document; | |||
// FOP | |||
import org.apache.fop.apps.FOInputHandler; | |||
import org.apache.fop.apps.FOFileHandler; | |||
/** | |||
* This is an implementation for XML-based images such as SVG. | |||
@@ -86,7 +86,7 @@ public class XMLImage extends AbstractFopImage { | |||
* @return the created SAX parser | |||
*/ | |||
public static String getParserName() { | |||
String parserClassName = FOInputHandler.getParserClassName(); | |||
String parserClassName = FOFileHandler.getParserClassName(); | |||
return parserClassName; | |||
} | |||
@@ -54,7 +54,7 @@ import java.util.HashMap; | |||
import org.apache.fop.fo.FONode; | |||
import org.apache.fop.fo.ElementMapping; | |||
import org.apache.fop.apps.FOInputHandler; | |||
import org.apache.fop.apps.FOFileHandler; | |||
import org.apache.batik.util.XMLResourceDescriptor; | |||
import org.apache.batik.dom.svg.SVGDOMImplementation; | |||
@@ -78,7 +78,7 @@ public class SVGElementMapping extends ElementMapping { | |||
// normally the user agent value is used | |||
try { | |||
XMLResourceDescriptor.setXMLParserClassName( | |||
FOInputHandler.getParserClassName()); | |||
FOFileHandler.getParserClassName()); | |||
foObjs = new HashMap(); | |||
foObjs.put("svg", new SE()); |
@@ -158,7 +158,7 @@ public class SVGUserAgent extends UserAgentAdapter { | |||
* @return the XML parser class name | |||
*/ | |||
public String getXMLParserClassName() { | |||
return org.apache.fop.apps.FOInputHandler.getParserClassName(); | |||
return org.apache.fop.apps.FOFileHandler.getParserClassName(); | |||
} | |||
/** |
@@ -51,7 +51,7 @@ | |||
package org.apache.fop.tools; | |||
import org.apache.fop.apps.Driver; | |||
import org.apache.fop.apps.FOInputHandler; | |||
import org.apache.fop.apps.FOFileHandler; | |||
import org.apache.fop.apps.FOPException; | |||
import org.apache.fop.apps.InputHandler; | |||
import org.apache.fop.apps.XSLTInputHandler; | |||
@@ -278,7 +278,7 @@ public class TestConverter extends AbstractLogEnabled { | |||
InputHandler inputHandler = null; | |||
if (xsl == null) { | |||
inputHandler = new FOInputHandler(xmlFile); | |||
inputHandler = new FOFileHandler(xmlFile); | |||
} else { | |||
inputHandler = new XSLTInputHandler(xmlFile, | |||
new File(baseDir + "/" |
@@ -68,7 +68,7 @@ import java.util.List; | |||
// FOP | |||
import org.apache.fop.apps.Starter; | |||
import org.apache.fop.apps.InputHandler; | |||
import org.apache.fop.apps.FOInputHandler; | |||
import org.apache.fop.apps.FOFileHandler; | |||
import org.apache.fop.apps.Driver; | |||
import org.apache.fop.apps.FOPException; | |||
import org.apache.fop.fo.FOUserAgent; | |||
@@ -502,7 +502,7 @@ class FOPTaskStarter extends Starter { | |||
private void render(File foFile, File outFile, | |||
int renderer) throws FOPException { | |||
InputHandler inputHandler = new FOInputHandler(foFile); | |||
InputHandler inputHandler = new FOFileHandler(foFile); | |||
OutputStream out = null; | |||
try { |