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

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

Revision: 12847
          http://sourceforge.net/p/foray/code/12847
Author:   victormote
Date:     2022-12-13 12:20:16 +0000 (Tue, 13 Dec 2022)
Log Message:
-----------
Conform to aXSL change: Provide AreaTree with an instance of FontServer.

Modified Paths:
--------------
    trunk/foray/foray-app/src/testFixtures/java/org/foray/app/AreaTreeCreator.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTreeFactory4a.java
    trunk/foray/foray-core/src/main/java/org/foray/core/ForayTarget.java

Modified: trunk/foray/foray-app/src/testFixtures/java/org/foray/app/AreaTreeCreator.java
===================================================================
--- trunk/foray/foray-app/src/testFixtures/java/org/foray/app/AreaTreeCreator.java	2022-12-13 00:04:27 UTC (rev 12846)
+++ trunk/foray/foray-app/src/testFixtures/java/org/foray/app/AreaTreeCreator.java	2022-12-13 12:20:16 UTC (rev 12847)
@@ -32,6 +32,7 @@
 import org.foray.area.AreaTreeFactory4a;
 import org.foray.area.PageCollection4a;
 import org.foray.core.ForayException;
+import org.foray.core.SessionConfig;
 import org.foray.fotree.FoTree4a;
 import org.foray.fotree.fo.obj.PageSequence4a;
 import org.foray.fotree.fo.obj.Root4a;
@@ -39,11 +40,13 @@
 import org.foray.pioneer.PioneerLayoutStrategy;
 
 import org.axsl.area.AreaTreeException;
+import org.axsl.font.FontServer;
 import org.axsl.fotree.FoTreeException;
 import org.axsl.graphic.GraphicServer;
 import org.axsl.linebreak.LineBreakerFactory;
 
 import static org.junit.jupiter.api.Assertions.fail;
+import org.mockito.Mockito;
 
 import java.util.Iterator;
 
@@ -61,6 +64,9 @@
     /** The layout factory. */
     private PioneerFactory layoutFactory;
 
+    /** The font server. */
+    private FontServer fontServer;
+
     /** The graphic server. */
     private GraphicServer graphicServer;
 
@@ -72,6 +78,8 @@
             this.areaTreeFactory = ForaySpecific.makeAreaTreeFactory();
             final LineBreakerFactory lbFactory = ForaySpecific.makeLineBreakerFactory();
             this.layoutFactory = ForaySpecific.makeLayoutFactory(lbFactory);
+            final SessionConfig sessionConfig = Mockito.mock(SessionConfig.class);
+            this.fontServer = ForaySpecific.makeFontServer(sessionConfig);
             this.graphicServer = ForaySpecific.makeGraphicServer();
         } catch (final ForayException e) {
             fail(e.getMessage());
@@ -106,7 +114,7 @@
             fail(e.getMessage());
         }
         final Root4a root = foTree.getRootFo();
