xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adelme...@apache.org
Subject svn commit: r806365 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java
Date Thu, 20 Aug 2009 21:21:44 GMT
Author: adelmelle
Date: Thu Aug 20 21:21:43 2009
New Revision: 806365

URL: http://svn.apache.org/viewvc?rev=806365&view=rev
Log:
Revert some changes that were meant to be kept local for the moment...

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java?rev=806365&r1=806364&r2=806365&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java Thu Aug 20 21:21:43
2009
@@ -39,7 +39,6 @@
 import org.apache.fop.area.AreaTreeHandler;
 import org.apache.fop.fo.ElementMapping.Maker;
 import org.apache.fop.fo.extensions.ExtensionElementMapping;
-import org.apache.fop.fo.extensions.pdf.PDFExtensionElementMapping;
 import org.apache.fop.fo.pagination.Root;
 import org.apache.fop.util.ContentHandlerFactory;
 import org.apache.fop.util.ContentHandlerFactory.ObjectBuiltListener;
@@ -264,8 +263,7 @@
                 }
             } else { // check that incoming node is valid for currentFObj
                 if (currentFObj.getNamespaceURI().equals(FOElementMapping.URI)
-                    || currentFObj.getNamespaceURI().equals(ExtensionElementMapping.URI)
-                    || currentFObj.getNamespaceURI().equals(PDFExtensionElementMapping.URI))
{
+                    || currentFObj.getNamespaceURI().equals(ExtensionElementMapping.URI))
{
                     currentFObj.validateChildNode(locator, namespaceURI, localName);
                 }
             }
@@ -279,7 +277,6 @@
                     rootFObj.setBuilderContext(builderContext);
                     rootFObj.setFOEventHandler(foEventHandler);
                 }
-                builderContext.foIndex++;
                 propertyList = foNode.createPropertyList(
                                     currentPropertyList, foEventHandler);
                 foNode.processNode(localName, getEffectiveLocator(),



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message