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 ke...@apache.org on 2001/02/02 05:52:03 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/flow Flow.java
kellyc 01/02/01 20:52:03
Modified: src/org/apache/fop/fo/flow Flow.java
Log:
Clarified error reported for order of static-content, flow within a
page-sequence to meet section 6.4.5 of the spec.
Revision Changes Path
1.18 +10 -5 xml-fop/src/org/apache/fop/fo/flow/Flow.java
Index: Flow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Flow.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Flow.java 2001/01/19 18:33:47 1.17
+++ Flow.java 2001/02/02 04:52:03 1.18
@@ -1,4 +1,4 @@
-/*-- $Id: Flow.java,v 1.17 2001/01/19 18:33:47 kellyc Exp $ --
+/*-- $Id: Flow.java,v 1.18 2001/02/02 04:52:03 kellyc Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -112,11 +112,16 @@
// multiplicity of fo:flow in XSL 1.0 is cleared up - one (1)
// fo:flow per fo:page-sequence only.
- if (!pageSequence.isFlowSet() || !(this.name.equals("fo:flow")))
- pageSequence.addFlow(this);
- else
+ if (pageSequence.isFlowSet()) {
+ if (this.name.equals("fo:flow")) {
throw new FOPException("Only a single fo:flow permitted"
- + " per fo:page-sequence");
+ + " per fo:page-sequence");
+ }
+ else {
+ throw new FOPException(this.name+" not allowed after fo:flow");
+ }
+ }
+ pageSequence.addFlow(this);
}
protected void setFlowName(String name)