pbwest 2002/11/12 20:15:20
Modified: src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
FoRegionBeforeAfter.java FoRegionBody.java
FoRegionStartEnd.java FoSimplePageMaster.java
Log:
Attribute set constants moved from FOPropertySets to FONode.
numProps arg to FONode constructor removed.
Revision Changes Path
No revision
No revision
1.1.2.15 +4 -6
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
Index: FoLayoutMasterSet.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- FoLayoutMasterSet.java 5 Nov 2002 14:18:52 -0000 1.1.2.14
+++ FoLayoutMasterSet.java 13 Nov 2002 04:15:19 -0000 1.1.2.15
@@ -7,7 +7,6 @@
import java.util.NoSuchElementException;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FONode;
@@ -105,8 +104,7 @@
throws TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.LAYOUT_MASTER_SET, parent, event,
- FOPropertySets.LAYOUT_SET, sparsePropsMap, sparseIndices,
- numProps);
+ FONode.LAYOUT_SET, sparsePropsMap, sparseIndices);
setupPageMasters(event);
// No need to clean up the build tree, because the whole subtree
// will be deleted.
1.1.2.14 +11 -13
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
Index: FoPageSequenceMaster.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoPageSequenceMaster.java 4 Nov 2002 14:46:03 -0000 1.1.2.13
+++ FoPageSequenceMaster.java 13 Nov 2002 04:15:19 -0000 1.1.2.14
@@ -23,7 +23,6 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.properties.Property;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FONode;
@@ -191,8 +190,7 @@
throws TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, event,
- FOPropertySets.SEQ_MASTER_SET, sparsePropsMap, sparseIndices,
- numProps);
+ FONode.SEQ_MASTER_SET, sparsePropsMap, sparseIndices);
// Process sequence members here
try {
do {
@@ -244,8 +242,8 @@
throws TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.SINGLE_PAGE_MASTER_REFERENCE, parent,
- event, FOPropertySets.SEQ_MASTER_SET, s_p_m_r_PropsMap,
- s_p_m_r_Indices, s_p_m_r_numProps);
+ event, FONode.SEQ_MASTER_SET, s_p_m_r_PropsMap,
+ s_p_m_r_Indices);
this.makeSparsePropsSet();
}
@@ -266,8 +264,8 @@
throws TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.REPEATABLE_PAGE_MASTER_REFERENCE,
- parent, event, FOPropertySets.SEQ_MASTER_SET,
- r_p_m_r_PropsMap, r_p_m_r_Indices, r_p_m_r_numProps);
+ parent, event, FONode.SEQ_MASTER_SET,
+ r_p_m_r_PropsMap, r_p_m_r_Indices);
this.makeSparsePropsSet();
}
@@ -292,8 +290,8 @@
throws TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.REPEATABLE_PAGE_MASTER_ALTERNATIVES,
- parent, event, FOPropertySets.SEQ_MASTER_SET,
- r_p_m_a_PropsMap, r_p_m_a_Indices, r_p_m_a_numProps);
+ parent, event, FONode.SEQ_MASTER_SET,
+ r_p_m_a_PropsMap, r_p_m_a_Indices);
// Process conditional-page-master-references here
try {
@@ -325,8 +323,8 @@
throws TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.CONDITIONAL_PAGE_MASTER_REFERENCE,
- parent, event, FOPropertySets.SEQ_MASTER_SET,
- c_p_m_r_PropsMap, c_p_m_r_Indices, c_p_m_r_numProps);
+ parent, event, FONode.SEQ_MASTER_SET,
+ c_p_m_r_PropsMap, c_p_m_r_Indices);
this.makeSparsePropsSet();
}
1.1.2.4 +4 -5
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBeforeAfter.java
Index: FoRegionBeforeAfter.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBeforeAfter.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FoRegionBeforeAfter.java 4 Nov 2002 14:46:03 -0000 1.1.2.3
+++ FoRegionBeforeAfter.java 13 Nov 2002 04:15:19 -0000 1.1.2.4
@@ -12,7 +12,6 @@
// FOP
import org.apache.fop.fo.FOAttributes;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.PropertySets;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FONode;
@@ -90,8 +89,8 @@
(FOTree foTree, int foType, FONode parent, FoXMLEvent event)
throws TreeException, FOPException
{
- super(foTree, foType, parent, event, FOPropertySets.LAYOUT_SET,
- sparsePropsMap, sparseIndices, numProps);
+ super(foTree, foType, parent, event, FONode.LAYOUT_SET,
+ sparsePropsMap, sparseIndices);
}
}
1.1.2.4 +3 -6 xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBody.java
Index: FoRegionBody.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBody.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FoRegionBody.java 4 Nov 2002 14:46:03 -0000 1.1.2.3
+++ FoRegionBody.java 13 Nov 2002 04:15:19 -0000 1.1.2.4
@@ -10,9 +10,7 @@
package org.apache.fop.fo.pagination;
// FOP
-import org.apache.fop.fo.FOAttributes;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.PropertySets;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FONode;
@@ -92,8 +90,7 @@
throws TreeException, FOPException
{
super(foTree, FObjectNames.REGION_BODY, parent, event,
- FOPropertySets.LAYOUT_SET, sparsePropsMap, sparseIndices,
- numProps);
+ FONode.LAYOUT_SET, sparsePropsMap, sparseIndices);
makeSparsePropsSet();
}
1.1.2.4 +4 -5
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionStartEnd.java
Index: FoRegionStartEnd.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionStartEnd.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FoRegionStartEnd.java 4 Nov 2002 14:46:03 -0000 1.1.2.3
+++ FoRegionStartEnd.java 13 Nov 2002 04:15:19 -0000 1.1.2.4
@@ -12,7 +12,6 @@
// FOP
import org.apache.fop.fo.FOAttributes;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.PropertySets;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FONode;
@@ -89,8 +88,8 @@
(FOTree foTree, int foType, FONode parent, FoXMLEvent event)
throws TreeException, FOPException
{
- super(foTree, foType, parent, event, FOPropertySets.LAYOUT_SET,
- sparsePropsMap, sparseIndices, numProps);
+ super(foTree, foType, parent, event, FONode.LAYOUT_SET,
+ sparsePropsMap, sparseIndices);
}
}
1.1.2.11 +3 -5
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java
Index: FoSimplePageMaster.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoSimplePageMaster.java 4 Nov 2002 14:46:03 -0000 1.1.2.10
+++ FoSimplePageMaster.java 13 Nov 2002 04:15:19 -0000 1.1.2.11
@@ -16,7 +16,6 @@
import org.apache.fop.xml.FoXMLEvent;
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOTree;
@@ -94,8 +93,7 @@
throws TreeException, FOPException
{
super(foTree, FObjectNames.SIMPLE_PAGE_MASTER, parent, event,
- FOPropertySets.LAYOUT_SET, sparsePropsMap, sparseIndices,
- numProps);
+ FONode.LAYOUT_SET, sparsePropsMap, sparseIndices);
// Process regions here
FoXMLEvent regionEv;
if ((regionEv = xmlevents.expectStartElement
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
