gmazza 2004/04/24 00:03:56
Modified: src/java/org/apache/fop/apps Driver.java
src/java/org/apache/fop/layout LayoutStrategy.java
src/java/org/apache/fop/layoutmgr LayoutManagerLS.java
Log:
Removed currently unused Document object from the LayoutStrategy (the latter
class is already a child of Document, and a two-way interface appears unneeded.)
Revision Changes Path
1.57 +1 -1 xml-fop/src/java/org/apache/fop/apps/Driver.java
Index: Driver.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- Driver.java 22 Apr 2004 21:38:39 -0000 1.56
+++ Driver.java 24 Apr 2004 07:03:56 -0000 1.57
@@ -514,7 +514,7 @@
accessible through the API and/or configuration */
if (foInputHandler instanceof FOTreeHandler) {
if (currentDocument.getLayoutStrategy() == null) {
- currentDocument.setLayoutStrategy(new
LayoutManagerLS(currentDocument));
+ currentDocument.setLayoutStrategy(new LayoutManagerLS());
}
}
1.8 +2 -5 xml-fop/src/java/org/apache/fop/layout/LayoutStrategy.java
Index: LayoutStrategy.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layout/LayoutStrategy.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LayoutStrategy.java 27 Feb 2004 17:48:21 -0000 1.7
+++ LayoutStrategy.java 24 Apr 2004 07:03:56 -0000 1.8
@@ -19,7 +19,6 @@
package org.apache.fop.layout;
-import org.apache.fop.apps.Document;
import org.apache.fop.apps.FOPException;
import org.apache.fop.area.AreaTree;
import org.apache.fop.fo.pagination.PageSequence;
@@ -32,10 +31,8 @@
public abstract class LayoutStrategy {
private String name = "undefined";
- public Document document;
- public LayoutStrategy(Document document) {
- this.document = document;
+ public LayoutStrategy() {
}
/**
1.22 +3 -4 xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
Index: LayoutManagerLS.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- LayoutManagerLS.java 18 Mar 2004 00:22:40 -0000 1.21
+++ LayoutManagerLS.java 24 Apr 2004 07:03:56 -0000 1.22
@@ -18,7 +18,6 @@
package org.apache.fop.layoutmgr;
-import org.apache.fop.apps.Document;
import org.apache.fop.apps.FOPException;
import org.apache.fop.area.AreaTree;
import org.apache.fop.area.Title;
@@ -36,8 +35,8 @@
extending FOP **/
private AddLMVisitor addLMVisitor = null;
- public LayoutManagerLS(Document document) {
- super(document);
+ public LayoutManagerLS() {
+ super();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
