gmazza 2004/05/21 20:59:53 Modified: examples/mathml/src/org/apache/fop/mathml MathMLElement.java examples/plan/src/org/apache/fop/plan PlanElement.java src/java/org/apache/fop/apps Driver.java src/java/org/apache/fop/fo FONode.java FOTreeBuilder.java FObj.java XMLElement.java XMLObj.java src/java/org/apache/fop/fo/extensions Outline.java src/java/org/apache/fop/fo/extensions/svg SVGElement.java src/java/org/apache/fop/fo/flow BasicLink.java Block.java BlockContainer.java ExternalGraphic.java Footnote.java FootnoteBody.java Inline.java InlineContainer.java ListBlock.java ListItem.java ListItemLabel.java Marker.java PageNumber.java RetrieveMarker.java Table.java TableBody.java TableCell.java TableColumn.java TableRow.java src/java/org/apache/fop/fo/pagination ConditionalPageMasterReference.java Flow.java LayoutMasterSet.java PageMasterReference.java PageSequence.java PageSequenceMaster.java Region.java RepeatablePageMasterAlternatives.java RepeatablePageMasterReference.java SimplePageMaster.java Log: Switched from handleAttrs() to more intuitive processNode() and (for FO namespace) addProperties() methods. Revision Changes Path 1.5 +5 -4 xml-fop/examples/mathml/src/org/apache/fop/mathml/MathMLElement.java Index: MathMLElement.java =================================================================== RCS file: /home/cvs/xml-fop/examples/mathml/src/org/apache/fop/mathml/MathMLElement.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- MathMLElement.java 27 Feb 2004 17:36:21 -0000 1.4 +++ MathMLElement.java 22 May 2004 03:59:49 -0000 1.5 @@ -56,10 +56,11 @@ } /** - * @see org.apache.fop.fo.FONode#handleAttrs(Attributes) + * @see org.apache.fop.fo.FONode#processNode */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); + public void processNode(String elementName, Locator locator, + Attributes attlist) throws FOPException { + super.processNode(elementName, locator, attlist); createBasicDocument(); } 1.5 +5 -4 xml-fop/examples/plan/src/org/apache/fop/plan/PlanElement.java Index: PlanElement.java =================================================================== RCS file: /home/cvs/xml-fop/examples/plan/src/org/apache/fop/plan/PlanElement.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- PlanElement.java 27 Feb 2004 17:37:50 -0000 1.4 +++ PlanElement.java 22 May 2004 03:59:51 -0000 1.5 @@ -44,10 +44,11 @@ } /** - * @see org.apache.fop.fo.FONode#handleAttrs(Attributes) + * @see org.apache.fop.fo.FONode#processNode */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); + public void processNode(String elementName, Locator locator, + Attributes attlist) throws FOPException { + super.processNode(elementName, locator, attlist); createBasicDocument(); } 1.60 +1 -3 xml-fop/src/java/org/apache/fop/apps/Driver.java Index: Driver.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- Driver.java 18 May 2004 11:42:07 -0000 1.59 +++ Driver.java 22 May 2004 03:59:51 -0000 1.60 @@ -229,7 +229,6 @@ throw new IllegalStateException("Driver already initialized"); } treeBuilder = new FOTreeBuilder(); - treeBuilder.setUserAgent(getUserAgent()); } /** @@ -511,7 +510,6 @@ foInputHandler.setLogger(getLogger()); - treeBuilder.setUserAgent(getUserAgent()); treeBuilder.setFOInputHandler(foInputHandler); treeBuilder.setFOTreeControl(currentDocument); 1.18 +14 -23 xml-fop/src/java/org/apache/fop/fo/FONode.java Index: FONode.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- FONode.java 22 Apr 2004 21:38:39 -0000 1.17 +++ FONode.java 22 May 2004 03:59:51 -0000 1.18 @@ -37,8 +37,10 @@ * */ public abstract class FONode { + /** Parent FO node */ protected FONode parent; + /** Name of the node */ protected String name; @@ -51,22 +53,14 @@ } /** - * Sets the name of the node. - * @param str the name + * Returns the user agent for the node. + * @return FOUserAgent */ - public void setName(String str) { - name = str; + public FOUserAgent getUserAgent() { + return getFOTreeControl().getDriver().getUserAgent(); } /** - * Sets the name of the node. - * @param str the name - */ - public void setLocation(Locator locator) { - // do nothing by default - } - - /** * Returns the logger for the node. * @return the logger */ @@ -75,19 +69,16 @@ } /** - * Returns the user agent for the node. - * @return FOUserAgent - */ - public FOUserAgent getUserAgent() { - return getFOTreeControl().getDriver().getUserAgent(); - } - - /** - * Do something with the attributes for this element + * Initialize the node with its name, location information, and attributes + * The attributes must be used immediately as the sax attributes + * will be altered for the next element. + * @param elementName element name (e.g., "fo:block") + * @param locator Locator object (ignored by default) * @param attlist Collection of attributes passed to us from the parser. * @throws FOPException for errors or inconsistencies in the attributes - */ - public void handleAttrs(Attributes attlist) throws FOPException { + */ + public void processNode(String elementName, Locator locator, Attributes attlist) throws FOPException { + this.name = elementName; } /** 1.27 +35 -55 xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java Index: FOTreeBuilder.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- FOTreeBuilder.java 19 May 2004 22:37:53 -0000 1.26 +++ FOTreeBuilder.java 22 May 2004 03:59:51 -0000 1.27 @@ -32,7 +32,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fop.apps.FOPException; -import org.apache.fop.apps.FOUserAgent; import org.apache.fop.fo.ElementMapping.Maker; import org.apache.fop.fo.pagination.Root; import org.xml.sax.Attributes; @@ -65,14 +64,14 @@ protected Set namespaces = new java.util.HashSet(); /** - * Current formatting object being handled + * The root of the formatting object tree */ - protected FONode currentFObj = null; + protected Root rootFObj = null; /** - * The root of the formatting object tree + * Current formatting object being handled */ - protected Root rootFObj = null; + protected FONode currentFObj = null; /** * The class that handles formatting and rendering to a stream @@ -80,12 +79,10 @@ */ private FOInputHandler foInputHandler; - private FOUserAgent userAgent; - /** The FOTreeControl object managing the FO Tree that is being built */ private FOTreeControl foTreeControl; - /** The SAX locator object maneging the line and column counters */ + /** The SAX locator object managing the line and column counters */ private Locator locator; /** @@ -95,22 +92,6 @@ setupDefaultMappings(); } - private Log getLogger() { - return log; - } - - /** - * Sets the user agent - * @param ua the user agent - */ - public void setUserAgent(FOUserAgent ua) { - userAgent = ua; - } - - private FOUserAgent getUserAgent() { - return userAgent; - } - /** * Sets the FO Tree Control for this object * @param fotc FOTreeControl instance @@ -146,7 +127,7 @@ try { addElementMapping(str); } catch (IllegalArgumentException e) { - getLogger().warn("Error while adding element mapping", e); + log.warn("Error while adding element mapping", e); } } @@ -209,23 +190,13 @@ } /** - * SAX Handler for the end of an element - * @see org.xml.sax.ContentHandler#endElement(String, String, String) - */ - public void endElement(String uri, String localName, String rawName) - throws SAXException { - currentFObj.end(); - currentFObj = currentFObj.getParent(); - } - - /** * SAX Handler for the start of the document * @see org.xml.sax.ContentHandler#startDocument() */ public void startDocument() throws SAXException { rootFObj = null; // allows FOTreeBuilder to be reused - if (getLogger().isDebugEnabled()) { - getLogger().debug("Building formatting object tree"); + if (log.isDebugEnabled()) { + log.debug("Building formatting object tree"); } foInputHandler.startDocument(); } @@ -237,8 +208,8 @@ public void endDocument() throws SAXException { rootFObj = null; currentFObj = null; - if (getLogger().isDebugEnabled()) { - getLogger().debug("Parsing of document complete"); + if (log.isDebugEnabled()) { + log.debug("Parsing of document complete"); } foInputHandler.endDocument(); } @@ -249,8 +220,9 @@ */ public void startElement(String namespaceURI, String localName, String rawName, Attributes attlist) throws SAXException { - /* the formatting object started */ - FONode fobj; + + /* the node found in the FO document */ + FONode foNode; /* the maker for the formatting object started */ ElementMapping.Maker fobjMaker = findFOMaker(namespaceURI, localName); @@ -258,27 +230,35 @@ // System.out.println("found a " + fobjMaker.toString()); try { - fobj = fobjMaker.make(currentFObj); - fobj.setName(localName); - fobj.setLocation(locator); - fobj.handleAttrs(attlist); + foNode = fobjMaker.make(currentFObj); + foNode.processNode(localName, locator, attlist); } catch (FOPException e) { throw new SAXException(e); } if (rootFObj == null) { - if (!fobj.getName().equals("fo:root")) { + if (!foNode.getName().equals("fo:root")) { throw new SAXException(new FOPException("Root element must" + " be fo:root, not " - + fobj.getName())); + + foNode.getName())); } - rootFObj = (Root)fobj; + rootFObj = (Root) foNode; rootFObj.setFOTreeControl(foTreeControl); } else { - currentFObj.addChild(fobj); + currentFObj.addChild(foNode); } - currentFObj = fobj; + currentFObj = foNode; + } + + /** + * SAX Handler for the end of an element + * @see org.xml.sax.ContentHandler#endElement(String, String, String) + */ + public void endElement(String uri, String localName, String rawName) + throws SAXException { + currentFObj.end(); + currentFObj = currentFObj.getParent(); } /** @@ -299,8 +279,8 @@ } if (fobjMaker == null) { - if (getLogger().isWarnEnabled()) { - getLogger().warn("Unknown formatting object " + namespaceURI + "^" + localName); + if (log.isWarnEnabled()) { + log.warn("Unknown formatting object " + namespaceURI + "^" + localName); } if (namespaces.contains(namespaceURI.intern())) { // fall back @@ -350,7 +330,7 @@ } String serviceFile = "META-INF/services/" + cls.getName(); - // getLogger().debug("File: " + serviceFile); + // log.debug("File: " + serviceFile); List lst = (List)providerMap.get(serviceFile); if (lst != null) { @@ -370,7 +350,7 @@ while (e.hasMoreElements()) { try { java.net.URL u = (java.net.URL)e.nextElement(); - //getLogger().debug("URL: " + u); + //log.debug("URL: " + u); InputStream is = u.openStream(); Reader r = new InputStreamReader(is, "UTF-8"); @@ -393,7 +373,7 @@ line = br.readLine(); continue; } - // getLogger().debug("Line: " + line); + // log.debug("Line: " + line); // Try and load the class // Object obj = cl.loadClass(line).newInstance(); 1.38 +36 -21 xml-fop/src/java/org/apache/fop/fo/FObj.java Index: FObj.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObj.java,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- FObj.java 25 Apr 2004 04:45:28 -0000 1.37 +++ FObj.java 22 May 2004 03:59:51 -0000 1.38 @@ -69,6 +69,15 @@ */ protected Map layoutDimension = null; + /** Marks input file containing this object **/ + public String systemId; + + /** Marks line number of this object in the input file **/ + public int line; + + /** Marks column number of this object in the input file **/ + public int column; + /** * Create a new formatting object. * All formatting object classes extend this class. @@ -88,39 +97,27 @@ } } - /** Marks input file containing this object **/ - public String systemId; - /** Marks line number of this object in the input file **/ - public int line; - /** Marks column number of this object in the input file **/ - public int column; - /** - * Set the name of this element. - * The prepends "fo:" to the name to indicate it is in the fo namespace. - * - * @param str the xml element name + * @see org.apache.fop.fo.FONode#processNode */ - public void setName(String str) { - name = "fo:" + str; - } + public void processNode(String elementName, Locator locator, + Attributes attlist) throws FOPException { + name = "fo:" + elementName; - public void setLocation(Locator locator) { if (locator != null) { line = locator.getLineNumber(); column = locator.getColumnNumber(); systemId = locator.getSystemId(); } + + addProperties(attlist); } - + /** - * Handle the attributes for this element. - * The attributes must be used immediately as the sax attributes - * will be altered for the next element. + * Set properties for this FO based on node attributes * @param attlist Collection of attributes passed to us from the parser. - * @throws FOPException for invalid FO data */ - public void handleAttrs(Attributes attlist) throws FOPException { + protected void addProperties(Attributes attlist) throws FOPException { FObj parentFO = findNearestAncestorFObj(); PropertyList parentPropertyList = null; if (parentFO != null) { @@ -135,6 +132,24 @@ } /** + * Set the name of this element. + * The prepends "fo:" to the name to indicate it is in the fo namespace. + * + * @param str the xml element name + */ + public void setName(String str) { + name = "fo:" + str; + } + + public void setLocation(Locator locator) { + if (locator != null) { + line = locator.getLineNumber(); + column = locator.getColumnNumber(); + systemId = locator.getSystemId(); + } + } + + /** * Find the nearest parent, grandparent, etc. FONode that is also an FObj * @return FObj the nearest ancestor FONode that is an FObj */ 1.7 +5 -6 xml-fop/src/java/org/apache/fop/fo/XMLElement.java Index: XMLElement.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/XMLElement.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- XMLElement.java 27 Feb 2004 17:57:40 -0000 1.6 +++ XMLElement.java 22 May 2004 03:59:51 -0000 1.7 @@ -20,6 +20,7 @@ // XML import org.xml.sax.Attributes; +import org.xml.sax.Locator; // FOP import org.apache.fop.apps.FOPException; @@ -41,13 +42,11 @@ } /** - * Process the attributes for this element. - * @param attlist the attribute list for this element returned by the SAX - * parser - * @throws FOPException for invalid attributes + * @see org.apache.fop.fo.FONode#processNode */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); + public void processNode(String elementName, Locator locator, + Attributes attlist) throws FOPException { + super.processNode(elementName, locator, attlist); init(); } 1.9 +5 -11 xml-fop/src/java/org/apache/fop/fo/XMLObj.java Index: XMLObj.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/XMLObj.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- XMLObj.java 27 Feb 2004 17:57:40 -0000 1.8 +++ XMLObj.java 22 May 2004 03:59:51 -0000 1.9 @@ -39,8 +39,10 @@ // temp reference for attributes private Attributes attr = null; + /** DOM element representing this node */ protected Element element; + /** DOM document containing this node */ protected Document doc; @@ -53,18 +55,10 @@ } /** - * @param str name of the element - */ - public void setName(String str) { - name = str; - } - - /** - * Store the attributes for this element - * @param attlist Collection of attributes passed to us from the parser. - * @throws FOPException for errors in the attributes + * @see org.apache.fop.fo.FONode#processNode */ - public void handleAttrs(Attributes attlist) throws FOPException { + public void processNode(String elementName, Locator locator, Attributes attlist) throws FOPException { + name = elementName; attr = attlist; } 1.4 +4 -5 xml-fop/src/java/org/apache/fop/fo/extensions/Outline.java Index: Outline.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/extensions/Outline.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Outline.java 27 Feb 2004 17:43:50 -0000 1.3 +++ Outline.java 22 May 2004 03:59:51 -0000 1.4 @@ -48,13 +48,12 @@ } /** - * The attribues on the outline object are the internal and external + * The attributes on the outline object are the internal and external * destination. One of these is required. * - * @param attlist the attribute list - * @throws FOPException a fop exception if there is an error + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { + protected void addProperties(Attributes attlist) throws FOPException { internalDestination = attlist.getValue("internal-destination"); externalDestination = 1.7 +6 -6 xml-fop/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java Index: SVGElement.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- SVGElement.java 27 Feb 2004 17:43:22 -0000 1.6 +++ SVGElement.java 22 May 2004 03:59:51 -0000 1.7 @@ -30,6 +30,7 @@ import org.w3c.dom.Element; import org.w3c.dom.svg.SVGDocument; import org.xml.sax.Attributes; +import org.xml.sax.Locator; import org.apache.batik.bridge.UnitProcessor; import org.apache.batik.util.SVGConstants; @@ -58,12 +59,11 @@ } /** - * Handle the xml attributes from SAX. - * @param attlist the attribute list - * @throws FOPException not thrown from here + * @see org.apache.fop.fo.FONode#processNode */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); + public void processNode(String elementName, Locator locator, + Attributes attlist) throws FOPException { + super.processNode(elementName, locator, attlist); init(); } 1.11 +8 -9 xml-fop/src/java/org/apache/fop/fo/flow/BasicLink.java Index: BasicLink.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BasicLink.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- BasicLink.java 27 Feb 2004 17:44:23 -0000 1.10 +++ BasicLink.java 22 May 2004 03:59:51 -0000 1.11 @@ -49,6 +49,14 @@ super(parent); } + /** + * @see org.apache.fop.fo.FObj#addProperties + */ + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); + getFOTreeControl().getFOInputHandler().startLink(this); + } + public void setup() { String destination; int linkType; @@ -129,15 +137,6 @@ fotv.serveBasicLink(this); } - /** - * @see org.apache.fop.fo.FObj#handleAttrs - */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); - - getFOTreeControl().getFOInputHandler().startLink(this); - } - /** * @see org.apache.fop.fo.FONode#end */ 1.16 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Block.java Index: Block.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Block.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Block.java 2 Apr 2004 15:01:05 -0000 1.15 +++ Block.java 22 May 2004 03:59:51 -0000 1.16 @@ -96,10 +96,10 @@ } /** - * @see org.apache.fop.fo.FObj#handleAttrs + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); this.span = this.propertyList.get(PR_SPAN).getEnum(); this.wsTreatment = this.propertyList.get(PR_WHITE_SPACE_TREATMENT).getEnum(); 1.10 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/BlockContainer.java Index: BlockContainer.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BlockContainer.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- BlockContainer.java 27 Feb 2004 17:44:23 -0000 1.9 +++ BlockContainer.java 22 May 2004 03:59:51 -0000 1.10 @@ -57,10 +57,10 @@ } /** - * @see org.apache.fop.fo.FObj#handleAttrs + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); this.span = this.propertyList.get(PR_SPAN).getEnum(); setupID(); } 1.24 +8 -8 xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java Index: ExternalGraphic.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ExternalGraphic.java 12 May 2004 23:19:52 -0000 1.23 +++ ExternalGraphic.java 22 May 2004 03:59:51 -0000 1.24 @@ -59,6 +59,14 @@ } /** + * @see org.apache.fop.fo.FObj#addProperties + */ + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); + getFOTreeControl().getFOInputHandler().image(this); + } + + /** * Setup this image. * This gets the sizes for the image and the dimensions and clipping. */ @@ -234,12 +242,4 @@ return placement; } - /** - * @see org.apache.fop.fo.FObj#handleAttrs - */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); - - getFOTreeControl().getFOInputHandler().image(this); - } } 1.8 +8 -10 xml-fop/src/java/org/apache/fop/fo/flow/Footnote.java Index: Footnote.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Footnote.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Footnote.java 27 Feb 2004 17:44:24 -0000 1.7 +++ Footnote.java 22 May 2004 03:59:51 -0000 1.8 @@ -44,6 +44,14 @@ } /** + * @see org.apache.fop.fo.FObj#addProperties + */ + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); + getFOTreeControl().getFOInputHandler().startFootnote(this); + } + + /** * @param child child FONode to be added to this object */ public void addChild(FONode child) { @@ -69,18 +77,8 @@ fotv.serveFootnote(this); } - /** - * @see org.apache.fop.fo.FObj#handleAttrs - */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); - - getFOTreeControl().getFOInputHandler().startFootnote(this); - } - protected void end() { super.end(); - getFOTreeControl().getFOInputHandler().endFootnote(this); } } 1.7 +7 -8 xml-fop/src/java/org/apache/fop/fo/flow/FootnoteBody.java Index: FootnoteBody.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/FootnoteBody.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- FootnoteBody.java 27 Feb 2004 17:44:24 -0000 1.6 +++ FootnoteBody.java 22 May 2004 03:59:51 -0000 1.7 @@ -47,17 +47,16 @@ super(parent); } - public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveFootnoteBody(this); - } - /** - * @see org.apache.fop.fo.FObj#handleAttrs + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); - + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); getFOTreeControl().getFOInputHandler().startFootnoteBody(this); + } + + public void acceptVisitor(FOTreeVisitor fotv) { + fotv.serveFootnoteBody(this); } protected void end() { 1.11 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Inline.java Index: Inline.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Inline.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Inline.java 27 Feb 2004 17:44:24 -0000 1.10 +++ Inline.java 22 May 2004 03:59:51 -0000 1.11 @@ -56,10 +56,10 @@ } /** - * @see org.apache.fop.fo.FObj#handleAttrs + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); if (parent.getName().equals("fo:flow")) { throw new FOPException("inline formatting objects cannot" 1.9 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/InlineContainer.java Index: InlineContainer.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/InlineContainer.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- InlineContainer.java 27 Feb 2004 17:44:24 -0000 1.8 +++ InlineContainer.java 22 May 2004 03:59:51 -0000 1.9 @@ -45,10 +45,10 @@ } /** - * @see org.apache.fop.fo.FObj#handleAttrs + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); // Common Border, Padding, and Background Properties CommonBorderAndPadding bap = propMgr.getBorderAndPadding(); CommonBackground bProps = propMgr.getBackgroundProps(); 1.11 +8 -9 xml-fop/src/java/org/apache/fop/fo/flow/ListBlock.java Index: ListBlock.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListBlock.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ListBlock.java 27 Feb 2004 17:44:24 -0000 1.10 +++ ListBlock.java 22 May 2004 03:59:51 -0000 1.11 @@ -59,6 +59,14 @@ super(parent); } + /** + * @see org.apache.fop.fo.FObj#addProperties + */ + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); + getFOTreeControl().getFOInputHandler().startList(this); + } + private void setup() throws FOPException { // Common Accessibility Properties @@ -128,15 +136,6 @@ fotv.serveListBlock(this); } - /** - * @see org.apache.fop.fo.FObj#handleAttrs - */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); - - getFOTreeControl().getFOInputHandler().startList(this); - } - protected void end() { super.end(); 1.12 +8 -10 xml-fop/src/java/org/apache/fop/fo/flow/ListItem.java Index: ListItem.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItem.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ListItem.java 27 Feb 2004 17:44:24 -0000 1.11 +++ ListItem.java 22 May 2004 03:59:51 -0000 1.12 @@ -59,6 +59,14 @@ super(parent); } + /** + * @see org.apache.fop.fo.FObj#addProperties + */ + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); + getFOTreeControl().getFOInputHandler().startListItem(this); + } + private void setup() { // Common Accessibility Properties @@ -138,18 +146,8 @@ fotv.serveListItem(this); } - /** - * @see org.apache.fop.fo.FObj#handleAttrs - */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); - - getFOTreeControl().getFOInputHandler().startListItem(this); - } - protected void end() { super.end(); - getFOTreeControl().getFOInputHandler().endListItem(this); } } 1.13 +8 -9 xml-fop/src/java/org/apache/fop/fo/flow/ListItemLabel.java Index: ListItemLabel.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItemLabel.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ListItemLabel.java 27 Feb 2004 17:44:24 -0000 1.12 +++ ListItemLabel.java 22 May 2004 03:59:51 -0000 1.13 @@ -41,6 +41,14 @@ super(parent); } + /** + * @see org.apache.fop.fo.FObj#addProperties + */ + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); + getFOTreeControl().getFOInputHandler().startListLabel(); + } + private void setup() { // Common Accessibility Properties @@ -75,15 +83,6 @@ fotv.serveListItemLabel(this); } - /** - * @see org.apache.fop.fo.FObj#handleAttrs - */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); - - getFOTreeControl().getFOInputHandler().startListLabel(); - } - protected void end() { super.end(); 1.8 +3 -9 xml-fop/src/java/org/apache/fop/fo/flow/Marker.java Index: Marker.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Marker.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Marker.java 27 Feb 2004 17:44:24 -0000 1.7 +++ Marker.java 22 May 2004 03:59:51 -0000 1.8 @@ -46,16 +46,10 @@ } /** - * Handle the attributes for this marker. - * This gets the marker-class-name and attempts to add itself - * to the parent formatting object. - * - * @param attlist the attribute list - * @throws FOPException if there is an exception + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); - + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); this.markerClassName = this.propertyList.get(PR_MARKER_CLASS_NAME).getString(); } 1.20 +9 -11 xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java Index: PageNumber.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- PageNumber.java 27 Feb 2004 17:44:24 -0000 1.19 +++ PageNumber.java 22 May 2004 03:59:51 -0000 1.20 @@ -55,6 +55,15 @@ super(parent); } + /** + * @see org.apache.fop.fo.FObj#addProperties + */ + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); + setup(); + getFOTreeControl().getFOInputHandler().startPageNumber(this); + } + public void setup() { // Common Accessibility Properties @@ -117,17 +126,6 @@ */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.servePageNumber(this); - } - - /** - * @see org.apache.fop.fo.FObj#handleAttrs - */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); - - setup(); - - getFOTreeControl().getFOInputHandler().startPageNumber(this); } protected void end() { 1.8 +3 -5 xml-fop/src/java/org/apache/fop/fo/flow/RetrieveMarker.java Index: RetrieveMarker.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/RetrieveMarker.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- RetrieveMarker.java 27 Feb 2004 17:44:24 -0000 1.7 +++ RetrieveMarker.java 22 May 2004 03:59:51 -0000 1.8 @@ -46,12 +46,10 @@ } /** - * Handle the attributes for the retrieve-marker. - * - * @see org.apache.fop.fo.FONode#handleAttrs(Attributes) + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); this.retrieveClassName = this.propertyList.get(PR_RETRIEVE_CLASS_NAME).getString(); this.retrievePosition = 1.15 +9 -11 xml-fop/src/java/org/apache/fop/fo/flow/Table.java Index: Table.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Table.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Table.java 27 Feb 2004 17:44:24 -0000 1.14 +++ Table.java 22 May 2004 03:59:51 -0000 1.15 @@ -76,6 +76,15 @@ } /** + * @see org.apache.fop.fo.FObj#addProperties + */ + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); + setupID(); + getFOTreeControl().getFOInputHandler().startTable(this); + } + + /** * Overrides FObj. * @param child FONode child object to be added */ @@ -191,17 +200,6 @@ */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveTable(this); - } - - /** - * @see org.apache.fop.fo.FObj#handleAttrs - */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); - - setupID(); - - getFOTreeControl().getFOInputHandler().startTable(this); } protected void end() { 1.11 +9 -11 xml-fop/src/java/org/apache/fop/fo/flow/TableBody.java Index: TableBody.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableBody.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- TableBody.java 27 Feb 2004 17:44:24 -0000 1.10 +++ TableBody.java 22 May 2004 03:59:51 -0000 1.11 @@ -51,6 +51,15 @@ super(parent); } + /** + * @see org.apache.fop.fo.FObj#addProperties + */ + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); + setupID(); + getFOTreeControl().getFOInputHandler().startBody(this); + } + private void setup() throws FOPException { // Common Accessibility Properties CommonAccessibility mAccProps = propMgr.getAccessibilityProps(); @@ -92,17 +101,6 @@ */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveTableBody(this); - } - - /** - * @see org.apache.fop.fo.FObj#handleAttrs - */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); - - setupID(); - - getFOTreeControl().getFOInputHandler().startBody(this); } protected void end() { 1.13 +3 -6 xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java Index: TableCell.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- TableCell.java 27 Feb 2004 17:44:24 -0000 1.12 +++ TableCell.java 22 May 2004 03:59:51 -0000 1.13 @@ -118,14 +118,11 @@ } /** - * Overriden from FObj. - * @param attlist Collection of attributes passed to us from the parser. - * @throws FOPException for FO errors + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); doSetup(); // init some basic property values - getFOTreeControl().getFOInputHandler().startCell(this); } 1.16 +9 -12 xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java Index: TableColumn.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- TableColumn.java 15 May 2004 21:51:59 -0000 1.15 +++ TableColumn.java 22 May 2004 03:59:52 -0000 1.16 @@ -55,6 +55,15 @@ } /** + * @see org.apache.fop.fo.FObj#addProperties + */ + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); + initialize(); // init some basic property values + getFOTreeControl().getFOInputHandler().startColumn(this); + } + + /** * @return Length object containing column width */ public Length getColumnWidth() { @@ -112,18 +121,6 @@ */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveTableColumn(this); - } - - /** - * Overriden from FObj. - * @param attlist Collection of attributes passed to us from the parser. - * @throws FOPException for FO errors - */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); - initialize(); // init some basic property values - - getFOTreeControl().getFOInputHandler().startColumn(this); } protected void end() { 1.16 +9 -11 xml-fop/src/java/org/apache/fop/fo/flow/TableRow.java Index: TableRow.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableRow.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- TableRow.java 27 Feb 2004 17:44:24 -0000 1.15 +++ TableRow.java 22 May 2004 03:59:52 -0000 1.16 @@ -63,6 +63,15 @@ } /** + * @see org.apache.fop.fo.FObj#addProperties + */ + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); + setupID(); + getFOTreeControl().getFOInputHandler().startRow(this); + } + + /** * @return keepWithPrevious */ public KeepValue getKeepWithPrevious() { @@ -133,17 +142,6 @@ */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveTableRow(this); - } - - /** - * @see org.apache.fop.fo.FObj#handleAttrs - */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); - - setupID(); - - getFOTreeControl().getFOInputHandler().startRow(this); } protected void end() { 1.9 +3 -3 xml-fop/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java Index: ConditionalPageMasterReference.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ConditionalPageMasterReference.java 27 Feb 2004 17:45:13 -0000 1.8 +++ ConditionalPageMasterReference.java 22 May 2004 03:59:53 -0000 1.9 @@ -53,10 +53,10 @@ } /** - * @see org.apache.fop.fo.FONode#handleAttrs(Attributes) + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); if (getProperty(PR_MASTER_REFERENCE) != null) { setMasterName(getProperty(PR_MASTER_REFERENCE).getString()); } 1.9 +4 -6 xml-fop/src/java/org/apache/fop/fo/pagination/Flow.java Index: Flow.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Flow.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Flow.java 27 Feb 2004 17:45:13 -0000 1.8 +++ Flow.java 22 May 2004 03:59:53 -0000 1.9 @@ -63,12 +63,10 @@ } /** - * @see org.apache.fop.fo.FObj#handleAttrs - * @param attlist Collection of attributes passed to us from the parser. - * @throws FOPException if parent is not a page-sequence object + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); if (parent.getName().equals("fo:page-sequence")) { this.pageSequence = (PageSequence) parent; } else { 1.7 +3 -3 xml-fop/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java Index: LayoutMasterSet.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- LayoutMasterSet.java 9 May 2004 20:45:15 -0000 1.6 +++ LayoutMasterSet.java 22 May 2004 03:59:53 -0000 1.7 @@ -53,10 +53,10 @@ } /** - * @see org.apache.fop.fo.FONode#handleAttrs(Attributes) + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); if (parent.getName().equals("fo:root")) { Root root = (Root)parent; 1.6 +3 -3 xml-fop/src/java/org/apache/fop/fo/pagination/PageMasterReference.java Index: PageMasterReference.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageMasterReference.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- PageMasterReference.java 27 Feb 2004 17:45:13 -0000 1.5 +++ PageMasterReference.java 22 May 2004 03:59:53 -0000 1.6 @@ -44,10 +44,10 @@ } /** - * @see org.apache.fop.fo.FONode#handleAttrs(Attributes) + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); if (getProperty(PR_MASTER_REFERENCE) != null) { this.masterName = getProperty(PR_MASTER_REFERENCE).getString(); } 1.21 +3 -9 xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java Index: PageSequence.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- PageSequence.java 18 Apr 2004 02:50:46 -0000 1.20 +++ PageSequence.java 22 May 2004 03:59:53 -0000 1.21 @@ -130,16 +130,10 @@ } /** - * Handle the attributes for this xml element. - * For the page sequence this gets all the appropriate properties - * for dealing with the page sequence. - * - * @param attlist the attribute list - * @throws FOPException if there is an error with the properties + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); - + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); if (parent.getName().equals("fo:root")) { this.root = (Root)parent; // this.root.addPageSequence(this); 1.8 +3 -5 xml-fop/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java Index: PageSequenceMaster.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- PageSequenceMaster.java 9 Mar 2004 21:50:43 -0000 1.7 +++ PageSequenceMaster.java 22 May 2004 03:59:53 -0000 1.8 @@ -59,13 +59,11 @@ } /** - * @see org.apache.fop.fo.FONode#handleAttrs(Attributes) + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); - + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); subSequenceSpecifiers = new java.util.ArrayList(); - if (parent.getName().equals("fo:layout-master-set")) { this.layoutMasterSet = (LayoutMasterSet)parent; masterName = this.propertyList.get(Constants.PR_MASTER_NAME).getString(); 1.19 +3 -3 xml-fop/src/java/org/apache/fop/fo/pagination/Region.java Index: Region.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Region.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- Region.java 9 May 2004 20:45:15 -0000 1.18 +++ Region.java 22 May 2004 03:59:53 -0000 1.19 @@ -62,10 +62,10 @@ } /** - * @see org.apache.fop.fo.FONode#handleAttrs(Attributes) + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); // regions may have name, or default if (null == this.propertyList.get(PR_REGION_NAME)) { 1.6 +3 -4 xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java Index: RepeatablePageMasterAlternatives.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- RepeatablePageMasterAlternatives.java 27 Feb 2004 17:45:13 -0000 1.5 +++ RepeatablePageMasterAlternatives.java 22 May 2004 03:59:53 -0000 1.6 @@ -58,11 +58,10 @@ } /** - * @see org.apache.fop.fo.FONode#handleAttrs(Attributes) + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); - + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); conditionalPageMasterRefs = new ArrayList(); if (parent.getName().equals("fo:page-sequence-master")) { 1.6 +3 -4 xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java Index: RepeatablePageMasterReference.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- RepeatablePageMasterReference.java 27 Feb 2004 17:45:13 -0000 1.5 +++ RepeatablePageMasterReference.java 22 May 2004 03:59:53 -0000 1.6 @@ -49,11 +49,10 @@ } /** - * @see org.apache.fop.fo.FONode#handleAttrs(Attributes) + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); - + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); String mr = getProperty(PR_MAXIMUM_REPEATS).getString(); if (mr.equals("no-limit")) { this.maximumRepeats = INFINITE; 1.16 +3 -3 xml-fop/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java Index: SimplePageMaster.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- SimplePageMaster.java 9 May 2004 20:45:15 -0000 1.15 +++ SimplePageMaster.java 22 May 2004 03:59:53 -0000 1.16 @@ -53,10 +53,10 @@ } /** - * @see org.apache.fop.fo.FONode#handleAttrs(Attributes) + * @see org.apache.fop.fo.FObj#addProperties */ - public void handleAttrs(Attributes attlist) throws FOPException { - super.handleAttrs(attlist); + protected void addProperties(Attributes attlist) throws FOPException { + super.addProperties(attlist); if (parent.getName().equals("fo:layout-master-set")) { LayoutMasterSet layoutMasterSet = (LayoutMasterSet)parent;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]