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

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

Revision: 12315
          http://sourceforge.net/p/foray/code/12315
Author:   victormote
Date:     2021-12-31 22:44:18 +0000 (Fri, 31 Dec 2021)
Log Message:
-----------
Confor to aXSL change: Move the factory interfaces to their own package.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java
    trunk/foray/foray-layout/src/main/java/org/foray/layout/LayoutStrategy.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/AbstractMixedInlinePnr.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BasicLinkPnr.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BidiOverridePnr.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockContainerPnr.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockDiscretePnr.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockPnr.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/InlinePnr.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/ListBlockPnr.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/TablePnr.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java	2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java	2021-12-31 22:44:18 UTC (rev 12315)
@@ -31,7 +31,7 @@
 import org.foray.area.link.Link;
 
 import org.axsl.area.AreaTreeException;
-import org.axsl.area.BlockLevelAreaFactory;
+import org.axsl.area.factory.BlockLevelAreaFactory;
 import org.axsl.fotree.fo.Block;
 import org.axsl.fotree.fo.BlockContainer;
 import org.axsl.fotree.fo.BlockDiscrete;

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-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java	2021-12-31 22:44:18 UTC (rev 12315)
@@ -33,7 +33,7 @@
 
 import org.axsl.area.AreaNode;
 import org.axsl.area.AreaTreeException;
-import org.axsl.area.BlockLevelAreaFactory;
+import org.axsl.area.factory.BlockLevelAreaFactory;
 import org.axsl.common.value.LinefeedTreatment;
 import org.axsl.common.value.TextTransform;
 import org.axsl.common.value.WhiteSpaceTreatment;

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java	2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java	2021-12-31 22:44:18 UTC (rev 12315)
@@ -33,8 +33,8 @@
 import org.foray.common.para.DiscretionaryHyphen4a;
 
 import org.axsl.area.AreaTreeException;
-import org.axsl.area.BlockLevelAreaFactory;
 import org.axsl.area.NormalBlockArea;
+import org.axsl.area.factory.BlockLevelAreaFactory;
 import org.axsl.common.para.DiscretionaryHyphen;
 import org.axsl.common.para.ParaContext;
 import org.axsl.common.value.BackgroundRepeat;

Modified: trunk/foray/foray-layout/src/main/java/org/foray/layout/LayoutStrategy.java
===================================================================
--- trunk/foray/foray-layout/src/main/java/org/foray/layout/LayoutStrategy.java	2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-layout/src/main/java/org/foray/layout/LayoutStrategy.java	2021-12-31 22:44:18 UTC (rev 12315)
@@ -31,10 +31,10 @@
 import org.axsl.area.AreaTree;
 import org.axsl.area.AreaTreeException;
 import org.axsl.area.LineArea;
-import org.axsl.area.LineContentFactory;
 import org.axsl.area.PageArea;
 import org.axsl.area.PageCollection;
 import org.axsl.area.RegionRefArea;
+import org.axsl.area.factory.LineContentFactory;
 import org.axsl.fotree.FoLineNonText;
 import org.axsl.fotree.FoLineText;
 import org.axsl.fotree.fo.ExternalGraphic;

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/AbstractMixedInlinePnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/AbstractMixedInlinePnr.java	2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/AbstractMixedInlinePnr.java	2021-12-31 22:44:18 UTC (rev 12315)
@@ -31,10 +31,10 @@
 import org.axsl.area.AncestralNormalInlineArea;
 import org.axsl.area.AreaNode;
 import org.axsl.area.AreaTreeException;
-import org.axsl.area.BlockLevelAreaFactory;
 import org.axsl.area.LineArea;
-import org.axsl.area.LineContentFactory;
 import org.axsl.area.NormalBlockArea;
+import org.axsl.area.factory.BlockLevelAreaFactory;
+import org.axsl.area.factory.LineContentFactory;
 import org.axsl.fotree.Fo;
 import org.axsl.fotree.fo.GraftingPoint;
 

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BasicLinkPnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BasicLinkPnr.java	2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BasicLinkPnr.java	2021-12-31 22:44:18 UTC (rev 12315)
@@ -29,7 +29,7 @@
 package org.foray.pioneer;
 
 import org.axsl.area.AncestralNormalInlineArea;
