pbwest 2002/11/13 15:27:50
Modified: src/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoCharacter.java FoExternalGraphic.java
FoInitialPropertySet.java
Log:
Adjust for no-children content model.
Revision Changes Path
No revision
No revision
1.1.2.5 +7 -8 xml-fop/src/org/apache/fop/fo/flow/Attic/FoCharacter.java
Index: FoCharacter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoCharacter.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoCharacter.java 13 Nov 2002 04:13:04 -0000 1.1.2.4
+++ FoCharacter.java 13 Nov 2002 23:27:46 -0000 1.1.2.5
@@ -101,21 +101,20 @@
}
/**
+ * Construct an fo:character node. This node has no children.
* @param foTree the FO tree being built
* @param parent the parent FONode of this node
* @param event the <tt>FoXMLEvent</tt> that triggered the creation of
* this node
- * @param attrSet the index of the attribute set applying to the node.
+ * @param stateFlags - passed down from the parent. Includes the
+ * attribute set information.
*/
public FoCharacter
- (FOTree foTree, FONode parent, FoXMLEvent event, int attrSet)
+ (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.CHARACTER, parent, event,
- attrSet, sparsePropsMap, sparseIndices);
- FoXMLEvent ev;
- String nowProcessing;
-
+ stateFlags, sparsePropsMap, sparseIndices);
makeSparsePropsSet();
}
1.1.2.5 +7 -8 xml-fop/src/org/apache/fop/fo/flow/Attic/FoExternalGraphic.java
Index: FoExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoExternalGraphic.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoExternalGraphic.java 13 Nov 2002 04:13:04 -0000 1.1.2.4
+++ FoExternalGraphic.java 13 Nov 2002 23:27:46 -0000 1.1.2.5
@@ -99,21 +99,20 @@
}
/**
+ * Construct an fo:external-graphic node. This node has no children.
* @param foTree the FO tree being built
* @param parent the parent FONode of this node
* @param event the <tt>FoXMLEvent</tt> that triggered the creation of
* this node
- * @param attrSet the index of the attribute set applying to the node.
+ * @param stateFlags - passed down from the parent. Includes the
+ * attribute set information.
*/
public FoExternalGraphic
- (FOTree foTree, FONode parent, FoXMLEvent event, int attrSet)
+ (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.EXTERNAL_GRAPHIC, parent, event,
- attrSet, sparsePropsMap, sparseIndices);
- FoXMLEvent ev;
- String nowProcessing;
-
+ stateFlags, sparsePropsMap, sparseIndices);
makeSparsePropsSet();
}
1.1.2.5 +7 -8
xml-fop/src/org/apache/fop/fo/flow/Attic/FoInitialPropertySet.java
Index: FoInitialPropertySet.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoInitialPropertySet.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoInitialPropertySet.java 13 Nov 2002 04:13:04 -0000 1.1.2.4
+++ FoInitialPropertySet.java 13 Nov 2002 23:27:46 -0000 1.1.2.5
@@ -86,21 +86,20 @@
}
/**
+ * Construct an fo:initial-property-set node. This node has no children.
* @param foTree the FO tree being built
* @param parent the parent FONode of this node
* @param event the <tt>FoXMLEvent</tt> that triggered the creation of
* this node
- * @param attrSet the index of the attribute set applying to the node.
+ * @param stateFlags - passed down from the parent. Includes the
+ * attribute set information.
*/
public FoInitialPropertySet
- (FOTree foTree, FONode parent, FoXMLEvent event, int attrSet)
+ (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.INITIAL_PROPERTY_SET, parent, event,
- attrSet, sparsePropsMap, sparseIndices);
- FoXMLEvent ev;
- String nowProcessing;
-
+ stateFlags, sparsePropsMap, sparseIndices);
makeSparsePropsSet();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
