Return-Path: Delivered-To: apmail-xmlgraphics-fop-commits-archive@www.apache.org Received: (qmail 55656 invoked from network); 11 Nov 2005 13:29:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Nov 2005 13:29:44 -0000 Received: (qmail 70491 invoked by uid 500); 11 Nov 2005 13:29:44 -0000 Delivered-To: apmail-xmlgraphics-fop-commits-archive@xmlgraphics.apache.org Received: (qmail 70465 invoked by uid 500); 11 Nov 2005 13:29:43 -0000 Mailing-List: contact fop-commits-help@xmlgraphics.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: fop-dev@xmlgraphics.apache.org Delivered-To: mailing list fop-commits@xmlgraphics.apache.org Received: (qmail 70454 invoked by uid 99); 11 Nov 2005 13:29:43 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Nov 2005 05:29:43 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 11 Nov 2005 05:29:33 -0800 Received: (qmail 55514 invoked by uid 65534); 11 Nov 2005 13:29:20 -0000 Message-ID: <20051111132920.55513.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r332545 - in /xmlgraphics/fop/trunk: examples/mathml/src/org/apache/fop/mathml/ examples/plan/src/org/apache/fop/plan/ src/java/org/apache/fop/fo/ src/java/org/apache/fop/fo/extensions/svg/ src/java/org/apache/fop/fo/flow/ src/java/org/apac... Date: Fri, 11 Nov 2005 13:29:04 -0000 To: fop-commits@xmlgraphics.apache.org From: jeremias@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jeremias Date: Fri Nov 11 05:27:34 2005 New Revision: 332545 URL: http://svn.apache.org/viewcvs?rev=332545&view=rev Log: Made the FO tree a little more consistent by renaming getName() to getLocalName() and adding additional methods like: getNamespaceURI() and getNormalNamespacePrefix(). getName() now returns the fully qualified name combined from getLocalName() and getNormalNamespacePrefix(). For special cases you can call getName(String) to return a different namespace prefix. Modified: xmlgraphics/fop/trunk/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanElement.java xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanObj.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/UnknownXMLObj.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLObj.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BasicLink.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BidiOverride.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Character.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ExternalGraphic.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Float.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Footnote.java (contents, props changed) xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/FootnoteBody.java (contents, props changed) xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InitialPropertySet.java (contents, props changed) xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Inline.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineContainer.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListBlock.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItem.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItemBody.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItemLabel.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Marker.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiCase.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiProperties.java (contents, props changed) xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiPropertySet.java (contents, props changed) xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiSwitch.java (contents, props changed) xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiToggle.java (contents, props changed) xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/PageNumber.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/PageNumberCitation.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/RetrieveMarker.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableAndCaption.java (contents, props changed) xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableBody.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableCaption.java (contents, props changed) xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableCell.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableColumn.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFooter.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableHeader.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableRow.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Wrapper.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/ColorProfile.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Declarations.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Flow.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionAfter.java (contents, props changed) xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java (contents, props changed) xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBody.java (contents, props changed) xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionEnd.java (contents, props changed) xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionStart.java (contents, props changed) xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/StaticContent.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Title.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/AbstractPSExtensionObject.java xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSPageSetupCodeElement.java xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSSetupCodeElement.java xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/TestObj.java Modified: xmlgraphics/fop/trunk/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java (original) +++ xmlgraphics/fop/trunk/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,11 +34,14 @@ super(parent); } - /** - * @see org.apache.fop.fo.XMLObj#getNameSpace() - */ - public String getNameSpace() { + /** @see org.apache.fop.fo.FONode#getNamespaceURI() */ + public String getNamespaceURI() { return MathMLElementMapping.NAMESPACE; + } + + /** @see org.apache.fop.fo.FONode#getNormalNamespacePrefix() */ + public String getNormalNamespacePrefix() { + return "mathml"; } } Modified: xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanElement.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanElement.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanElement.java (original) +++ xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanElement.java Fri Nov 11 05:27:34 2005 @@ -86,10 +86,8 @@ return doc; } - /** - * @see org.apache.fop.fo.XMLObj#getDocumentNamespace() - */ - public String getDocumentNamespace() { + /** @see org.apache.fop.fo.FONode#getNamespaceURI() */ + public String getNamespaceURI() { if (svgDoc == null) { return PlanElementMapping.NAMESPACE; } Modified: xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanObj.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanObj.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanObj.java (original) +++ xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanObj.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,11 +37,14 @@ super(parent); } - /** - * @see org.apache.fop.fo.XMLObj#getNameSpace() - */ - public String getNameSpace() { - return "http://xml.apache.org/fop/plan"; + /** @see org.apache.fop.fo.FONode#getNamespaceURI() */ + public String getNamespaceURI() { + return PlanElementMapping.NAMESPACE; + } + + /** @see org.apache.fop.fo.FONode#getNormalNamespacePrefix() */ + public String getNormalNamespacePrefix() { + return "plan"; } } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java Fri Nov 11 05:27:34 2005 @@ -454,13 +454,42 @@ } /** - * Returns the name of the node - * @return the name of this node + * Returns the fully qualified name of the node + * @return the fully qualified name of this node */ public String getName() { - return null; + return getName(getNormalNamespacePrefix()); + } + + /** + * Returns the fully qualified name of the node + * @param prefix the namespace prefix to build the name with (may be null) + * @return the fully qualified name of this node + */ + public String getName(String prefix) { + if (prefix != null) { + StringBuffer sb = new StringBuffer(); + sb.append(prefix).append(':').append(getLocalName()); + return sb.toString(); + } else { + return getLocalName(); + } } + /** + * Returns the local name (i.e. without namespace prefix) of the node + * @return the local name of this node + */ + public abstract String getLocalName(); + + /** @return the normally ussed namespace prefix for this kind of node (ex. "fo" for XSL-FO) */ + public abstract String getNormalNamespacePrefix(); + + /** @return the namespace URI for this node */ + public String getNamespaceURI() { + return null; + } + /** * Returns the Constants class integer value of this node * @return the integer enumeration of this FO (e.g., FO_ROOT) Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java Fri Nov 11 05:27:34 2005 @@ -596,6 +596,11 @@ return textDecoration; } + /** @return the baseline-shift property */ + public Length getBaseLineShift() { + return baselineShift; + } + /** @see java.lang.Object#toString() */ public String toString() { StringBuffer sb = new StringBuffer(super.toString()); @@ -603,8 +608,14 @@ return sb.toString(); } - public Length getBaseLineShift() { - return baselineShift; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return null; + } + + /** @see org.apache.fop.fo.FONode#getNormalNamespacePrefix() */ + public String getNormalNamespacePrefix() { + return null; } } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java Fri Nov 11 05:27:34 2005 @@ -412,6 +412,17 @@ return -1; } + + /** @see org.apache.fop.fo.FONode#getNamespaceURI() */ + public String getNamespaceURI() { + return FOElementMapping.URI; + } + + /** @see org.apache.fop.fo.FONode#getNormalNamespacePrefix() */ + public String getNormalNamespacePrefix() { + return "fo"; + } + /** * Add a new extension attachment to this FObj. See org.apache.fop.fo.FONode for details. * @param attachment the attachment to add. Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/UnknownXMLObj.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/UnknownXMLObj.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/UnknownXMLObj.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/UnknownXMLObj.java Fri Nov 11 05:27:34 2005 @@ -61,13 +61,16 @@ this.namespace = space; } - /** - * @see XMLObj#getNameSpace - */ - public String getNameSpace() { + /** @see org.apache.fop.fo.FONode#getNamespaceURI() */ + public String getNamespaceURI() { return this.namespace; } + /** @see org.apache.fop.fo.FONode#getNormalNamespacePrefix() */ + public String getNormalNamespacePrefix() { + return null; //We don't know that in this case. + } + /** * @see org.apache.fop.fo.FONode#addChildNode(FONode) */ @@ -88,5 +91,6 @@ } super.addCharacters(data, start, length, pList, locator); } + } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLObj.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLObj.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLObj.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLObj.java Fri Nov 11 05:27:34 2005 @@ -91,27 +91,11 @@ return null; } - /** - * Returns the name of the object - * @return the name of this object - */ - public String getName() { + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { return name; } - /** - * @return string containing the namespace for this node - */ - public abstract String getNameSpace(); - - /** - * @return string containing the namespace for this document (which is the - * same namespace as for this node ??) - */ - public String getDocumentNamespace() { - return getNameSpace(); - } - private static HashMap ns = new HashMap(); static { ns.put("xlink", "http://www.w3.org/1999/xlink"); @@ -124,7 +108,7 @@ */ public void addElement(Document doc, Element parent) { this.doc = doc; - element = doc.createElementNS(getNameSpace(), name); + element = doc.createElementNS(getNamespaceURI(), name); for (int count = 0; count < attr.getLength(); count++) { String rf = attr.getValue(count); @@ -222,5 +206,6 @@ org.w3c.dom.Text text = doc.createTextNode(str); element.appendChild(text); } + } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java Fri Nov 11 05:27:34 2005 @@ -44,6 +44,7 @@ */ private final String getAParserClassName() { try { + //TODO Remove when Batik uses JAXP instead of SAX directly. SAXParserFactory factory = SAXParserFactory.newInstance(); return factory.newSAXParser().getXMLReader().getClass().getName(); } catch (Exception e) { Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java Fri Nov 11 05:27:34 2005 @@ -26,8 +26,9 @@ * This aids in the construction of the SVG Document. */ public class SVGObj extends XMLObj { + /** - * constructs an svg object (called by Maker). + * Constructs an SVG object (called by Maker). * * @param parent the parent formatting object */ @@ -35,12 +36,15 @@ super(parent); } - /** - * Get the namespace for svg. - * @return the svg namespace - */ - public String getNameSpace() { - return "http://www.w3.org/2000/svg"; + /** @see org.apache.fop.fo.FONode#getNamespaceURI() */ + public String getNamespaceURI() { + return SVGElementMapping.URI; + } + + /** @see org.apache.fop.fo.FONode#getNormalNamespacePrefix() */ + public String getNormalNamespacePrefix() { + return "svg"; } + } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BasicLink.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BasicLink.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BasicLink.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BasicLink.java Fri Nov 11 05:27:34 2005 @@ -127,16 +127,12 @@ return externalDestination; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:basic-link"; + /** @see org.apache.fop.fo.FObj#getLocalName() */ + public String getLocalName() { + return "basic-link"; } - /** - * @see org.apache.fop.fo.FObj#getNameId() - */ + /** @see org.apache.fop.fo.FObj#getNameId() */ public int getNameId() { return FO_BASIC_LINK; } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BidiOverride.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BidiOverride.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BidiOverride.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BidiOverride.java Fri Nov 11 05:27:34 2005 @@ -21,7 +21,6 @@ import org.xml.sax.Locator; import org.apache.fop.apps.FOPException; -import org.apache.fop.datatypes.Length; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FObjMixed; import org.apache.fop.fo.PropertyList; @@ -131,11 +130,9 @@ return lineHeight; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:bidi-override"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "bidi-override"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java Fri Nov 11 05:27:34 2005 @@ -18,7 +18,6 @@ package org.apache.fop.fo.flow; -import java.util.Iterator; import org.xml.sax.Locator; import org.apache.fop.apps.FOPException; @@ -516,11 +515,9 @@ return NullCharIterator.getInstance(); } - /** - * @see org.apache.fop.fo.FONode#getName() - */ - public String getName() { - return "fo:block"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "block"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java Fri Nov 11 05:27:34 2005 @@ -259,11 +259,9 @@ return height; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:block-container"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "block-container"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Character.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Character.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Character.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Character.java Fri Nov 11 05:27:34 2005 @@ -257,11 +257,9 @@ return wordSpacing; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:character"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "character"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ExternalGraphic.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ExternalGraphic.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ExternalGraphic.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ExternalGraphic.java Fri Nov 11 05:27:34 2005 @@ -104,11 +104,9 @@ return url; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:external-graphic"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "external-graphic"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Float.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Float.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Float.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Float.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -80,11 +80,9 @@ } } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:float"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "float"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Footnote.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Footnote.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Footnote.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Footnote.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -125,11 +125,9 @@ return footnoteBody; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:footnote"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "footnote"; } /** Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Footnote.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/FootnoteBody.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/FootnoteBody.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/FootnoteBody.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/FootnoteBody.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -80,11 +80,9 @@ } } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:footnote-body"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "footnote-body"; } /** Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/FootnoteBody.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InitialPropertySet.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InitialPropertySet.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InitialPropertySet.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InitialPropertySet.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -/* $Id:$ */ +/* $Id$ */ package org.apache.fop.fo.flow; @@ -106,11 +106,9 @@ return lineHeight; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:initial-property-set"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "initial-property-set"; } /** Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InitialPropertySet.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Inline.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Inline.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Inline.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Inline.java Fri Nov 11 05:27:34 2005 @@ -189,11 +189,9 @@ return new InlineCharIterator(this, commonBorderPaddingBackground); } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:inline"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "inline"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineContainer.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineContainer.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineContainer.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineContainer.java Fri Nov 11 05:27:34 2005 @@ -175,11 +175,9 @@ return id; } - /** - * @see org.apache.fop.fo.FONode#getName() - */ - public String getName() { - return "fo:inline-container"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "inline-container"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java Fri Nov 11 05:27:34 2005 @@ -79,11 +79,9 @@ } } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:instream-foreign-object"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "instream-foreign-object"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java Fri Nov 11 05:27:34 2005 @@ -192,11 +192,9 @@ return dominantBaseline; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:leader"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "leader"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListBlock.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListBlock.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListBlock.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListBlock.java Fri Nov 11 05:27:34 2005 @@ -173,11 +173,9 @@ return id; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:list-block"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "list-block"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItem.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItem.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItem.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItem.java Fri Nov 11 05:27:34 2005 @@ -207,11 +207,9 @@ return body; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:list-item"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "list-item"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItemBody.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItemBody.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItemBody.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItemBody.java Fri Nov 11 05:27:34 2005 @@ -49,11 +49,9 @@ getFOEventHandler().endListBody(); } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:list-item-body"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "list-item-body"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItemLabel.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItemLabel.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItemLabel.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItemLabel.java Fri Nov 11 05:27:34 2005 @@ -49,11 +49,9 @@ getFOEventHandler().endListLabel(); } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:list-item-label"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "list-item-label"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Marker.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Marker.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Marker.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Marker.java Fri Nov 11 05:27:34 2005 @@ -139,11 +139,9 @@ return markerClassName; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:marker"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "marker"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiCase.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiCase.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiCase.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiCase.java Fri Nov 11 05:27:34 2005 @@ -76,11 +76,9 @@ return startingState; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:multi-case"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "multi-case"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiProperties.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiProperties.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiProperties.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiProperties.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -111,11 +111,9 @@ return id; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:multi-properties"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "multi-properties"; } /** Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiProperties.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiPropertySet.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiPropertySet.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiPropertySet.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiPropertySet.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -74,18 +74,14 @@ invalidChildError(loc, nsURI, localName); } - /** - * Return the "id" property. - */ + /** @return the "id" property. */ public String getId() { return id; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:multi-property-set"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "multi-property-set"; } /** Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiPropertySet.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiSwitch.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiSwitch.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiSwitch.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiSwitch.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -90,18 +90,14 @@ } } - /** - * Return the "id" property. - */ + /** @return the "id" property. */ public String getId() { return id; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:multi-switch"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "multi-switch"; } /** Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiSwitch.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiToggle.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiToggle.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiToggle.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiToggle.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -72,11 +72,9 @@ } } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:multi-toggle"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "multi-toggle"; } /** Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiToggle.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/PageNumber.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/PageNumber.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/PageNumber.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/PageNumber.java Fri Nov 11 05:27:34 2005 @@ -197,9 +197,9 @@ return lineHeight; } - /** @see org.apache.fop.fo.FONode#getName() */ - public String getName() { - return "fo:page-number"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "page-number"; } /** @see org.apache.fop.fo.FObj#getNameId() */ Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/PageNumberCitation.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/PageNumberCitation.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/PageNumberCitation.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/PageNumberCitation.java Fri Nov 11 05:27:34 2005 @@ -202,9 +202,9 @@ return refId; } - /** @see org.apache.fop.fo.FObj#getName() */ - public String getName() { - return "fo:page-number-citation"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "page-number-citation"; } /** @see org.apache.fop.fo.FObj#getNameId() */ Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/RetrieveMarker.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/RetrieveMarker.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/RetrieveMarker.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/RetrieveMarker.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -225,11 +225,9 @@ } } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:retrieve-marker"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "retrieve-marker"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java Fri Nov 11 05:27:34 2005 @@ -401,11 +401,9 @@ return id; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:table"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "table"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableAndCaption.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableAndCaption.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableAndCaption.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableAndCaption.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -143,18 +143,14 @@ } } - /** - * Return the "id" property. - */ + /** @return the "id" property. */ public String getId() { return id; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:table-and-caption"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "table-and-caption"; } /** Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableAndCaption.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableBody.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableBody.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableBody.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableBody.java Fri Nov 11 05:27:34 2005 @@ -265,11 +265,9 @@ return commonBorderPaddingBackground; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:table-body"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "table-body"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableCaption.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableCaption.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableCaption.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableCaption.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -123,18 +123,14 @@ } } - /** - * Return the "id" property. - */ + /** @return the "id" property. */ public String getId() { return id; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:table-caption"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "table-caption"; } /** Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableCaption.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableCell.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableCell.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableCell.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableCell.java Fri Nov 11 05:27:34 2005 @@ -383,11 +383,9 @@ return (endsRow == EN_TRUE); } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:table-cell"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "table-cell"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableColumn.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableColumn.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableColumn.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableColumn.java Fri Nov 11 05:27:34 2005 @@ -150,9 +150,9 @@ return numberColumnsSpanned.getValue(); } - /** @see org.apache.fop.fo.FONode#getName() */ - public String getName() { - return "fo:table-column"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "table-column"; } /** @see org.apache.fop.fo.FObj#getNameId() */ Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFooter.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFooter.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFooter.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFooter.java Fri Nov 11 05:27:34 2005 @@ -54,16 +54,12 @@ // convertCellsToRows(); } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:table-footer"; + /** @see org.apache.fop.fo.FObj#getLocalName() */ + public String getLocalName() { + return "table-footer"; } - /** - * @see org.apache.fop.fo.FObj#getNameId() - */ + /** @see org.apache.fop.fo.FObj#getNameId() */ public int getNameId() { return FO_TABLE_FOOTER; } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableHeader.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableHeader.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableHeader.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableHeader.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,16 +54,12 @@ // convertCellsToRows(); } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:table-header"; + /** @see org.apache.fop.fo.FObj#getLocalName() */ + public String getLocalName() { + return "table-header"; } - /** - * @see org.apache.fop.fo.FObj#getNameId() - */ + /** @see org.apache.fop.fo.FObj#getNameId() */ public int getNameId() { return FO_TABLE_HEADER; } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableRow.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableRow.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableRow.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableRow.java Fri Nov 11 05:27:34 2005 @@ -279,9 +279,9 @@ return commonBorderPaddingBackground; } - /** @see org.apache.fop.fo.FObj#getName() */ - public String getName() { - return "fo:table-row"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "table-row"; } /** @see org.apache.fop.fo.FObj#getNameId() */ Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Wrapper.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Wrapper.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Wrapper.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Wrapper.java Fri Nov 11 05:27:34 2005 @@ -81,18 +81,14 @@ } } - /** - * Return the "id" property. - */ + /** @return the "id" property. */ public String getId() { return id; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:wrapper"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "wrapper"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/ColorProfile.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/ColorProfile.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/ColorProfile.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/ColorProfile.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -111,11 +111,9 @@ } } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:color-profile"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "color-profile"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java Fri Nov 11 05:27:34 2005 @@ -146,11 +146,9 @@ return masterReference; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:conditional-page-master-reference"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "conditional-page-master-reference"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Declarations.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Declarations.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Declarations.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Declarations.java Fri Nov 11 05:27:34 2005 @@ -106,8 +106,8 @@ /** * @see org.apache.fop.fo.FObj#getName() */ - public String getName() { - return "fo:declarations"; + public String getLocalName() { + return "declarations"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Flow.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Flow.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Flow.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Flow.java Fri Nov 11 05:27:34 2005 @@ -120,11 +120,9 @@ return flowName; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:flow"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "flow"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java Fri Nov 11 05:27:34 2005 @@ -214,11 +214,9 @@ return false; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:layout-master-set"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "layout-master-set"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java Fri Nov 11 05:27:34 2005 @@ -500,11 +500,9 @@ return masterReference; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:page-sequence"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "page-sequence"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java Fri Nov 11 05:27:34 2005 @@ -210,11 +210,9 @@ return pageMaster; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:page-sequence-master"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "page-sequence-master"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java Fri Nov 11 05:27:34 2005 @@ -73,32 +73,24 @@ } } - /** - * Return the "id" property. - */ + /** @return the "id" property. */ public String getId() { return id; } - /** - * Return the "id" property. - */ + /** @return the "index-class" property. */ public String getIndexClass() { return indexClass; } - /** - * Return the "id" property. - */ + /** @return the "index-key" property. */ public String getIndexKey() { return indexKey; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:page-sequence-wrapper"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "page-sequence-wrapper"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionAfter.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionAfter.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionAfter.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionAfter.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -88,11 +88,9 @@ return "xsl-region-after"; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:region-after"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "region-after"; } /** Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionAfter.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -85,11 +85,9 @@ return vpRect; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:region-before"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "region-before"; } /** Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBody.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBody.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBody.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBody.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -149,11 +149,9 @@ return "xsl-region-body"; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:region-body"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "region-body"; } /** Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBody.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionEnd.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionEnd.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionEnd.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionEnd.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -86,11 +86,9 @@ return "xsl-region-end"; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:region-end"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "region-end"; } /** Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionEnd.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionStart.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionStart.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionStart.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionStart.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -83,11 +83,9 @@ return "xsl-region-start"; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:region-start"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "region-start"; } /** Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionStart.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java Fri Nov 11 05:27:34 2005 @@ -164,9 +164,9 @@ } } - /** @see org.apache.fop.fo.FONode#getName() */ - public String getName() { - return "fo:repeatable-page-master-alternatives"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "repeatable-page-master-alternatives"; } /** @see org.apache.fop.fo.FObj#getNameId() */ Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java Fri Nov 11 05:27:34 2005 @@ -133,9 +133,9 @@ } } - /** @see org.apache.fop.fo.FObj#getName() */ - public String getName() { - return "fo:repeatable-page-master-reference"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "repeatable-page-master-reference"; } /** @see org.apache.fop.fo.FObj#getNameId() */ Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java Fri Nov 11 05:27:34 2005 @@ -265,11 +265,9 @@ return this; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:root"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "root"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java Fri Nov 11 05:27:34 2005 @@ -263,11 +263,9 @@ return referenceOrientation.getValue(); } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:simple-page-master"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "simple-page-master"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java Fri Nov 11 05:27:34 2005 @@ -109,9 +109,9 @@ } } - /** @see org.apache.fop.fo.FONode#getName() */ - public String getName() { - return "fo:single-page-master-reference"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "single-page-master-reference"; } /** @see org.apache.fop.fo.FObj#getNameId() */ Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/StaticContent.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/StaticContent.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/StaticContent.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/StaticContent.java Fri Nov 11 05:27:34 2005 @@ -71,16 +71,12 @@ } } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:static-content"; + /** @see org.apache.fop.fo.FObj#getLocalName() */ + public String getLocalName() { + return "static-content"; } - /** - * @see org.apache.fop.fo.FObj#getNameId() - */ + /** @see org.apache.fop.fo.FObj#getNameId() */ public int getNameId() { return FO_STATIC_CONTENT; } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Title.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Title.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Title.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Title.java Fri Nov 11 05:27:34 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,8 +54,8 @@ /** * @see org.apache.fop.fo.FObj#getName() */ - public String getName() { - return "fo:title"; + public String getLocalName() { + return "title"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java Fri Nov 11 05:27:34 2005 @@ -143,11 +143,9 @@ return childBookmarks; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:bookmark"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "bookmark"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java Fri Nov 11 05:27:34 2005 @@ -76,11 +76,9 @@ return title; } - /** - * @see org.apache.fop.fo.FObj#getName() - */ - public String getName() { - return "fo:bookmark-title"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "bookmark-title"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java Fri Nov 11 05:27:34 2005 @@ -79,8 +79,9 @@ return bookmarks; } - public String getName() { - return "fo:bookmark-tree"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "bookmark-tree"; } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java Fri Nov 11 05:27:34 2005 @@ -48,7 +48,7 @@ XMLObj child = (XMLObj) fobj.getChildXMLObj(); org.w3c.dom.Document doc = child.getDOMDocument(); - String ns = child.getDocumentNamespace(); + String ns = child.getNamespaceURI(); return new ForeignObject(doc, ns); } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/AbstractPSExtensionObject.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/AbstractPSExtensionObject.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/AbstractPSExtensionObject.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/AbstractPSExtensionObject.java Fri Nov 11 05:27:34 2005 @@ -64,11 +64,16 @@ } } - /** @see org.apache.fop.fo.XMLObj#getNameSpace() */ - public String getNameSpace() { + /** @see org.apache.fop.fo.FONode#getNamespaceURI() */ + public String getNamespaceURI() { return PSExtensionElementMapping.NAMESPACE; } + /**@see org.apache.fop.fo.FONode#getNormalNamespacePrefix() */ + public String getNormalNamespacePrefix() { + return "fox"; + } + /** @see org.apache.fop.fo.FONode#processNode */ public void processNode(String elementName, Locator locator, Attributes attlist, PropertyList propertyList) @@ -92,5 +97,6 @@ public ExtensionAttachment getExtensionAttachment() { return this.setupCode; } + } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSPageSetupCodeElement.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSPageSetupCodeElement.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSPageSetupCodeElement.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSPageSetupCodeElement.java Fri Nov 11 05:27:34 2005 @@ -44,9 +44,9 @@ } } - /** @see org.apache.fop.fo.FONode#getName() */ - public String getName() { - return "fox:ps-page-setup-code"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "ps-page-setup-code"; } } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSSetupCodeElement.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSSetupCodeElement.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSSetupCodeElement.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSSetupCodeElement.java Fri Nov 11 05:27:34 2005 @@ -44,9 +44,9 @@ } } - /** @see org.apache.fop.fo.FONode#getName() */ - public String getName() { - return "fox:ps-setup-code"; + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "ps-setup-code"; } } Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java (original) +++ xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java Fri Nov 11 05:27:34 2005 @@ -87,5 +87,10 @@ } + /** @see org.apache.fop.fo.FONode#getLocalName() */ + public String getLocalName() { + return "assert"; + } + } Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java (original) +++ xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java Fri Nov 11 05:27:34 2005 @@ -41,13 +41,6 @@ if (foObjs == null) { foObjs = new java.util.HashMap(); foObjs.put("assert", new AssertMaker()); - foObjs.put(DEFAULT, new TestMaker()); - } - } - - static class TestMaker extends ElementMapping.Maker { - public FONode make(FONode parent) { - return new TestObj(parent); } } Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/TestObj.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/TestObj.java?rev=332545&r1=332544&r2=332545&view=diff ============================================================================== --- xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/TestObj.java (original) +++ xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/TestObj.java Fri Nov 11 05:27:34 2005 @@ -23,9 +23,9 @@ import org.apache.fop.fo.FObj; /** - * Catch all FOP Test objects as default element. + * Base class for all FOP Test objects. */ -public class TestObj extends FObj { +public abstract class TestObj extends FObj { /** * @see org.apache.fop.fo.FONode#FONode(FONode) @@ -34,11 +34,10 @@ super(parent); } - /** - * @see org.apache.fop.fo.XMLObj#getNameSpace() - */ - public String getNameSpace() { + /** @see org.apache.fop.fo.FONode#getNamespaceURI() */ + public String getNamespaceURI() { return TestElementMapping.NAMESPACE; } + } --------------------------------------------------------------------- To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org