cvs commit: xml-fop/src/java/org/apache/fop/svg SVGUserAgent.java
gmazza 2004/07/20 14:28:50
Modified:src/java/org/apache/fop/apps CommandLineOptions.java
FOFileHandler.java
src/java/org/apache/fop/fo/extensions/svg
BatikExtensionElementMapping.java
SVGElementMapping.java
src/java/org/apache/fop/image XMLImage.java
src/java/org/apache/fop/svg SVGUserAgent.java
Log:
1.) Moved the SAXParser-creating method from FOFileHandler to CommandLineOptions,
the latter being the class directly using it.
2.) Decoupled the SVG classes from apps.FOFileHandler, the SVG classes for some
reason
want a string containing a name of a SAXParser. We'll need to look in the future for
the actual need for this--normally error messages are done by the caller, not
the callee. It would appear that Batik can generate a SAXParser name by default,
and use that when not explicitly overridden by the caller.
Revision ChangesPath
1.25 +17 -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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- CommandLineOptions.java 9 Jul 2004 17:27:12 - 1.24
+++ CommandLineOptions.java 20 Jul 2004 21:28:50 - 1.25
@@ -34,6 +34,7 @@
// SAX
import org.xml.sax.XMLReader;
import org.xml.sax.SAXException;
+import javax.xml.parsers.SAXParserFactory;
// avalon configuration
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
@@ -434,7 +435,7 @@
if (userConfigFile == null) {
return;
}
-XMLReader parser = FOFileHandler.createParser();
+XMLReader parser = createParser();
DefaultConfigurationBuilder configBuilder
= new DefaultConfigurationBuilder(parser);
Configuration userConfig = null;
@@ -719,5 +720,20 @@
}
}
+/**
+ * Creates XMLReader object using default
+ * SAXParserFactory
+ * @return the created XMLReader
+ * @throws FOPException if the parser couldn't be created or configured for
proper operation.
+ */
+private XMLReader createParser() throws FOPException {
+try {
+SAXParserFactory factory = SAXParserFactory.newInstance();
+factory.setNamespaceAware(true);
+return factory.newSAXParser().getXMLReader();
+} catch (Exception e) {
+throw new FOPException("Couldn't create XMLReader", e);
+}
+}
}
1.6 +2 -35 xml-fop/src/java/org/apache/fop/apps/FOFileHandler.java
Index: FOFileHandler.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/FOFileHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FOFileHandler.java20 Jul 2004 03:39:24 - 1.5
+++ FOFileHandler.java20 Jul 2004 21:28:50 - 1.6
@@ -27,9 +27,7 @@
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-//JAXP
-import javax.xml.parsers.SAXParserFactory;
-import javax.xml.parsers.ParserConfigurationException;
+// JAXP
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.Source;
@@ -103,37 +101,6 @@
} catch (Exception e) {
throw new FOPException(e);
-}
-}
-
-/**
- * Creates XMLReader object using default
- * SAXParserFactory
- * @return the created XMLReader
- * @throws FOPException if the parser couldn't be created or configured for
proper operation.
- */
-protected static XMLReader createParser() throws FOPException {
-try {
-SAXParserFactory factory = SAXParserFactory.newInstance();
-factory.setNamespaceAware(true);
-return factory.newSAXParser().getXMLReader();
-} catch (SAXException se) {
-throw new FOPException("Couldn't create XMLReader", se);
-} catch (ParserConfigurationException pce) {
-throw new FOPException("Couldn't create XMLReader", pce);
-}
-}
-
-/**
- * Returns the fully qualified classname of the standard XML parser for FOP
- * to use.
- * @return the XML parser classname
- */
-public static final String getParserClassName() {
-try {
-return createParser().getClass().getName();
-} catch (FOPException e) {
-return null;
}
}
}
1.5 +17 -3
xml-fop/src/java/org/apache/fop/fo/ex
cvs commit: xml-fop/src/java/org/apache/fop/svg SVGUserAgent.java
bckfnn 2004/09/09 00:29:40 Modified:src/java/org/apache/fop/apps CommandLineOptions.java src/java/org/apache/fop/image BmpImage.java JimiImage.java JpegImage.java src/java/org/apache/fop/image/analyser SVGReader.java src/java/org/apache/fop/render/awt AWTRenderer.java src/java/org/apache/fop/render/mif MIFHandler.java src/java/org/apache/fop/render/xml XMLRenderer.java src/java/org/apache/fop/svg SVGUserAgent.java Log: Removed unneded import statements. Revision ChangesPath 1.29 +0 -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.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- CommandLineOptions.java 22 Aug 2004 01:56:33 - 1.28 +++ CommandLineOptions.java 9 Sep 2004 07:29:40 - 1.29 @@ -29,7 +29,6 @@ // commons logging import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.commons.logging.impl.SimpleLog; // SAX import org.xml.sax.XMLReader; 1.7 +0 -3 xml-fop/src/java/org/apache/fop/image/BmpImage.java Index: BmpImage.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/BmpImage.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- BmpImage.java 16 Aug 2004 19:29:04 - 1.6 +++ BmpImage.java 9 Sep 2004 07:29:40 - 1.7 @@ -22,9 +22,6 @@ import java.io.IOException; import java.awt.color.ColorSpace; -// FOP -import org.apache.commons.logging.Log; - /** * Bitmap image. * This supports loading a bitmap image into bitmap data. 1.8 +0 -2 xml-fop/src/java/org/apache/fop/image/JimiImage.java Index: JimiImage.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/JimiImage.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- JimiImage.java16 Aug 2004 19:29:04 - 1.7 +++ JimiImage.java9 Sep 2004 07:29:40 - 1.8 @@ -28,8 +28,6 @@ // Jimi import com.sun.jimi.core.Jimi; -import org.apache.commons.logging.Log; - /** * FopImage object for several images types, using Jimi. * See Jimi documentation for supported image types. 1.8 +0 -1 xml-fop/src/java/org/apache/fop/image/JpegImage.java Index: JpegImage.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/JpegImage.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- JpegImage.java16 Aug 2004 19:29:04 - 1.7 +++ JpegImage.java9 Sep 2004 07:29:40 - 1.8 @@ -24,7 +24,6 @@ import java.awt.color.ICC_Profile; // FOP -import org.apache.commons.logging.Log; import org.apache.fop.util.CMYKColorSpace; /** 1.9 +0 -2 xml-fop/src/java/org/apache/fop/image/analyser/SVGReader.java Index: SVGReader.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/analyser/SVGReader.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- SVGReader.java12 May 2004 23:19:52 - 1.8 +++ SVGReader.java9 Sep 2004 07:29:40 - 1.9 @@ -27,8 +27,6 @@ import org.w3c.dom.Element; import org.w3c.dom.svg.SVGDocument; -import org.apache.commons.logging.Log; - // Batik import org.apache.batik.dom.svg.SAXSVGDocumentFactory; import org.apache.batik.dom.svg.SVGOMDocument; 1.30 +0 -1 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java Index: AWTRenderer.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- AWTRenderer.java 18 Jul 2004 00:50:08 - 1.29 +++ AWTRenderer.java 9 Sep 2004 07:29:40 - 1.30 @@ -48,7 +48,6 @@ import org.apache.fop.fonts.FontInfo; import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; -import org.apache.fop.apps.InputHandler; import org.apache.fop.area.Area; import org.apache.fop.area.Page; import org.apache.fop.area.PageViewport; 1.14 +1 -2 xml-fop/src/java/org/apache/fop/render/mif/MIFHandler.java Index: MIFHandler.java
