pbwest 2002/10/02 08:19:59 Modified: src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design FoSimplePageMaster.java FoPageSequenceMaster.java FoLayoutMasterSet.java Log: Moved FObjects to FOPropertySets. Revision Changes Path No revision No revision 1.1.2.5 +4 -4 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.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- FoSimplePageMaster.java 2 Oct 2002 07:26:01 -0000 1.1.2.4 +++ FoSimplePageMaster.java 2 Oct 2002 15:19:59 -0000 1.1.2.5 @@ -14,7 +14,7 @@ import org.apache.fop.fo.PropNames; import org.apache.fop.xml.XMLEvent; import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.FObjects; +import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; @@ -43,7 +43,7 @@ throws Tree.TreeException, FOPException, PropertyException { super(foTree, FObjectNames.SIMPLE_PAGE_MASTER, parent, event, - FObjects.LAYOUT_SET); + FOPropertySets.LAYOUT_SET); System.out.println("FOAttributes: " + event); // Check that the property has been set PropertyValue name = propertySet[PropNames.MASTER_NAME]; 1.1.2.4 +5 -5 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.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoPageSequenceMaster.java 2 Oct 2002 01:30:59 -0000 1.1.2.3 +++ FoPageSequenceMaster.java 2 Oct 2002 15:19:59 -0000 1.1.2.4 @@ -20,7 +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.FOPropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FONode; @@ -47,7 +47,7 @@ throws Tree.TreeException, FOPException, PropertyException { super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, null, - FObjects.LAYOUT_SET); + FOPropertySets.LAYOUT_SET); this.masterName = masterName; } @@ -55,7 +55,7 @@ throws Tree.TreeException, FOPException, PropertyException { super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, event, - FObjects.LAYOUT_SET); + FOPropertySets.LAYOUT_SET); if (event == null) { System.out.println("Null event; throwing FOPException"); throw new FOPException 1.1.2.4 +5 -5 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.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoLayoutMasterSet.java 2 Oct 2002 01:30:59 -0000 1.1.2.3 +++ FoLayoutMasterSet.java 2 Oct 2002 15:19:59 -0000 1.1.2.4 @@ -6,7 +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.FOPropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FONode; @@ -62,7 +62,7 @@ throws Tree.TreeException, FOPException, PropertyException { super(foTree, FObjectNames.LAYOUT_MASTER_SET, parent, event, - FObjects.LAYOUT_SET); + FOPropertySets.LAYOUT_SET); } /**
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]