You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2009/10/21 18:32:00 UTC
svn commit: r828090 - in
/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop:
accessibility/ apps/ cli/ render/pdf/ util/
Author: vhennebert
Date: Wed Oct 21 16:31:59 2009
New Revision: 828090
URL: http://svn.apache.org/viewvc?rev=828090&view=rev
Log:
Renamed TransformerNode into TransformerDefaultHandler and moved it into the a.o.f.util package.
Renamed TransformerNodeEndProcessing into AccessibilityPreprocessor.
Renamed AccessibilityUtil into Accessibility and simplified the code.
Added:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/Accessibility.java
- copied, changed from r825554, xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/AccessibilityUtil.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/AccessibilityPreprocessor.java
- copied, changed from r825554, xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/TransformerNodeEndProcessing.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/util/TransformerDefaultHandler.java
- copied, changed from r825554, xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/TransformerNode.java
Removed:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/AccessibilityUtil.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/TransformerNode.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/TransformerNodeEndProcessing.java
Modified:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/apps/FOUserAgent.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/apps/Fop.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/CommandLineOptions.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
Copied: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/Accessibility.java (from r825554, xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/AccessibilityUtil.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/Accessibility.java?p2=xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/Accessibility.java&p1=xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/AccessibilityUtil.java&r1=825554&r2=828090&rev=828090&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/AccessibilityUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/Accessibility.java Wed Oct 21 16:31:59 2009
@@ -21,8 +21,10 @@
import javax.xml.transform.Source;
import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamSource;
import org.xml.sax.helpers.DefaultHandler;
@@ -31,22 +33,25 @@
import org.apache.fop.apps.FOUserAgent;
/**
- * Utility class for FOP's accessibility features. It provides the stylesheets used for processing
- * the incoming XSL-FO stream and for setting up the transformation.
+ * Helper class for FOP's accessibility features.
*/
-public class AccessibilityUtil {
+public final class Accessibility {
/** Constant string for the rendering options key to enable accessibility features. */
public static final String ACCESSIBILITY = "accessibility";
+ // TODO what if the default factory is not a SAXTransformerFactory?
private static SAXTransformerFactory tfactory
- = (SAXTransformerFactory)SAXTransformerFactory.newInstance();
+ = (SAXTransformerFactory)SAXTransformerFactory.newInstance();
private static Templates addPtrTemplates;
- private static Templates reduceFOTemplates;
+
+ private static Templates reduceFOTreeTemplates;
+
+ private Accessibility() { }
/**
- * Decorates the given {@link DefaultHandler} so the structure tree used for accessibility
+ * Decorates the given handler so the structure tree used for accessibility
* features can be branched off the main content stream.
* @param handler the handler to decorate
* @param userAgent the user agent
@@ -55,46 +60,28 @@
*/
public static DefaultHandler decorateDefaultHandler(DefaultHandler handler,
FOUserAgent userAgent) throws FOPException {
- DefaultHandler transformNode = new TransformerNodeEndProcessing(
- getAddPtrTemplates(), handler, userAgent);
- return transformNode;
+ try {
+ setupTemplates();
+ TransformerHandler addPtr = tfactory.newTransformerHandler(addPtrTemplates);
+ Transformer reduceFOTree = reduceFOTreeTemplates.newTransformer();
+ return new AccessibilityPreprocessor(addPtr, reduceFOTree, userAgent, handler);
+ } catch (TransformerConfigurationException e) {
+ throw new FOPException(e);
+ }
}
- /**
- * Returns the addPtr.xsl stylesheet.
- * @return the addPtr.xsl stylesheet
- * @throws FOPException if transform fails
- */
- public static synchronized Templates getAddPtrTemplates() throws FOPException {
+ private static synchronized void setupTemplates() throws TransformerConfigurationException {
if (addPtrTemplates == null) {
- //Load and cache stylesheet
- Source src = new StreamSource(
- AccessibilityUtil.class.getResource("addPtr.xsl").toExternalForm());
- try {
- addPtrTemplates = tfactory.newTemplates(src);
- } catch (TransformerConfigurationException e) {
- throw new FOPException(e);
- }
+ addPtrTemplates = loadTemplates("addPtr.xsl");
+ }
+ if (reduceFOTreeTemplates == null) {
+ reduceFOTreeTemplates = loadTemplates("reduceFOTree.xsl");
}
- return addPtrTemplates;
}
- /**
- * Returns the reduceFOTree.xsl stylesheet
- * @return the reduceFOTree.xsl stylesheet
- * @throws FOPException if an error occurs loading the stylesheet
- */
- public static synchronized Templates getReduceFOTreeTemplates() throws FOPException {
- if (reduceFOTemplates == null) {
- //Load and cache stylesheet
- Source src = new StreamSource(
- AccessibilityUtil.class.getResource("reduceFOTree.xsl").toExternalForm());
- try {
- reduceFOTemplates = tfactory.newTemplates(src);
- } catch (TransformerConfigurationException e) {
- throw new FOPException(e);
- }
- }
- return reduceFOTemplates;
+ private static Templates loadTemplates(String source) throws TransformerConfigurationException {
+ Source src = new StreamSource(Accessibility.class.getResource(source).toExternalForm());
+ return tfactory.newTemplates(src);
}
- }
\ No newline at end of file
+
+}
Copied: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/AccessibilityPreprocessor.java (from r825554, xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/TransformerNodeEndProcessing.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/AccessibilityPreprocessor.java?p2=xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/AccessibilityPreprocessor.java&p1=xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/TransformerNodeEndProcessing.java&r1=825554&r2=828090&rev=828090&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/TransformerNodeEndProcessing.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/AccessibilityPreprocessor.java Wed Oct 21 16:31:59 2009
@@ -24,11 +24,10 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import javax.xml.transform.Result;
import javax.xml.transform.Source;
-import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
@@ -38,35 +37,31 @@
import org.apache.commons.io.output.ByteArrayOutputStream;
-import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.util.TransformerDefaultHandler;
/**
- * An extension of TransformerNode used to run 2nd transform after completion of first
+ * This class prepares an XSL-FO document for accessibility. It adds a unique
+ * identifier to every applicable FO, then creates the structure tree, before
+ * handing the document over to the regular handler.
*/
-class TransformerNodeEndProcessing extends TransformerNode {
+class AccessibilityPreprocessor extends TransformerDefaultHandler {
private final ByteArrayOutputStream enrichedFOBuffer = new ByteArrayOutputStream();
- private DefaultHandler delegateHandler = null;
+
+ private final Transformer reduceFOTree;
+
private final FOUserAgent userAgent;
- /**
- * Do a transform, but perform special processing at the end for the access
- * stuff.
- *
- * @param xsltTemplates Transform to do.
- * @param fopHandler Used in the end processing
- * @param userAgent the userAgent
- * @throws FOPException
- * if transform fails
- */
- public TransformerNodeEndProcessing(Templates xsltTemplates, DefaultHandler fopHandler,
- FOUserAgent userAgent) throws FOPException {
- super(xsltTemplates);
- delegateHandler = fopHandler;
+ private final DefaultHandler fopHandler;
+
+ public AccessibilityPreprocessor(TransformerHandler addPtr, Transformer reduceFOTree,
+ FOUserAgent userAgent, DefaultHandler fopHandler) {
+ super(addPtr);
+ this.reduceFOTree = reduceFOTree;
this.userAgent = userAgent;
- Result res1 = new StreamResult(enrichedFOBuffer);
- super.initResult(res1);
+ this.fopHandler = fopHandler;
+ getTransformerHandler().setResult(new StreamResult(enrichedFOBuffer));
}
/** {@inheritDoc} */
@@ -76,10 +71,9 @@
try {
//TODO this must be optimized, no buffering (ex. SAX-based tee-proxy)
byte[] enrichedFO = enrichedFOBuffer.toByteArray();
- Transformer transformer = AccessibilityUtil.getReduceFOTreeTemplates().newTransformer();
Source src = new StreamSource(new ByteArrayInputStream(enrichedFO));
DOMResult res = new DOMResult();
- transformer.transform(src, res);
+ reduceFOTree.transform(src, res);
StructureTree structureTree = new StructureTree();
NodeList pageSequences = res.getNode().getFirstChild().getChildNodes();
for (int i = 0; i < pageSequences.getLength(); i++) {
@@ -92,12 +86,10 @@
saxParserFactory.setValidating(false);
SAXParser saxParser = saxParserFactory.newSAXParser();
InputStream in = new ByteArrayInputStream(enrichedFO);
- saxParser.parse(in, delegateHandler);
+ saxParser.parse(in, fopHandler);
} catch (Exception e) {
- // TODO Auto-generated catch block
throw new SAXException(e);
}
-
}
}
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/apps/FOUserAgent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/apps/FOUserAgent.java?rev=828090&r1=828089&r2=828090&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/apps/FOUserAgent.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/apps/FOUserAgent.java Wed Oct 21 16:31:59 2009
@@ -37,7 +37,7 @@
import org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext;
import org.apache.fop.Version;
-import org.apache.fop.accessibility.AccessibilityUtil;
+import org.apache.fop.accessibility.Accessibility;
import org.apache.fop.accessibility.StructureTree;
import org.apache.fop.events.DefaultEventBroadcaster;
import org.apache.fop.events.Event;
@@ -655,7 +655,7 @@
*/
public void setAccessibility(boolean accessibility) {
if (accessibility) {
- getRendererOptions().put(AccessibilityUtil.ACCESSIBILITY, Boolean.TRUE);
+ getRendererOptions().put(Accessibility.ACCESSIBILITY, Boolean.TRUE);
}
}
@@ -664,7 +664,7 @@
* @return true if accessibility is enabled
*/
public boolean isAccessibilityEnabled() {
- Boolean enabled = (Boolean)this.getRendererOptions().get(AccessibilityUtil.ACCESSIBILITY);
+ Boolean enabled = (Boolean)this.getRendererOptions().get(Accessibility.ACCESSIBILITY);
if (enabled != null) {
return enabled.booleanValue();
} else {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/apps/Fop.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/apps/Fop.java?rev=828090&r1=828089&r2=828090&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/apps/Fop.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/apps/Fop.java Wed Oct 21 16:31:59 2009
@@ -24,7 +24,7 @@
import org.xml.sax.helpers.DefaultHandler;
-import org.apache.fop.accessibility.AccessibilityUtil;
+import org.apache.fop.accessibility.Accessibility;
import org.apache.fop.fo.FOTreeBuilder;
/**
@@ -112,7 +112,7 @@
createDefaultHandler();
}
if (this.foUserAgent.isAccessibilityEnabled()) {
- return AccessibilityUtil.decorateDefaultHandler(this.foTreeBuilder, foUserAgent);
+ return Accessibility.decorateDefaultHandler(this.foTreeBuilder, foUserAgent);
} else {
return this.foTreeBuilder;
}
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/CommandLineOptions.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/CommandLineOptions.java?rev=828090&r1=828089&r2=828090&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/CommandLineOptions.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/CommandLineOptions.java Wed Oct 21 16:31:59 2009
@@ -36,7 +36,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.fop.Version;
-import org.apache.fop.accessibility.AccessibilityUtil;
+import org.apache.fop.accessibility.Accessibility;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.FopFactory;
@@ -342,7 +342,7 @@
} else if (args[i].equals("-if")) {
i = i + parseIntermediateFormatOption(args, i);
} else if (args[i].equals("-a")) {
- this.renderingOptions.put(AccessibilityUtil.ACCESSIBILITY, Boolean.TRUE);
+ this.renderingOptions.put(Accessibility.ACCESSIBILITY, Boolean.TRUE);
} else if (args[i].equals("-v")) {
/* Currently just print the version */
printVersion();
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java?rev=828090&r1=828089&r2=828090&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java Wed Oct 21 16:31:59 2009
@@ -37,7 +37,7 @@
import org.apache.xmlgraphics.xmp.schemas.XMPBasicAdapter;
import org.apache.xmlgraphics.xmp.schemas.XMPBasicSchema;
-import org.apache.fop.accessibility.AccessibilityUtil;
+import org.apache.fop.accessibility.Accessibility;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.fo.extensions.xmp.XMPMetadata;
import org.apache.fop.pdf.PDFAMode;
@@ -164,7 +164,7 @@
}
if (this.pdfAMode.isPDFA1LevelA()) {
//Enable accessibility if PDF/A-1a is enabled because it requires tagged PDF.
- userAgent.getRendererOptions().put(AccessibilityUtil.ACCESSIBILITY, Boolean.TRUE);
+ userAgent.getRendererOptions().put(Accessibility.ACCESSIBILITY, Boolean.TRUE);
}
s = (String)userAgent.getRendererOptions().get(PDF_X_MODE);
if (s != null) {
Copied: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/util/TransformerDefaultHandler.java (from r825554, xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/TransformerNode.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/util/TransformerDefaultHandler.java?p2=xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/util/TransformerDefaultHandler.java&p1=xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/TransformerNode.java&r1=825554&r2=828090&rev=828090&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/accessibility/TransformerNode.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/util/TransformerDefaultHandler.java Wed Oct 21 16:31:59 2009
@@ -17,60 +17,43 @@
/* $Id$ */
-package org.apache.fop.accessibility;
+package org.apache.fop.util;
-import javax.xml.transform.Result;
-import javax.xml.transform.Templates;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TransformerHandler;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+import org.xml.sax.ext.DefaultHandler2;
import org.xml.sax.helpers.AttributesImpl;
-import org.xml.sax.helpers.DefaultHandler;
-
-import org.apache.fop.apps.FOPException;
/**
- * Used for accessibility to run required xslt transforms
+ * A DefaultHandler implementation that delegates all the method calls to a
+ * {@link TransformerHandler} instance.
*/
-class TransformerNode extends DefaultHandler {
+public class TransformerDefaultHandler extends DefaultHandler2 {
private TransformerHandler transformerHandler;
/**
- * This is part of a two phase construction. Call this, then call
- * initResult.
+ * Creates a new instance delegating to the given TransformerHandler object.
*
- * @param xsltTemplates
- * for transform
- * @throws FOPException
- * for general errors
+ * @param transformerHandler the object to which all the method calls will
+ * be delegated
*/
- public TransformerNode(Templates xsltTemplates) throws FOPException {
- try {
- TransformerFactory transFact = TransformerFactory.newInstance();
- SAXTransformerFactory saxTFactory = ((SAXTransformerFactory)transFact);
- transformerHandler = saxTFactory.newTransformerHandler(xsltTemplates);
- } catch (TransformerConfigurationException t) {
- throw new FOPException(t);
- }
+ public TransformerDefaultHandler(TransformerHandler transformerHandler) {
+ this.transformerHandler = transformerHandler;
}
/**
- * Call this after calling constructor for xsltFile only above.
+ * Returns the delegate TransformerHandler instance.
*
- * @param result
- * of transform
+ * @return the object to which all method calls are delegated
*/
- public void initResult(Result result) {
- transformerHandler.setResult(result);
+ public TransformerHandler getTransformerHandler() {
+ return transformerHandler;
}
- /******************** start of ContentHandler ***************************/
/** {@inheritDoc} */
public void setDocumentLocator(Locator locator) {
transformerHandler.setDocumentLocator(locator);
@@ -87,15 +70,25 @@
}
/** {@inheritDoc} */
- public void processingInstruction(String target, String data) throws SAXException {
- transformerHandler.processingInstruction(target, data);
+ public void startPrefixMapping(String prefix, String uri) throws SAXException {
+ transformerHandler.startPrefixMapping(prefix, uri);
}
/** {@inheritDoc} */
- public void startElement(String uri, String local, String raw, Attributes attrs)
+ public void endPrefixMapping(String string) throws SAXException {
+ transformerHandler.endPrefixMapping(string);
+ }
+
+ /** {@inheritDoc} */
+ public void startElement(String uri, String localName, String qName, Attributes attrs)
throws SAXException {
AttributesImpl ai = new AttributesImpl(attrs);
- transformerHandler.startElement(uri, local, raw, ai);
+ transformerHandler.startElement(uri, localName, qName, ai);
+ }
+
+ /** {@inheritDoc} */
+ public void endElement(String uri, String localName, String qName) throws SAXException {
+ transformerHandler.endElement(uri, localName, qName);
}
/** {@inheritDoc} */
@@ -109,108 +102,59 @@
}
/** {@inheritDoc} */
- public void endElement(String uri, String local, String raw) throws SAXException {
- transformerHandler.endElement(uri, local, raw);
+ public void processingInstruction(String target, String data) throws SAXException {
+ transformerHandler.processingInstruction(target, data);
}
/** {@inheritDoc} */
- public void skippedEntity(String string) throws SAXException {
- transformerHandler.skippedEntity(string);
+ public void skippedEntity(String name) throws SAXException {
+ transformerHandler.skippedEntity(name);
}
/** {@inheritDoc} */
- public void startPrefixMapping(String string, String string1) throws SAXException {
- transformerHandler.startPrefixMapping(string, string1);
+ public void notationDecl(String name, String publicId, String systemId) throws SAXException {
+ transformerHandler.notationDecl(name, publicId, systemId);
}
/** {@inheritDoc} */
- public void endPrefixMapping(String string) throws SAXException {
- transformerHandler.endPrefixMapping(string);
+ public void unparsedEntityDecl(String name, String publicId, String systemId,
+ String notationName) throws SAXException {
+ transformerHandler.unparsedEntityDecl(name, publicId, systemId, notationName);
}
- /***************************** LexicalHandlerImpl **************************/
- /**
- * @param name
- * - param1
- * @param pid
- * - param2
- * @param lid
- * - param3
- * @throws SAXException
- * - if parser fails
- */
+ /** {@inheritDoc} */
public void startDTD(String name, String pid, String lid) throws SAXException {
transformerHandler.startDTD(name, pid, lid);
}
- /**
- * End of DTD
- *
- * @throws SAXException
- * - if parser fails
- */
+ /** {@inheritDoc} */
public void endDTD() throws SAXException {
transformerHandler.endDTD();
}
- /**
- * startEnitity.
- *
- * @param string
- * - param 1
- * @throws SAXException
- * - if parser fails
- */
- public void startEntity(String string) throws SAXException {
- transformerHandler.startEntity(string);
+ /** {@inheritDoc} */
+ public void startEntity(String name) throws SAXException {
+ transformerHandler.startEntity(name);
}
- /**
- * end Entity
- *
- * @param string
- * - param 1
- * @throws SAXException
- * - if paser fails
- */
- public void endEntity(String string) throws SAXException {
- transformerHandler.endEntity(string);
+ /** {@inheritDoc} */
+ public void endEntity(String name) throws SAXException {
+ transformerHandler.endEntity(name);
}
- /**
- * Start of CDATA section
- *
- * @throws SAXException
- * - parser fails
- */
+ /** {@inheritDoc} */
public void startCDATA() throws SAXException {
transformerHandler.startCDATA();
}
- /**
- * endCDATA section
- *
- * @throws SAXException
- * - if paser fails
- */
+ /** {@inheritDoc} */
public void endCDATA() throws SAXException {
transformerHandler.endCDATA();
}
- /**
- *
- * @param charArray
- * - the characters
- * @param int1
- * - param 2
- * @param int2
- * - param 3
- * @throws SAXException
- * - if paser fails
- */
- public void comment(char[] charArray, int int1, int int2) throws SAXException {
- transformerHandler.comment(charArray, int1, int2);
+ /** {@inheritDoc} */
+ public void comment(char[] charArray, int start, int length) throws SAXException {
+ transformerHandler.comment(charArray, start, length);
}
- /******************** End of Lexical Handler ***********************/
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org