You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by pb...@apache.org on 2002/10/06 16:18:05 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java
pbwest 2002/10/06 07:18:05
Modified: src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java
Log:
Removed SubSequenceSpecifier references.
Simplified exception catching and handling.
Revision Changes Path
No revision
No revision
1.1.2.5 +9 -31 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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoLayoutMasterSet.java 2 Oct 2002 15:19:59 -0000 1.1.2.4
+++ FoLayoutMasterSet.java 6 Oct 2002 14:18:05 -0000 1.1.2.5
@@ -15,9 +15,6 @@
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.datastructs.Tree;
import org.apache.fop.fo.pagination.FoPageSequenceMaster;
-import org.apache.fop.fo.pagination.FoPageSequenceMaster.SubSequenceSpecifier;
-import org.apache.fop.fo.pagination
- .FoPageSequenceMaster.SubSequenceSpecifier.ConditionalPageMasterReference;
/*
* $Id$
@@ -66,8 +63,7 @@
}
/**
- * Set up all the page masters. !!!Note that the masters are not entered
- * in the FO tree.!!!
+ * Set up all the page masters.
* fo:layout-master-set contents are
* (simple-page-master|page-sequence-master)+
*/
@@ -88,12 +84,7 @@
localName = ev.getLocalName();
if (localName.equals("simple-page-master")) {
System.out.println("Found simple-page-master");
- try {
- simple = new FoSimplePageMaster(foTree, this, ev);
- } catch (Tree.TreeException e) {
- throw new FOPException
- ("TreeException: " + e.getMessage());
- }
+ simple = new FoSimplePageMaster(foTree, this, ev);
simpleName = simple.getMasterName();
if (pageMasters == null)
pageMasters = new HashMap();
@@ -112,22 +103,6 @@
("simple-page-master master-name clash in "
+ "simplePageMasters: " + simpleName);
simplePageMasters.put(simpleName, simple);
- FoPageSequenceMaster seqMaster;
- try {
- // Construct a new PageSequenceMaster
- seqMaster = new FoPageSequenceMaster
- (foTree, this, simpleName);
- } catch(Tree.TreeException e) {
- throw new FOPException
- ("TreeException: " + e.getMessage());
- }
- // Construct a SubSequence
- SubSequenceSpecifier subSeq =
- seqMaster.new SubSequenceSpecifier();
- // Construct a default ConditionalPageMasterReference
- ConditionalPageMasterReference cond = subSeq.new
- ConditionalPageMasterReference(simpleName);
- pageMasters.put(simpleName, seqMaster);
} else if (localName.equals("page-sequence-master")) {
System.out.println("Found page-sequence-master");
try {
@@ -153,7 +128,10 @@
// Masters exhausted
}
catch (PropertyException e) {
- throw new FOPException("PropertyException: " + e.getMessage());
+ throw new FOPException(e);
+ }
+ catch (Tree.TreeException e) {
+ throw new FOPException(e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org