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 kl...@apache.org on 2001/11/09 23:08:49 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java Flow.java
klease 01/11/09 14:08:49
Modified: src/org/apache/fop/fo/flow Block.java Flow.java
Log:
Start hooking in the layoutmanager
Revision Changes Path
1.44 +8 -1 xml-fop/src/org/apache/fop/fo/flow/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Block.java 2001/11/09 11:32:37 1.43
+++ Block.java 2001/11/09 22:08:49 1.44
@@ -1,5 +1,5 @@
/*
- * $Id: Block.java,v 1.43 2001/11/09 11:32:37 keiron Exp $
+ * $Id: Block.java,v 1.44 2001/11/09 22:08:49 klease Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -13,6 +13,8 @@
import org.apache.fop.layout.*;
import org.apache.fop.datatypes.*;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.layoutmgr.LayoutManager;
+//import org.apache.fop.layoutmgr.BlockLayoutManager;
import org.xml.sax.Attributes;
@@ -348,6 +350,11 @@
public int getSpan() {
return this.span;
+ }
+
+ public LayoutManager getLayoutManager() {
+ //return new BlockLayoutManager(this);
+ return null;
}
}
1.27 +10 -2 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Flow.java 2001/11/09 11:32:37 1.26
+++ Flow.java 2001/11/09 22:08:49 1.27
@@ -1,5 +1,5 @@
/*
- * $Id: Flow.java,v 1.26 2001/11/09 11:32:37 keiron Exp $
+ * $Id: Flow.java,v 1.27 2001/11/09 22:08:49 klease Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -14,6 +14,8 @@
import org.apache.fop.layout.Area;
import org.apache.fop.layout.BodyAreaContainer;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.FlowLayoutManager;
// Java
import java.util.Hashtable;
@@ -70,6 +72,7 @@
// 001228, Number 406), confusion in spec section 6.4.5 about
// multiplicity of fo:flow in XSL 1.0 is cleared up - one (1)
// fo:flow per fo:page-sequence only.
+
/* if (pageSequence.isFlowSet()) {
if (this.name.equals("fo:flow")) {
throw new FOPException("Only a single fo:flow permitted"
@@ -81,7 +84,8 @@
}
*/
setFlowName(getProperty("flow-name").getString());
- pageSequence.addFlow(this);
+ // Now done in addChild of page-sequence
+ //pageSequence.addFlow(this);
}
protected void setFlowName(String name) throws FOPException {
@@ -220,6 +224,10 @@
public boolean generatesReferenceAreas() {
return true;
+ }
+
+ public LayoutManager getLayoutManager() {
+ return new FlowLayoutManager(this);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org