-import org.axsl.area.LineContentFactory;
+import org.axsl.area.factory.LineContentFactory;
 import org.axsl.fotree.fo.BasicLink;
 import org.axsl.fotree.fo.GraftingPoint;
 

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BidiOverridePnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BidiOverridePnr.java	2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BidiOverridePnr.java	2021-12-31 22:44:18 UTC (rev 12315)
@@ -29,7 +29,7 @@
 package org.foray.pioneer;
 
 import org.axsl.area.AncestralNormalInlineArea;
-import org.axsl.area.LineContentFactory;
+import org.axsl.area.factory.LineContentFactory;
 import org.axsl.fotree.fo.BidiOverride;
 import org.axsl.fotree.fo.GraftingPoint;
 

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockContainerPnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockContainerPnr.java	2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockContainerPnr.java	2021-12-31 22:44:18 UTC (rev 12315)
@@ -31,7 +31,7 @@
 import org.axsl.area.AreaNode;
 import org.axsl.area.AreaTreeException;
 import org.axsl.area.BlockContainerRefArea;
-import org.axsl.area.BlockLevelAreaFactory;
+import org.axsl.area.factory.BlockLevelAreaFactory;
 import org.axsl.fotree.Fo;
 import org.axsl.fotree.fo.BlockContainer;
 import org.axsl.fotree.fo.GraftingPoint;

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockDiscretePnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockDiscretePnr.java	2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockDiscretePnr.java	2021-12-31 22:44:18 UTC (rev 12315)
@@ -30,9 +30,9 @@
 
 import org.axsl.area.AreaNode;
 import org.axsl.area.AreaTreeException;
-import org.axsl.area.BlockLevelAreaFactory;
 import org.axsl.area.LineArea;
 import org.axsl.area.NormalBlockArea;
+import org.axsl.area.factory.BlockLevelAreaFactory;
 import org.axsl.common.para.ParaBranch;
 import org.axsl.common.para.ParaConfig;
 import org.axsl.common.para.ParaNode;

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockPnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockPnr.java	2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockPnr.java	2021-12-31 22:44:18 UTC (rev 12315)
@@ -30,9 +30,9 @@
 
 import org.axsl.area.AreaNode;
 import org.axsl.area.AreaTreeException;
-import org.axsl.area.BlockLevelAreaFactory;
 import org.axsl.area.LineArea;
 import org.axsl.area.NormalBlockArea;
+import org.axsl.area.factory.BlockLevelAreaFactory;
 import org.axsl.fotree.Fo;
 import org.axsl.fotree.fo.Block;
 import org.axsl.fotree.fo.GraftingPoint;

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/InlinePnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/InlinePnr.java	2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/InlinePnr.java	2021-12-31 22:44:18 UTC (rev 12315)
@@ -29,7 +29,7 @@
 package org.foray.pioneer;
 
 import org.axsl.area.AncestralNormalInlineArea;
-import org.axsl.area.LineContentFactory;
+import org.axsl.area.factory.LineContentFactory;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.Inline;
 

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/ListBlockPnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/ListBlockPnr.java	2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/ListBlockPnr.java	2021-12-31 22:44:18 UTC (rev 12315)
@@ -30,9 +30,9 @@
 
 import org.axsl.area.AreaNode;
 import org.axsl.area.AreaTreeException;
-import org.axsl.area.BlockLevelAreaFactory;
 import org.axsl.area.ListBlockArea;
 import org.axsl.area.NormalBlockArea;
+import org.axsl.area.factory.BlockLevelAreaFactory;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.ListBlock;
 import org.axsl.fotree.fo.ListItem;

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/TablePnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/TablePnr.java	2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/TablePnr.java	2021-12-31 22:44:18 UTC (rev 12315)
@@ -30,11 +30,11 @@
 
 import org.axsl.area.AreaNode;
 import org.axsl.area.AreaTreeException;
-import org.axsl.area.BlockLevelAreaFactory;
 import org.axsl.area.NormalBlockArea;
 import org.axsl.area.TableArea;
 import org.axsl.area.TableFooterContainer;
 import org.axsl.area.TableHeaderContainer;
+import org.axsl.area.factory.BlockLevelAreaFactory;
 import org.axsl.common.value.Break;
 import org.axsl.fotree.Fo;
 import org.axsl.fotree.fo.GraftingPoint;

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