Another fix, making Area Tree Renderers work again. Damn, when am I going to get...

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196996 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 970a58dc2743f0ed713e6fa42749f92888c7a089..a49c641c55b6cf30d3bebff9d8583f49b713610b 100644 (file)
--- a/src/java/org/apache/fop/apps/Driver.java
+++ b/src/java/org/apache/fop/apps/Driver.java
@@ -529,13 +529,6 @@ public class Driver implements LogEnabled {
         if (currentDocument == null) {
             currentDocument = new Document(this);
         }
-        /** LayoutStrategy is hard-wired for now, but needs to be made
-        accessible through the API and/or configuration */
-        if (foInputHandler instanceof FOTreeHandler) {
-            if (currentDocument.getLayoutStrategy() == null) {
-                currentDocument.setLayoutStrategy(new LayoutManagerLS(currentDocument));
-            }
-        }
 
         // TODO: - do this stuff in a better way
         // PIJ: I guess the structure handler should be created by the renderer.
@@ -551,6 +544,13 @@ public class Driver implements LogEnabled {
             foInputHandler = new FOTreeHandler(currentDocument, true);
         }
         currentDocument.foInputHandler = foInputHandler;
+        /** LayoutStrategy is hard-wired for now, but needs to be made
+        accessible through the API and/or configuration */
+        if (foInputHandler instanceof FOTreeHandler) {
+            if (currentDocument.getLayoutStrategy() == null) {
+                currentDocument.setLayoutStrategy(new LayoutManagerLS(currentDocument));
+            }
+        }
 
         foInputHandler.enableLogging(getLogger());