[FOray-commit] SF.net SVN: foray:[12066] trunk/foray/foray-areatree/src/main/java/org/ foray/area

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

Revision: 12066
          http://sourceforge.net/p/foray/code/12066
Author:   victormote
Date:     2021-11-15 00:21:54 +0000 (Mon, 15 Nov 2021)
Log Message:
-----------
Conform to aXSL changes: Start process of making axsl-area extend axsl-galley.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java	2021-11-14 23:19:35 UTC (rev 12065)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java	2021-11-15 00:21:54 UTC (rev 12066)
@@ -30,6 +30,7 @@
 
 import org.foray.common.WellKnownConstants;
 
+import org.axsl.area.Area;
 import org.axsl.area.AreaTreeException;
 import org.axsl.area.BlockContainerRefArea;
 import org.axsl.common.value.AbsoluteAxis;
@@ -52,8 +53,7 @@
 /**
  * Abstract superclass for all Areas in the AreaTree.
  */
-public abstract class Area4a extends AreaNode4a implements org.axsl.galley.Area,
-        org.axsl.area.Area {
+public abstract class Area4a extends AreaNode4a implements Area {
 
     /**
      * Constructor.

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java	2021-11-14 23:19:35 UTC (rev 12065)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java	2021-11-15 00:21:54 UTC (rev 12066)
@@ -31,6 +31,7 @@
 import org.foray.common.data.AbstractOrderedTreeNode;
 import org.foray.common.data.OrderedTreeNode;
 
+import org.axsl.area.AreaNode;
 import org.axsl.area.AreaTreeException;
 import org.axsl.area.BlockContentFactory;
 import org.axsl.fo.Fo;
@@ -49,8 +50,7 @@
 /**
  * Abstract superclass for all nodes in the AreaTree.
  */
-public abstract class AreaNode4a extends AbstractOrderedTreeNode
-        implements org.axsl.galley.AreaNode, org.axsl.area.AreaNode {
+public abstract class AreaNode4a extends AbstractOrderedTreeNode implements AreaNode {
 
     /**
      * Constructor.

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	2021-11-14 23:19:35 UTC (rev 12065)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java	2021-11-15 00:21:54 UTC (rev 12066)
@@ -28,6 +28,7 @@
 
 package org.foray.area;
 
+import org.axsl.area.AreaTree;
 import org.axsl.area.AreaTreeEvent;
 import org.axsl.area.AreaTreeException;
 import org.axsl.area.AreaTreeListener;
@@ -52,8 +53,7 @@
 /**
  * The root of the AreaTree.
  */
-public final class AreaTree4a extends NonArea implements org.axsl.galley.Galley,
-        org.axsl.area.AreaTree {
+public final class AreaTree4a extends NonArea implements AreaTree {
 
     /** The initial size at which the linkage map should be created. */
     private static final short INITIAL_LINKAGE_MAP_SIZE = 200;

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