[FOray-commit] SF.net SVN: foray: [10074] trunk/foray

[<vic...@us...>]

Revision: 10074
          http://svn.sourceforge.net/foray/?rev=10074&view=rev
Author:   victormote
Date:     2007-07-20 14:34:46 -0700 (Fri, 20 Jul 2007)

Log Message:
-----------
Clean up AreaTree factory to ensure that AreaTrees created use the same servers and factories that are used by the FoTree.

Modified Paths:
--------------
    trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java
    trunk/foray/foray-app/src/javatest/org/foray/app/area/AreaTreeCreator.java
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
    trunk/foray/foray-areatree/src/java/org/foray/area/FOrayAreaTreeFactory.java

Modified: trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java	2007-07-20 21:23:58 UTC (rev 10073)
+++ trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java	2007-07-20 21:34:46 UTC (rev 10074)
@@ -101,7 +101,7 @@
         final FoTreeFactory foTreeServer = FOraySpecific.makeFOTreeFactory(
                 logger, sessionConfig, fontServer, graphicServer, textServer);
         final AreaTreeFactory areaTreeFactory =
-                FOraySpecific.makeAreaTreeFactory(logger, textServer);
+                FOraySpecific.makeAreaTreeFactory(logger);
         final LayoutFactory layoutFactory = FOraySpecific.makeLayoutFactory(
                 logger);
         final SpeechServer speechServer = FOraySpecific.makeSpeechServer();
@@ -229,13 +229,12 @@
     /**
      * Make a standard AreaTreeFactory instance for use in FOray.
      * @param logger The logger.
-     * @param textServer The TextServer to use.
      * @return The newly-created AreaTreeFactory instance.
      * @throws FOrayException For errors creating the server.
      */
-    public static FOrayAreaTreeFactory makeAreaTreeFactory(final Log logger,
-            final TextServer textServer) throws FOrayException {
-        return new FOrayAreaTreeFactory(logger, textServer);
+    public static FOrayAreaTreeFactory makeAreaTreeFactory(final Log logger)
+            throws FOrayException {
+        return new FOrayAreaTreeFactory(logger);
     }
 
     /**

Modified: trunk/foray/foray-app/src/javatest/org/foray/app/area/AreaTreeCreator.java
===================================================================
--- trunk/foray/foray-app/src/javatest/org/foray/app/area/AreaTreeCreator.java	2007-07-20 21:23:58 UTC (rev 10073)
+++ trunk/foray/foray-app/src/javatest/org/foray/app/area/AreaTreeCreator.java	2007-07-20 21:34:46 UTC (rev 10074)
@@ -71,8 +71,7 @@
         final FOrayFOTreeServer treeServer = FoDocumentReader.getInstance()
                 .getTreeServer();
         final FOrayAreaTreeFactory areaTreeFactory =
-                FOraySpecific.makeAreaTreeFactory(treeServer.getLogger(),
-                        treeServer.getTextServer());
+                FOraySpecific.makeAreaTreeFactory(treeServer.getLogger());
         this.areaTreeFactory = areaTreeFactory;
         final PioneerFactory layoutFactory = FOraySpecific.makeLayoutFactory(
                 treeServer.getLogger());

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2007-07-20 21:23:58 UTC (rev 10073)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2007-07-20 21:34:46 UTC (rev 10074)
@@ -32,6 +32,7 @@
 import org.axsl.area.AreaTreeException;
 import org.axsl.area.AreaTreeListener;
 import org.axsl.fo.Fo;
+import org.axsl.fo.FoTree;
 import org.axsl.fo.fo.Bookmark;
 import org.axsl.fo.fo.BookmarkTree;
 import org.axsl.fo.fo.Marker;
@@ -124,16 +125,13 @@
     /**
      * Package-visible factory method.
      * @param root The FO Root object that generates this area tree.
-     * @param fontConsumer The Font Consumer.
-     * @param textServer The Text Server.
      * @param logger The logger.
      * @return The new instance.
      */
-    static AreaTree makeAreaTree(final Root root,
-            final FontConsumer fontConsumer, final TextServer textServer,
-            final Log logger) {
-        final AreaTree newAreaTree = new AreaTree(fontConsumer, textServer,
-                logger);
+    static AreaTree makeAreaTree(final Root root, final Log logger) {
+        final FoTree foTree = root.getFoTree();
+        final AreaTree newAreaTree = new AreaTree(foTree.getFontConsumer(),
+                foTree.getTextServer(), logger);
         /*
          * These registration steps must take place after the AreaTreeControl
          * has been stored.

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOrayAreaTreeFactory.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOrayAreaTreeFactory.java	2007-07-20 21:23:58 UTC (rev 10073)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOrayAreaTreeFactory.java	2007-07-20 21:34:46 UTC (rev 10074)
@@ -29,9 +29,7 @@
 package org.foray.area;
 
 import org.axsl.area.AreaTreeFactory;
-import org.axsl.fo.FoTree;
 import org.axsl.fo.fo.Root;
-import org.axsl.text.TextServer;
 
 import org.apache.commons.logging.Log;
 
@@ -45,26 +43,19 @@
     /** The logger. */
     private Log logger;
 
-    /** The text server for this factory. */
-    private TextServer textServer;
-
     /**
      * Constructor.
      * @param logger The logger.
-     * @param textServer The text server.
      */
-    public FOrayAreaTreeFactory(final Log logger, final TextServer textServer) {
+    public FOrayAreaTreeFactory(final Log logger) {
         this.logger = logger;
-        this.textServer = textServer;
     }
 
     /**
      * {@inheritDoc}
      */
     public AreaTree makeAreaTree(final Root root) {
-        final FoTree foTree = root.getFoTree();
-        final AreaTree areaTree = AreaTree.makeAreaTree(root,
-                foTree.getFontConsumer(), this.textServer, getLogger());
+        final AreaTree areaTree = AreaTree.makeAreaTree(root, getLogger());
         return areaTree;
     }
 
@@ -76,4 +67,14 @@
         return this.logger;
     }
 
+    /**
+     * Sets the logger to be used by AreaTree instances.
+     * If a new logger is needed for each AreaTree instance created, this method
+     * should be run before running {@link #makeAreaTree(Root)}.
+     * @param logger The new logger.
+     */
+    public void setLogger(final Log logger) {
+        this.logger = logger;
+    }
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.