-        final AreaTree4a areaTree = this.areaTreeFactory.makeAreaTree(foTree, this.graphicServer);
+        final AreaTree4a areaTree = this.areaTreeFactory.makeAreaTree(foTree, this.fontServer, this.graphicServer);
         final PioneerLayoutStrategy layout = this.layoutFactory.makeLayout();
         final Iterator<PageSequence4a> iterator = root.getPageSequenceIterator();
         while (iterator.hasNext()) {

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java	2022-12-13 00:04:27 UTC (rev 12846)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java	2022-12-13 12:20:16 UTC (rev 12847)
@@ -39,6 +39,7 @@
 import org.axsl.area.event.AreaTreeEvent;
 import org.axsl.area.event.AreaTreeListener;
 import org.axsl.font.FontConsumer;
+import org.axsl.font.FontServer;
 import org.axsl.fotree.Fo;
 import org.axsl.fotree.FoTree;
 import org.axsl.fotree.fo.Bookmark;
@@ -105,6 +106,9 @@
     /** Factory that knows how to create new linkage instances. */
     private LinkFactory linkageFactory = new LinkFactory();
 
+    /** The font server. */
+    private FontServer fontServer;
+
     /** The graphics server. */
     private GraphicServer graphicServer;
 
@@ -112,14 +116,17 @@
      * Private Constructor.
      * @param foTree The FO tree instance that generates this area tree.
      * @param fontConsumer The Font Consumer.
+     * @param fontServer The font server.
      * @param graphicServer The graphics server.
      */
-    private AreaTree4a(final FoTree foTree, final FontConsumer fontConsumer, final GraphicServer graphicServer) {
+    private AreaTree4a(final FoTree foTree, final FontConsumer fontConsumer, final FontServer fontServer,
+            final GraphicServer graphicServer) {
         /* AreaTree has no parent with which to register. And it cannot
          * create linkage because the AreaTreeControl isn't registered.*/
         this.foTree = foTree;
         this.fontConsumer = fontConsumer;
         this.documentMetadata = new DocumentMetadata4a(this);
+        this.fontServer = fontServer;
         this.graphicServer = graphicServer;
     }
 
@@ -126,11 +133,13 @@
     /**
      * Package-visible factory method.
      * @param foTree The FO tree instance that generates this area tree.
+     * @param fontServer The font server.
      * @param graphicServer The graphics server.
      * @return The new instance.
      */
-    static AreaTree4a makeAreaTree(final FoTree foTree, final GraphicServer graphicServer) {
-        final AreaTree4a newAreaTree = new AreaTree4a(foTree, foTree.getFontConsumer(), graphicServer);
+    static AreaTree4a makeAreaTree(final FoTree foTree, final FontServer fontServer,
+            final GraphicServer graphicServer) {
+        final AreaTree4a newAreaTree = new AreaTree4a(foTree, foTree.getFontConsumer(), fontServer, graphicServer);
         /*
          * These registration steps must take place after the AreaTreeControl
          * has been stored.
@@ -480,6 +489,11 @@
     }
 
     @Override
+    public FontServer getFontServer() {
+        return this.fontServer;
+    }
+
+    @Override
     public GraphicServer getGraphicServer() {
         return this.graphicServer;
     }

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTreeFactory4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTreeFactory4a.java	2022-12-13 00:04:27 UTC (rev 12846)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTreeFactory4a.java	2022-12-13 12:20:16 UTC (rev 12847)
@@ -29,6 +29,7 @@
 package org.foray.area;
 
 import org.axsl.area.AreaTreeFactory;
+import org.axsl.font.FontServer;
 import org.axsl.fotree.FoTree;
 import org.axsl.graphic.GraphicServer;
 
@@ -38,8 +39,9 @@
 public class AreaTreeFactory4a implements AreaTreeFactory {
 
     @Override
-    public AreaTree4a makeAreaTree(final FoTree foTree, final GraphicServer graphicServer) {
-        final AreaTree4a areaTree = AreaTree4a.makeAreaTree(foTree, graphicServer);
+    public AreaTree4a makeAreaTree(final FoTree foTree, final FontServer fontServer,
+            final GraphicServer graphicServer) {
+        final AreaTree4a areaTree = AreaTree4a.makeAreaTree(foTree, fontServer, graphicServer);
         return areaTree;
     }
 

Modified: trunk/foray/foray-core/src/main/java/org/foray/core/ForayTarget.java
===================================================================
--- trunk/foray/foray-core/src/main/java/org/foray/core/ForayTarget.java	2022-12-13 00:04:27 UTC (rev 12846)
+++ trunk/foray/foray-core/src/main/java/org/foray/core/ForayTarget.java	2022-12-13 12:20:16 UTC (rev 12847)
@@ -292,8 +292,9 @@
     private org.axsl.area.AreaTree getCreatedAreaTree() {
         if (this.areaTree == null) {
             final FoTree foTree = this.document.getFoTreeParser().getFoTree();
+            final FontServer fontServer = this.document.getFontServer();
             final GraphicServer graphicServer = this.document.getGraphicServer();
-            this.areaTree = this.getAreaTreeFactory().makeAreaTree(foTree, graphicServer);
+            this.areaTree = this.getAreaTreeFactory().makeAreaTree(foTree, fontServer, graphicServer);
             this.areaTree.registerListener(this);
         }
         return this.areaTree;

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