From 3fff14625687eb95ab55e2d0de7944bd86f2a261 Mon Sep 17 00:00:00 2001 From: Glen Mazza Date: Thu, 17 Jul 2003 04:52:38 +0000 Subject: [PATCH] Inter-package references between fo.flow and fo.pagination removed by moving Flow and StaticContent classes to pagination package. Pagination.PageSequence and .Root children Title, Declarations, and ColorProfile also moved under pagination. Rationale given here: http://marc.theaimsgroup.com/?l=fop-dev&m=105813290817472&w=2 git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196722 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/fo/FOElementMapping.java | 10 +++++----- src/java/org/apache/fop/fo/StructureHandler.java | 2 +- .../apache/fop/fo/{ => pagination}/ColorProfile.java | 8 +++++--- .../apache/fop/fo/{ => pagination}/Declarations.java | 12 +++++++++--- .../org/apache/fop/fo/{flow => pagination}/Flow.java | 5 ++--- .../org/apache/fop/fo/pagination/PageSequence.java | 3 --- .../fop/fo/{flow => pagination}/StaticContent.java | 4 ++-- .../org/apache/fop/fo/{ => pagination}/Title.java | 9 +++++++-- src/java/org/apache/fop/layoutmgr/LayoutHandler.java | 8 ++++---- .../org/apache/fop/layoutmgr/PageLayoutManager.java | 8 ++++---- src/java/org/apache/fop/mif/MIFHandler.java | 2 +- src/java/org/apache/fop/rtf/renderer/RTFHandler.java | 2 +- 12 files changed, 41 insertions(+), 32 deletions(-) rename src/java/org/apache/fop/fo/{ => pagination}/ColorProfile.java (96%) rename src/java/org/apache/fop/fo/{ => pagination}/Declarations.java (96%) rename src/java/org/apache/fop/fo/{flow => pagination}/Flow.java (97%) rename src/java/org/apache/fop/fo/{flow => pagination}/StaticContent.java (97%) rename src/java/org/apache/fop/fo/{ => pagination}/Title.java (96%) diff --git a/src/java/org/apache/fop/fo/FOElementMapping.java b/src/java/org/apache/fop/fo/FOElementMapping.java index 4dce2889a..0736a47bb 100644 --- a/src/java/org/apache/fop/fo/FOElementMapping.java +++ b/src/java/org/apache/fop/fo/FOElementMapping.java @@ -160,13 +160,13 @@ public class FOElementMapping extends ElementMapping { static class Dec extends ElementMapping.Maker { public FONode make(FONode parent) { - return new Declarations(parent); + return new org.apache.fop.fo.pagination.Declarations(parent); } } static class CP extends ElementMapping.Maker { public FONode make(FONode parent) { - return new ColorProfile(parent); + return new org.apache.fop.fo.pagination.ColorProfile(parent); } } @@ -250,19 +250,19 @@ public class FOElementMapping extends ElementMapping { static class Fl extends ElementMapping.Maker { public FONode make(FONode parent) { - return new org.apache.fop.fo.flow.Flow(parent); + return new org.apache.fop.fo.pagination.Flow(parent); } } static class SC extends ElementMapping.Maker { public FONode make(FONode parent) { - return new org.apache.fop.fo.flow.StaticContent(parent); + return new org.apache.fop.fo.pagination.StaticContent(parent); } } static class T extends ElementMapping.Maker { public FONode make(FONode parent) { - return new Title(parent); + return new org.apache.fop.fo.pagination.Title(parent); } } diff --git a/src/java/org/apache/fop/fo/StructureHandler.java b/src/java/org/apache/fop/fo/StructureHandler.java index 89d6f6f7a..1d5f5711d 100644 --- a/src/java/org/apache/fop/fo/StructureHandler.java +++ b/src/java/org/apache/fop/fo/StructureHandler.java @@ -61,7 +61,6 @@ import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.fop.apps.FOPException; import org.apache.fop.fo.flow.Block; import org.apache.fop.fo.flow.ExternalGraphic; -import org.apache.fop.fo.flow.Flow; import org.apache.fop.fo.flow.InstreamForeignObject; import org.apache.fop.fo.flow.Leader; import org.apache.fop.fo.flow.ListBlock; @@ -70,6 +69,7 @@ import org.apache.fop.fo.flow.Table; import org.apache.fop.fo.flow.TableBody; import org.apache.fop.fo.flow.TableCell; import org.apache.fop.fo.flow.TableRow; +import org.apache.fop.fo.pagination.Flow; import org.apache.fop.fo.pagination.PageSequence; import org.apache.fop.layout.FontInfo; diff --git a/src/java/org/apache/fop/fo/ColorProfile.java b/src/java/org/apache/fop/fo/pagination/ColorProfile.java similarity index 96% rename from src/java/org/apache/fop/fo/ColorProfile.java rename to src/java/org/apache/fop/fo/pagination/ColorProfile.java index da432d826..12413aec8 100644 --- a/src/java/org/apache/fop/fo/ColorProfile.java +++ b/src/java/org/apache/fop/fo/pagination/ColorProfile.java @@ -1,5 +1,5 @@ /* - * $Id: ColorProfile.java,v 1.10 2003/03/05 21:48:01 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,7 +48,7 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.fo; +package org.apache.fop.fo.pagination; // Java import java.awt.color.ICC_Profile; @@ -59,6 +59,8 @@ import java.io.InputStream; // FOP import org.apache.fop.datatypes.ColorType; +import org.apache.fop.fo.FONode; +import org.apache.fop.fo.FObj; /** * The fo:color-profile formatting object. @@ -73,7 +75,7 @@ public class ColorProfile extends FObj { /** * @see org.apache.fop.fo.FONode#FONode(FONode) */ - protected ColorProfile(FONode parent) { + public ColorProfile(FONode parent) { super(parent); } diff --git a/src/java/org/apache/fop/fo/Declarations.java b/src/java/org/apache/fop/fo/pagination/Declarations.java similarity index 96% rename from src/java/org/apache/fop/fo/Declarations.java rename to src/java/org/apache/fop/fo/pagination/Declarations.java index 6dfb9aa61..c1bc817f9 100644 --- a/src/java/org/apache/fop/fo/Declarations.java +++ b/src/java/org/apache/fop/fo/pagination/Declarations.java @@ -1,5 +1,5 @@ /* - * $Id: Declarations.java,v 1.8 2003/03/05 21:48:01 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,13 +48,19 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.fo; +package org.apache.fop.fo.pagination; // Java import java.util.List; import java.util.Map; import java.util.Iterator; +// FOP +import org.apache.fop.fo.FONode; +import org.apache.fop.fo.FObj; +import org.apache.fop.fo.XMLObj; + + /** * Declarations formatting object. * A declarations formatting object holds a set of color-profiles @@ -67,7 +73,7 @@ public class Declarations extends FObj { private Map colorProfiles = null; private List external = null; - protected Declarations(FONode parent) { + public Declarations(FONode parent) { super(parent); } diff --git a/src/java/org/apache/fop/fo/flow/Flow.java b/src/java/org/apache/fop/fo/pagination/Flow.java similarity index 97% rename from src/java/org/apache/fop/fo/flow/Flow.java rename to src/java/org/apache/fop/fo/pagination/Flow.java index d66799592..3bcaf5d35 100644 --- a/src/java/org/apache/fop/fo/flow/Flow.java +++ b/src/java/org/apache/fop/fo/pagination/Flow.java @@ -1,5 +1,5 @@ /* - * $Id: Flow.java,v 1.37 2003/03/06 11:36:30 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,7 +48,7 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.fo.flow; +package org.apache.fop.fo.pagination; // Java import java.util.ArrayList; @@ -60,7 +60,6 @@ import org.xml.sax.Attributes; // FOP import org.apache.fop.fo.FONode; import org.apache.fop.fo.FObj; -import org.apache.fop.fo.pagination.PageSequence; import org.apache.fop.apps.FOPException; import org.apache.fop.layoutmgr.FlowLayoutManager; diff --git a/src/java/org/apache/fop/fo/pagination/PageSequence.java b/src/java/org/apache/fop/fo/pagination/PageSequence.java index dcb8c6b48..892a67c8b 100644 --- a/src/java/org/apache/fop/fo/pagination/PageSequence.java +++ b/src/java/org/apache/fop/fo/pagination/PageSequence.java @@ -53,9 +53,6 @@ package org.apache.fop.fo.pagination; // FOP import org.apache.fop.fo.FONode; import org.apache.fop.fo.FObj; -import org.apache.fop.fo.Title; -import org.apache.fop.fo.flow.Flow; -import org.apache.fop.fo.flow.StaticContent; import org.apache.fop.layout.PageMaster; import org.apache.fop.area.AreaTree; import org.apache.fop.area.PageViewport; diff --git a/src/java/org/apache/fop/fo/flow/StaticContent.java b/src/java/org/apache/fop/fo/pagination/StaticContent.java similarity index 97% rename from src/java/org/apache/fop/fo/flow/StaticContent.java rename to src/java/org/apache/fop/fo/pagination/StaticContent.java index 6ded5505d..d18d6d798 100644 --- a/src/java/org/apache/fop/fo/flow/StaticContent.java +++ b/src/java/org/apache/fop/fo/pagination/StaticContent.java @@ -1,5 +1,5 @@ /* - * $Id: StaticContent.java,v 1.26 2003/03/06 11:36:30 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,7 +48,7 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.fo.flow; +package org.apache.fop.fo.pagination; // FOP import org.apache.fop.fo.FONode; diff --git a/src/java/org/apache/fop/fo/Title.java b/src/java/org/apache/fop/fo/pagination/Title.java similarity index 96% rename from src/java/org/apache/fop/fo/Title.java rename to src/java/org/apache/fop/fo/pagination/Title.java index 4857e0830..7389e0fce 100644 --- a/src/java/org/apache/fop/fo/Title.java +++ b/src/java/org/apache/fop/fo/pagination/Title.java @@ -1,5 +1,5 @@ /* - * $Id: Title.java,v 1.15 2003/03/05 21:48:01 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,11 +48,16 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.fo; +package org.apache.fop.fo.pagination; // FOP import org.apache.fop.datatypes.ColorType; import org.apache.fop.datatypes.Length; +import org.apache.fop.fo.EnumProperty; +import org.apache.fop.fo.FObjMixed; +import org.apache.fop.fo.FONode; +import org.apache.fop.fo.LengthProperty; +import org.apache.fop.fo.Property; import org.apache.fop.layout.AccessibilityProps; import org.apache.fop.layout.AuralProps; import org.apache.fop.layout.BackgroundProps; diff --git a/src/java/org/apache/fop/layoutmgr/LayoutHandler.java b/src/java/org/apache/fop/layoutmgr/LayoutHandler.java index e3986d17e..4a2a89fec 100644 --- a/src/java/org/apache/fop/layoutmgr/LayoutHandler.java +++ b/src/java/org/apache/fop/layoutmgr/LayoutHandler.java @@ -66,11 +66,7 @@ import org.apache.fop.area.StorePagesModel; import org.apache.fop.area.Title; import org.apache.fop.area.TreeExt; import org.apache.fop.fo.StructureHandler; -import org.apache.fop.fo.pagination.PageSequence; -import org.apache.fop.layout.FontInfo; -import org.apache.fop.render.Renderer; import org.apache.fop.fo.flow.Block; -import org.apache.fop.fo.flow.Flow; import org.apache.fop.fo.flow.ExternalGraphic; import org.apache.fop.fo.flow.InstreamForeignObject; import org.apache.fop.fo.flow.Leader; @@ -80,6 +76,10 @@ import org.apache.fop.fo.flow.Table; import org.apache.fop.fo.flow.TableBody; import org.apache.fop.fo.flow.TableCell; import org.apache.fop.fo.flow.TableRow; +import org.apache.fop.fo.pagination.Flow; +import org.apache.fop.fo.pagination.PageSequence; +import org.apache.fop.layout.FontInfo; +import org.apache.fop.render.Renderer; /** * Layout handler that receives the structure events. diff --git a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java index e179edddf..dd65ad663 100644 --- a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java @@ -65,13 +65,13 @@ import org.apache.fop.area.BeforeFloat; import org.apache.fop.area.Footnote; import org.apache.fop.area.Resolveable; import org.apache.fop.fo.flow.Marker; -import org.apache.fop.fo.flow.StaticContent; +import org.apache.fop.fo.properties.Constants; +import org.apache.fop.fo.pagination.PageNumberGenerator; import org.apache.fop.fo.pagination.PageSequence; import org.apache.fop.fo.pagination.Region; -import org.apache.fop.fo.pagination.SimplePageMaster; -import org.apache.fop.fo.pagination.PageNumberGenerator; -import org.apache.fop.fo.properties.Constants; import org.apache.fop.fo.properties.RetrieveBoundary; +import org.apache.fop.fo.pagination.SimplePageMaster; +import org.apache.fop.fo.pagination.StaticContent; import java.util.ArrayList; import java.util.List; diff --git a/src/java/org/apache/fop/mif/MIFHandler.java b/src/java/org/apache/fop/mif/MIFHandler.java index 5685dcf08..c8f2132a9 100644 --- a/src/java/org/apache/fop/mif/MIFHandler.java +++ b/src/java/org/apache/fop/mif/MIFHandler.java @@ -60,7 +60,7 @@ import org.xml.sax.SAXException; // FOP import org.apache.fop.fo.StructureHandler; import org.apache.fop.fo.flow.Block; -import org.apache.fop.fo.flow.Flow; +import org.apache.fop.fo.pagination.Flow; import org.apache.fop.fo.pagination.PageSequence; import org.apache.fop.fo.pagination.PageSequenceMaster; import org.apache.fop.fo.pagination.SimplePageMaster; diff --git a/src/java/org/apache/fop/rtf/renderer/RTFHandler.java b/src/java/org/apache/fop/rtf/renderer/RTFHandler.java index a06521ecd..03b5346fb 100644 --- a/src/java/org/apache/fop/rtf/renderer/RTFHandler.java +++ b/src/java/org/apache/fop/rtf/renderer/RTFHandler.java @@ -60,7 +60,6 @@ import org.apache.fop.datatypes.ColorType; import org.apache.fop.fo.StructureHandler; import org.apache.fop.fo.flow.Block; import org.apache.fop.fo.flow.ExternalGraphic; -import org.apache.fop.fo.flow.Flow; import org.apache.fop.fo.flow.InstreamForeignObject; import org.apache.fop.fo.flow.Leader; import org.apache.fop.fo.flow.ListBlock; @@ -69,6 +68,7 @@ import org.apache.fop.fo.flow.Table; import org.apache.fop.fo.flow.TableBody; import org.apache.fop.fo.flow.TableCell; import org.apache.fop.fo.flow.TableRow; +import org.apache.fop.fo.pagination.Flow; import org.apache.fop.fo.pagination.PageSequence; import org.apache.fop.fo.properties.Constants; import org.apache.fop.layout.FontInfo; -- 2.39.5