Author: jeremias
Date: Mon Feb 16 08:31:34 2009
New Revision: 744860
URL: http://svn.apache.org/viewvc?rev=744860&view=rev
Log:
Added ErrorListener for plan extension's DOM loading because of bugs in some
XSLT implementations.
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java?rev=744860&r1=744859&r2=744860&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java
Mon Feb 16 08:31:34 2009
@@ -22,6 +22,7 @@
import java.io.IOException;
import java.io.InputStream;
+import javax.xml.transform.ErrorListener;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
@@ -43,6 +44,7 @@
import org.apache.xmlgraphics.image.loader.impl.ImageXMLDOM;
import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.fop.util.DefaultErrorListener;
import org.apache.fop.util.UnclosableInputStream;
/**
@@ -71,21 +73,16 @@
InputStream in = new
UnclosableInputStream(ImageUtil.needInputStream(src));
try {
- TransformerFactory tFactory = TransformerFactory.newInstance();
- Transformer transformer = tFactory.newTransformer();
- Source source = new StreamSource(in);
- DOMResult res = new DOMResult();
- transformer.transform(source, res);
-
- //Have to render the plan to know its size
- PlanRenderer pr = new PlanRenderer();
- Document planDoc = (Document)res.getNode();
+ Document planDoc = getDocument(in);
Element rootEl = planDoc.getDocumentElement();
- if
(!PlanElementMapping.NAMESPACE.equals(rootEl.getNamespaceURI())) {
+ if (!PlanElementMapping.NAMESPACE.equals(
+ rootEl.getNamespaceURI())) {
in.reset();
return null;
}
+ //Have to render the plan to know its size
+ PlanRenderer pr = new PlanRenderer();
Document svgDoc = pr.createSVGDocument(planDoc);
float width = pr.getWidth();
float height = pr.getHeight();
@@ -119,4 +116,19 @@
}
}
+ private Document getDocument(InputStream in) throws TransformerException {
+ TransformerFactory tFactory = TransformerFactory.newInstance();
+ //Custom error listener to minimize output to console
+ ErrorListener errorListener = new DefaultErrorListener(log);
+ tFactory.setErrorListener(errorListener);
+ Transformer transformer = tFactory.newTransformer();
+ transformer.setErrorListener(errorListener);
+ Source source = new StreamSource(in);
+ DOMResult res = new DOMResult();
+ transformer.transform(source, res);
+
+ Document doc = (Document)res.getNode();
+ return doc;
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
