pbwest 2002/10/01 18:30:59
Modified: src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
FoSimplePageMaster.java
Log:
attrSet constants now in FObjects.java
Revision Changes Path
No revision
No revision
1.1.2.3 +5 -4
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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoLayoutMasterSet.java 16 Sep 2002 05:31:16 -0000 1.1.2.2
+++ FoLayoutMasterSet.java 2 Oct 2002 01:30:59 -0000 1.1.2.3
@@ -6,6 +6,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.xml.XMLEvent;
+import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FONode;
@@ -61,7 +62,7 @@
throws Tree.TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.LAYOUT_MASTER_SET, parent, event,
- FONode.LAYOUT);
+ FObjects.LAYOUT_SET);
}
/**
1.1.2.3 +5 -4
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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoPageSequenceMaster.java 16 Sep 2002 05:31:16 -0000 1.1.2.2
+++ FoPageSequenceMaster.java 2 Oct 2002 01:30:59 -0000 1.1.2.3
@@ -20,6 +20,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FONode;
@@ -46,7 +47,7 @@
throws Tree.TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, null,
- FONode.LAYOUT);
+ FObjects.LAYOUT_SET);
this.masterName = masterName;
}
@@ -54,7 +55,7 @@
throws Tree.TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, event,
- FONode.LAYOUT);
+ FObjects.LAYOUT_SET);
if (event == null) {
System.out.println("Null event; throwing FOPException");
throw new FOPException
1.1.2.3 +4 -3
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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoSimplePageMaster.java 16 Sep 2002 05:31:16 -0000 1.1.2.2
+++ FoSimplePageMaster.java 2 Oct 2002 01:30:59 -0000 1.1.2.3
@@ -13,6 +13,7 @@
import org.apache.fop.fo.FOAttributes;
import org.apache.fop.xml.XMLEvent;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOTree;
@@ -39,7 +40,7 @@
throws Tree.TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.SIMPLE_PAGE_MASTER, parent, event,
- FONode.LAYOUT);
+ FObjects.LAYOUT_SET);
System.out.println("FOAttributes: " + event);
try {
masterName = foAttributes.getFoAttrValue("master-name");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
