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

@@ -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);
         }
     }
 

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;
 

src/java/org/apache/fop/fo/ColorProfile.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */ 
-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);
     }
 

src/java/org/apache/fop/fo/Declarations.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */ 
-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);
     }
 

src/java/org/apache/fop/fo/flow/Flow.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-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;
 

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;

src/java/org/apache/fop/fo/flow/StaticContent.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-package org.apache.fop.fo.flow;
+package org.apache.fop.fo.pagination;
 
 // FOP
 import org.apache.fop.fo.FONode;

src/java/org/apache/fop/fo/Title.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-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;

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.

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;

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;

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;