Removed currently unused Document object from the LayoutStrategy (the latter

class is already a child of Document, and a two-way interface appears unneeded.)

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197536 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/apps/Driver.java b/src/java/org/apache/fop/apps/Driver.java
index 6145186dbcf1d555d533c3fcea150e97135c1b60..4cee9c3e1f8fff03137f5136fca7b6cb9dbef674 100644 (file)
--- a/src/java/org/apache/fop/apps/Driver.java
+++ b/src/java/org/apache/fop/apps/Driver.java
@@ -514,7 +514,7 @@ public class Driver {
         accessible through the API and/or configuration */
         if (foInputHandler instanceof FOTreeHandler) {
             if (currentDocument.getLayoutStrategy() == null) {
-                currentDocument.setLayoutStrategy(new LayoutManagerLS(currentDocument));
+                currentDocument.setLayoutStrategy(new LayoutManagerLS());
             }
         }
 

diff --git a/src/java/org/apache/fop/layout/LayoutStrategy.java b/src/java/org/apache/fop/layout/LayoutStrategy.java
index 64b35908b88f673ae1f3622a8ae5484cf7c96f20..477f9c3140529e2ed825bacca6839a8d910d517c 100644 (file)
--- a/src/java/org/apache/fop/layout/LayoutStrategy.java
+++ b/src/java/org/apache/fop/layout/LayoutStrategy.java
@@ -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 @@ import org.apache.fop.fo.pagination.PageSequence;
 public abstract class LayoutStrategy {
 
     private String name = "undefined";
-    public Document document;
 
-    public LayoutStrategy(Document document) {
-        this.document = document;
+    public LayoutStrategy() {
     }
 
     /**

diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java b/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
index 4084d0430f87d413e309d5e05cf0aa7c713d7f7b..859ae5ff177be9ed66b049be933d69f096260eb7 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
+++ b/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
@@ -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 @@ public class LayoutManagerLS extends LayoutStrategy {
      extending FOP **/
     private AddLMVisitor addLMVisitor = null;
 
-    public LayoutManagerLS(Document document) {
-        super(document);
+    public LayoutManagerLS() {
+        super();
     }
 
     /**