1. create control package

2. move layout.FontInfo to control.Document


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196798 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 18 insertions, 18 deletions

diff --git a/src/java/org/apache/fop/fo/FOInputHandler.java b/src/java/org/apache/fop/fo/FOInputHandler.java
index a3734e465..8e06247f4 100644
--- a/src/java/org/apache/fop/fo/FOInputHandler.java
+++ b/src/java/org/apache/fop/fo/FOInputHandler.java
@@ -72,7 +72,7 @@ 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.control.Document;
 
 import org.xml.sax.SAXException;
 
@@ -115,7 +115,7 @@ public abstract class FOInputHandler extends AbstractLogEnabled {
      * Returns the FontInfo object associated with this FOInputHandler.
      * @return the FontInof object
      */
-    public FontInfo getFontInfo() {
+    public Document getFontInfo() {
         return null;
     }
 
diff --git a/src/java/org/apache/fop/fo/FOTreeHandler.java b/src/java/org/apache/fop/fo/FOTreeHandler.java
index 67fe255d6..f3fede6a0 100644
--- a/src/java/org/apache/fop/fo/FOTreeHandler.java
+++ b/src/java/org/apache/fop/fo/FOTreeHandler.java
@@ -77,7 +77,7 @@ 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.control.Document;
 import org.apache.fop.render.Renderer;
 
 /**
@@ -130,7 +130,7 @@ public class FOTreeHandler extends FOInputHandler {
     /**
      * The FontInfo for this renderer.
      */
-    private FontInfo fontInfo = new FontInfo();
+    private Document fontInfo = new Document();
 
     /**
      * Collection of objects that have registered to be notified about
@@ -477,7 +477,7 @@ public class FOTreeHandler extends FOInputHandler {
      *
      * @return the font information
      */
-    public FontInfo getFontInfo() {
+    public Document getFontInfo() {
         return this.fontInfo;
     }
 
diff --git a/src/java/org/apache/fop/fo/FObjMixed.java b/src/java/org/apache/fop/fo/FObjMixed.java
index fc791d439..4f6739f30 100644
--- a/src/java/org/apache/fop/fo/FObjMixed.java
+++ b/src/java/org/apache/fop/fo/FObjMixed.java
@@ -50,7 +50,7 @@
  */
 package org.apache.fop.fo;
 
-import org.apache.fop.layout.FontInfo;
+import org.apache.fop.control.Document;
 import org.apache.fop.layoutmgr.InlineStackingLayoutManager;
 import org.apache.fop.layoutmgr.LMiter;
 
@@ -64,7 +64,7 @@ public class FObjMixed extends FObj {
     /** TextInfo for this object */
     protected TextInfo textInfo = null;
     /** FontInfo for this object */
-    protected FontInfo fontInfo = null;
+    protected Document fontInfo = null;
 
     /**
      * @param parent FONode that is the parent of this object
diff --git a/src/java/org/apache/fop/fo/PropertyManager.java b/src/java/org/apache/fop/fo/PropertyManager.java
index 6dbbc85ef..dc5d9f918 100644
--- a/src/java/org/apache/fop/fo/PropertyManager.java
+++ b/src/java/org/apache/fop/fo/PropertyManager.java
@@ -58,7 +58,7 @@ import java.awt.geom.Rectangle2D;
 import org.apache.fop.area.CTM;
 import org.apache.fop.datatypes.FODimension;
 import org.apache.fop.layout.FontState;
-import org.apache.fop.layout.FontInfo;
+import org.apache.fop.control.Document;
 import org.apache.fop.fo.properties.CommonBorderAndPadding;
 import org.apache.fop.fo.properties.CommonMarginBlock;
 import org.apache.fop.fo.properties.CommonMarginInline;
@@ -83,7 +83,7 @@ import org.apache.fop.fo.properties.CommonHyphenation;
 public class PropertyManager {
 
     private PropertyList properties;
-    private FontInfo fontInfo = null;
+    private Document fontInfo = null;
     private FontState fontState = null;
     private CommonBorderAndPadding borderAndPadding = null;
     private CommonHyphenation hyphProps = null;
@@ -122,7 +122,7 @@ public class PropertyManager {
      * available.
      * @param fontInfo available fonts
      */
-    public void setFontInfo(FontInfo fontInfo) {
+    public void setFontInfo(Document fontInfo) {
         this.fontInfo = fontInfo;
     }
 
@@ -133,7 +133,7 @@ public class PropertyManager {
      * @param fontInfo FontInfo to work with
      * @return a FontState object
      */
-    public FontState getFontState(FontInfo fontInfo) {
+    public FontState getFontState(Document fontInfo) {
         if (fontState == null) {
             if (fontInfo == null) {
                 fontInfo = this.fontInfo;
@@ -479,7 +479,7 @@ public class PropertyManager {
      * @param fontInfo available fonts
      * @return a TextInfo object
      */
-    public TextInfo getTextLayoutProps(FontInfo fontInfo) {
+    public TextInfo getTextLayoutProps(Document fontInfo) {
         if (textInfo == null) {
             textInfo = new TextInfo();
             textInfo.fs = getFontState(fontInfo);
diff --git a/src/java/org/apache/fop/fo/flow/Leader.java b/src/java/org/apache/fop/fo/flow/Leader.java
index ea3f9790c..285aef2e8 100644
--- a/src/java/org/apache/fop/fo/flow/Leader.java
+++ b/src/java/org/apache/fop/fo/flow/Leader.java
@@ -70,7 +70,7 @@ import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
 import org.apache.fop.fo.properties.CommonBackground;
 import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.layout.FontInfo;
+import org.apache.fop.control.Document;
 import org.apache.fop.layout.FontState;
 import org.apache.fop.fo.properties.CommonMarginInline;
 import org.apache.fop.fo.properties.CommonRelativePosition;
@@ -94,7 +94,7 @@ public class Leader extends FObjMixed {
     private int leaderPattern;
     private int patternWidth;
     /** FontInfo for this object */
-    protected FontInfo fontInfo = null;
+    protected Document fontInfo = null;
     /** FontState for this object */
     protected FontState fontState;
     protected InlineArea leaderArea = null;
diff --git a/src/java/org/apache/fop/fo/flow/PageNumber.java b/src/java/org/apache/fop/fo/flow/PageNumber.java
index af8b3ea57..f6488bd1a 100644
--- a/src/java/org/apache/fop/fo/flow/PageNumber.java
+++ b/src/java/org/apache/fop/fo/flow/PageNumber.java
@@ -58,7 +58,7 @@ import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
 import org.apache.fop.fo.properties.CommonBackground;
 import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.layout.FontInfo;
+import org.apache.fop.control.Document;
 import org.apache.fop.layout.FontState;
 import org.apache.fop.fo.properties.CommonMarginInline;
 import org.apache.fop.fo.properties.CommonRelativePosition;
@@ -82,7 +82,7 @@ import org.apache.fop.area.Trait;
  */
 public class PageNumber extends FObj {
     /** FontInfo for this object */
-    protected FontInfo fontInfo = null;
+    protected Document fontInfo = null;
     /** FontState for this object */
     protected FontState fontState;
 
diff --git a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
index 367fd3e51..53a2bafde 100644
--- a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
+++ b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
 import org.apache.fop.fo.properties.CommonBackground;
 import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.layout.FontInfo;
+import org.apache.fop.control.Document;
 import org.apache.fop.layout.FontState;
 import org.apache.fop.fo.properties.CommonMarginInline;
 import org.apache.fop.fo.properties.CommonRelativePosition;
@@ -89,7 +89,7 @@ import org.apache.fop.util.CharUtilities;
  */
 public class PageNumberCitation extends FObj {
     /** FontInfo for this object **/
-    protected FontInfo fontInfo = null;
+    protected Document fontInfo = null;
     /** Fontstate for this object **/
     protected FontState fontState;