move control/Document to apps/Document

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

27 files changed, 34 insertions, 31 deletions

diff --git a/src/java/org/apache/fop/control/Document.java b/src/java/org/apache/fop/apps/Document.java
index 48c0c88de..a78b51d16 100644
--- a/src/java/org/apache/fop/control/Document.java
+++ b/src/java/org/apache/fop/apps/Document.java
@@ -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.control;
+package org.apache.fop.apps;
 
 // Java
 import java.util.Map;
@@ -57,8 +57,8 @@ import java.io.IOException;
 // FOP
 import org.apache.fop.area.AreaTree;
 import org.apache.fop.area.AreaTreeModel;
-import org.apache.fop.apps.Driver;
-import org.apache.fop.apps.FOPException;
+
+
 import org.apache.fop.fo.FOTreeControl;
 import org.apache.fop.fo.FOTreeEvent;
 import org.apache.fop.fo.FOTreeListener;
diff --git a/src/java/org/apache/fop/apps/Driver.java b/src/java/org/apache/fop/apps/Driver.java
index b91a275ec..784060cc9 100644
--- a/src/java/org/apache/fop/apps/Driver.java
+++ b/src/java/org/apache/fop/apps/Driver.java
@@ -52,7 +52,7 @@ package org.apache.fop.apps;
 
 // FOP
 import org.apache.fop.area.AreaTree;
-import org.apache.fop.control.Document;
+
 import org.apache.fop.fo.ElementMapping;
 import org.apache.fop.fo.FOTreeBuilder;
 import org.apache.fop.fo.FOUserAgent;
diff --git a/src/java/org/apache/fop/extensions/Bookmarks.java b/src/java/org/apache/fop/extensions/Bookmarks.java
index d013028c0..dbd1c6a81 100644
--- a/src/java/org/apache/fop/extensions/Bookmarks.java
+++ b/src/java/org/apache/fop/extensions/Bookmarks.java
@@ -54,7 +54,7 @@ import org.apache.fop.fo.FOTreeHandler;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTreeVisitor;
 import org.apache.fop.area.AreaTree;
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 
 import java.util.ArrayList;
 
diff --git a/src/java/org/apache/fop/mif/MIFHandler.java b/src/java/org/apache/fop/mif/MIFHandler.java
index 7496ef90c..c1a77b57d 100644
--- a/src/java/org/apache/fop/mif/MIFHandler.java
+++ b/src/java/org/apache/fop/mif/MIFHandler.java
@@ -65,7 +65,7 @@ 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;
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.flow.ExternalGraphic;
 import org.apache.fop.fo.flow.InstreamForeignObject;
diff --git a/src/java/org/apache/fop/render/PrintRenderer.java b/src/java/org/apache/fop/render/PrintRenderer.java
index befd43b8e..59ffda9d5 100644
--- a/src/java/org/apache/fop/render/PrintRenderer.java
+++ b/src/java/org/apache/fop/render/PrintRenderer.java
@@ -52,7 +52,7 @@ package org.apache.fop.render;
 
 // FOP
 import org.apache.fop.render.pdf.FontSetup;
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 import org.apache.fop.fo.FOTreeControl;
 
 // Java
diff --git a/src/java/org/apache/fop/render/awt/AWTRenderer.java b/src/java/org/apache/fop/render/awt/AWTRenderer.java
index 0c04be3d2..aaf56ebcf 100644
--- a/src/java/org/apache/fop/render/awt/AWTRenderer.java
+++ b/src/java/org/apache/fop/render/awt/AWTRenderer.java
@@ -77,7 +77,7 @@ import java.util.Map;
 
 // FOP
 import org.apache.fop.apps.InputHandler;
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 import org.apache.fop.fo.FOTreeControl;
 import org.apache.fop.render.AbstractRenderer;
 import org.apache.fop.viewer.PreviewDialog;
diff --git a/src/java/org/apache/fop/render/awt/FontSetup.java b/src/java/org/apache/fop/render/awt/FontSetup.java
index 0bc24424d..6297a7998 100644
--- a/src/java/org/apache/fop/render/awt/FontSetup.java
+++ b/src/java/org/apache/fop/render/awt/FontSetup.java
@@ -51,7 +51,7 @@
 package org.apache.fop.render.awt;
 
 // FOP
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 import org.apache.fop.fonts.Font;
 
 // Java
diff --git a/src/java/org/apache/fop/render/pdf/FontSetup.java b/src/java/org/apache/fop/render/pdf/FontSetup.java
index d1e7880db..74caf1592 100644
--- a/src/java/org/apache/fop/render/pdf/FontSetup.java
+++ b/src/java/org/apache/fop/render/pdf/FontSetup.java
@@ -58,7 +58,7 @@ import org.apache.fop.fonts.Typeface;
 import org.apache.fop.fonts.FontDescriptor;
 import org.apache.fop.fonts.FontUtil;
 import org.apache.fop.fonts.LazyFont;
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 import org.apache.fop.pdf.PDFDocument;
 import org.apache.fop.pdf.PDFResources;
 // FOP (base 14 fonts)
diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderer.java b/src/java/org/apache/fop/render/pdf/PDFRenderer.java
index baea57a97..5ae4d098c 100644
--- a/src/java/org/apache/fop/render/pdf/PDFRenderer.java
+++ b/src/java/org/apache/fop/render/pdf/PDFRenderer.java
@@ -117,6 +117,7 @@ import org.apache.fop.area.inline.InlineParent;
 import org.apache.fop.fonts.Font;
 import org.apache.fop.traits.BorderProps;
 import org.apache.fop.datatypes.ColorType;
+import org.apache.fop.apps.*;
 
 /*
 todo:
@@ -283,7 +284,7 @@ public class PDFRenderer extends PrintRenderer {
      */
     public void stopRenderer() throws IOException {
         FontSetup.addToResources(pdfDoc, pdfDoc.getResources(),
-                                 (org.apache.fop.control.Document)fontInfo);
+                                 (org.apache.fop.apps.Document)fontInfo);
         pdfDoc.outputTrailer(ostream);
 
         this.pdfDoc = null;
diff --git a/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java b/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java
index 2a627bf78..1ca612be6 100644
--- a/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java
+++ b/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java
@@ -62,7 +62,7 @@ import org.apache.fop.svg.PDFTextElementBridge;
 import org.apache.fop.svg.PDFAElementBridge;
 import org.apache.fop.svg.PDFGraphics2D;
 import org.apache.fop.svg.SVGUserAgent;
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 
 /* org.w3c.dom.Document is not imported to avoid conflict with
    org.apache.fop.control.Document */
diff --git a/src/java/org/apache/fop/render/ps/PSDocumentGraphics2D.java b/src/java/org/apache/fop/render/ps/PSDocumentGraphics2D.java
index 0312c3129..35c3fc7fd 100644
--- a/src/java/org/apache/fop/render/ps/PSDocumentGraphics2D.java
+++ b/src/java/org/apache/fop/render/ps/PSDocumentGraphics2D.java
@@ -62,7 +62,7 @@ import java.io.IOException;
 
 //FOP
 import org.apache.fop.render.pdf.FontSetup;
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 
 /**
  * This class is a wrapper for the <tt>PSGraphics2D</tt> that
diff --git a/src/java/org/apache/fop/render/ps/PSGraphics2D.java b/src/java/org/apache/fop/render/ps/PSGraphics2D.java
index 009bc9005..98aa6fdbf 100644
--- a/src/java/org/apache/fop/render/ps/PSGraphics2D.java
+++ b/src/java/org/apache/fop/render/ps/PSGraphics2D.java
@@ -84,7 +84,7 @@ import java.awt.image.renderable.RenderableImage;
 import java.io.IOException;
 
 // FOP
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 import org.apache.fop.fonts.Font;
 
 // Batik
diff --git a/src/java/org/apache/fop/render/ps/PSProcSets.java b/src/java/org/apache/fop/render/ps/PSProcSets.java
index b5f19267c..f1b40156b 100644
--- a/src/java/org/apache/fop/render/ps/PSProcSets.java
+++ b/src/java/org/apache/fop/render/ps/PSProcSets.java
@@ -56,7 +56,7 @@ import java.util.Map;
 
 import org.apache.fop.fonts.Typeface;
 import org.apache.fop.fonts.Glyphs;
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 
 /**
  * This class defines the basic resources (procsets) used by FOP's PostScript
diff --git a/src/java/org/apache/fop/render/ps/PSRenderer.java b/src/java/org/apache/fop/render/ps/PSRenderer.java
index 6514fb2d6..d1d9a1fa2 100644
--- a/src/java/org/apache/fop/render/ps/PSRenderer.java
+++ b/src/java/org/apache/fop/render/ps/PSRenderer.java
@@ -73,7 +73,7 @@ import org.apache.fop.area.inline.Word;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.FOUserAgent;
 import org.apache.fop.fonts.Typeface;
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 import org.apache.fop.render.AbstractRenderer;
 import org.apache.fop.render.RendererContext;
 import org.apache.fop.fo.FOTreeControl;
diff --git a/src/java/org/apache/fop/render/ps/PSTextElementBridge.java b/src/java/org/apache/fop/render/ps/PSTextElementBridge.java
index d2db5233a..3a4604839 100644
--- a/src/java/org/apache/fop/render/ps/PSTextElementBridge.java
+++ b/src/java/org/apache/fop/render/ps/PSTextElementBridge.java
@@ -56,7 +56,7 @@ import org.apache.batik.bridge.BridgeContext;
 //import org.apache.batik.bridge.TextUtilities;
 import org.apache.batik.gvt.GraphicsNode;
 
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/src/java/org/apache/fop/render/ps/PSTextPainter.java b/src/java/org/apache/fop/render/ps/PSTextPainter.java
index 76b1696de..f8ed1d10a 100644
--- a/src/java/org/apache/fop/render/ps/PSTextPainter.java
+++ b/src/java/org/apache/fop/render/ps/PSTextPainter.java
@@ -75,7 +75,7 @@ import org.apache.batik.gvt.renderer.StrokingTextPainter;
 
 import org.apache.fop.fonts.FontMetrics;
 import org.apache.fop.fonts.Font;
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 
 /**
  * Renders the attributed character iterator of a <tt>TextNode</tt>.
diff --git a/src/java/org/apache/fop/render/ps/PSTranscoder.java b/src/java/org/apache/fop/render/ps/PSTranscoder.java
index d5be860d3..0416b7f24 100644
--- a/src/java/org/apache/fop/render/ps/PSTranscoder.java
+++ b/src/java/org/apache/fop/render/ps/PSTranscoder.java
@@ -85,6 +85,7 @@ import org.apache.batik.gvt.renderer.StrokingTextPainter;
 import org.w3c.dom.Document;
 import org.w3c.dom.svg.SVGDocument;
 import org.w3c.dom.svg.SVGSVGElement;
+import org.apache.fop.apps.*;
 
 /**
  * This class enables to transcode an input to a PostScript document.
diff --git a/src/java/org/apache/fop/render/ps/PSXMLHandler.java b/src/java/org/apache/fop/render/ps/PSXMLHandler.java
index 524d05cfa..7960d04fc 100644
--- a/src/java/org/apache/fop/render/ps/PSXMLHandler.java
+++ b/src/java/org/apache/fop/render/ps/PSXMLHandler.java
@@ -68,7 +68,7 @@ import org.apache.batik.gvt.GraphicsNode;
 import org.apache.batik.gvt.TextPainter;
 
 // FOP
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 import org.apache.fop.render.XMLHandler;
 import org.apache.fop.render.RendererContext;
 import org.apache.fop.svg.SVGUserAgent;
@@ -150,7 +150,7 @@ public class PSXMLHandler implements XMLHandler {
     public static PSInfo getPSInfo(RendererContext context) {
         PSInfo psi = new PSInfo();
         psi.psGenerator = (PSGenerator)context.getProperty(PS_GENERATOR);
-        psi.fontInfo = (org.apache.fop.control.Document)context.getProperty(PS_FONT_INFO);
+        psi.fontInfo = (org.apache.fop.apps.Document)context.getProperty(PS_FONT_INFO);
         psi.width = ((Integer)context.getProperty(PS_WIDTH)).intValue();
         psi.height = ((Integer)context.getProperty(PS_HEIGHT)).intValue();
         psi.currentXPosition = ((Integer)context.getProperty(PS_XPOS)).intValue();
@@ -166,7 +166,7 @@ public class PSXMLHandler implements XMLHandler {
         /** see PS_GENERATOR */
         private PSGenerator psGenerator;
         /** see PS_FONT_INFO */
-        private org.apache.fop.control.Document fontInfo;
+        private org.apache.fop.apps.Document fontInfo;
         /** see PS_PAGE_WIDTH */
         private int width;
         /** see PS_PAGE_HEIGHT */
@@ -195,7 +195,7 @@ public class PSXMLHandler implements XMLHandler {
          * Returns the fontInfo.
          * @return FontInfo
          */
-        public org.apache.fop.control.Document getFontInfo() {
+        public org.apache.fop.apps.Document getFontInfo() {
             return fontInfo;
         }
 
@@ -203,7 +203,7 @@ public class PSXMLHandler implements XMLHandler {
          * Sets the fontInfo.
          * @param fontInfo The fontInfo to set
          */
-        public void setFontInfo(org.apache.fop.control.Document fontInfo) {
+        public void setFontInfo(org.apache.fop.apps.Document fontInfo) {
             this.fontInfo = fontInfo;
         }
 
diff --git a/src/java/org/apache/fop/render/svg/SVGRenderer.java b/src/java/org/apache/fop/render/svg/SVGRenderer.java
index 5181082ce..26ae4cb55 100644
--- a/src/java/org/apache/fop/render/svg/SVGRenderer.java
+++ b/src/java/org/apache/fop/render/svg/SVGRenderer.java
@@ -57,7 +57,7 @@ import org.apache.fop.area.inline.ForeignObject;
 import org.apache.fop.area.inline.Leader;
 import org.apache.fop.area.inline.Word;
 import org.apache.fop.svg.SVGUtilities;
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 import org.apache.fop.fo.FOUserAgent;
 import org.apache.fop.fo.properties.RuleStyle;
 import org.apache.fop.fo.FOTreeControl;
diff --git a/src/java/org/apache/fop/render/xml/XMLRenderer.java b/src/java/org/apache/fop/render/xml/XMLRenderer.java
index 86aac11f7..816b268ec 100644
--- a/src/java/org/apache/fop/render/xml/XMLRenderer.java
+++ b/src/java/org/apache/fop/render/xml/XMLRenderer.java
@@ -68,7 +68,7 @@ import org.apache.fop.render.AbstractRenderer;
 import org.apache.fop.render.RendererContext;
 import org.apache.fop.render.XMLHandler;
 import org.apache.fop.fo.FOUserAgent;
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.area.BeforeFloat;
 import org.apache.fop.area.Block;
diff --git a/src/java/org/apache/fop/rtf/renderer/RTFHandler.java b/src/java/org/apache/fop/rtf/renderer/RTFHandler.java
index 881f95619..f1953d7f2 100644
--- a/src/java/org/apache/fop/rtf/renderer/RTFHandler.java
+++ b/src/java/org/apache/fop/rtf/renderer/RTFHandler.java
@@ -72,7 +72,7 @@ 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.control.Document;
+import org.apache.fop.apps.Document;
 import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes;
 import org.apache.fop.rtf.rtflib.rtfdoc.RtfColorTable;
 import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea;
diff --git a/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java b/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java
index 93880f1b4..4f2ec8d93 100644
--- a/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java
+++ b/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java
@@ -69,7 +69,7 @@ import org.apache.avalon.framework.container.ContainerUtil;
 import org.apache.avalon.framework.logger.ConsoleLogger;
 import org.apache.avalon.framework.logger.LogEnabled;
 import org.apache.avalon.framework.logger.Logger;
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 
 import java.awt.Graphics;
 import java.awt.Font;
diff --git a/src/java/org/apache/fop/svg/PDFGraphics2D.java b/src/java/org/apache/fop/svg/PDFGraphics2D.java
index 07e01dbfb..d3f48f1fe 100644
--- a/src/java/org/apache/fop/svg/PDFGraphics2D.java
+++ b/src/java/org/apache/fop/svg/PDFGraphics2D.java
@@ -64,7 +64,7 @@ import org.apache.fop.pdf.PDFDocument;
 import org.apache.fop.pdf.PDFLink;
 import org.apache.fop.pdf.PDFAnnotList;
 import org.apache.fop.pdf.BitmapImage;
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 import org.apache.fop.fonts.Font;
 import org.apache.fop.render.pdf.FontSetup;
 import org.apache.fop.fonts.FontMetrics;
diff --git a/src/java/org/apache/fop/svg/PDFTextElementBridge.java b/src/java/org/apache/fop/svg/PDFTextElementBridge.java
index 1f7eaaa5d..ae8164aea 100644
--- a/src/java/org/apache/fop/svg/PDFTextElementBridge.java
+++ b/src/java/org/apache/fop/svg/PDFTextElementBridge.java
@@ -56,7 +56,7 @@ import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.bridge.TextUtilities;
 import org.apache.batik.gvt.GraphicsNode;
 
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/src/java/org/apache/fop/svg/PDFTextPainter.java b/src/java/org/apache/fop/svg/PDFTextPainter.java
index cfbdc60ef..111ccb3e7 100644
--- a/src/java/org/apache/fop/svg/PDFTextPainter.java
+++ b/src/java/org/apache/fop/svg/PDFTextPainter.java
@@ -74,7 +74,7 @@ import org.apache.batik.gvt.renderer.StrokingTextPainter;
 
 import org.apache.fop.fonts.FontMetrics;
 import org.apache.fop.fonts.Font;
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 
 /**
  * Renders the attributed character iterator of a <tt>TextNode</tt>.
diff --git a/src/java/org/apache/fop/svg/PDFTranscoder.java b/src/java/org/apache/fop/svg/PDFTranscoder.java
index 6b69c659b..2681743b1 100644
--- a/src/java/org/apache/fop/svg/PDFTranscoder.java
+++ b/src/java/org/apache/fop/svg/PDFTranscoder.java
@@ -76,6 +76,7 @@ import org.apache.batik.transcoder.image.resources.Messages;
 import org.w3c.dom.Document;
 import org.w3c.dom.svg.SVGDocument;
 import org.w3c.dom.svg.SVGSVGElement;
+import org.apache.fop.apps.*;
 
 /**
  * This class enables to transcode an input to a pdf document.
diff --git a/src/java/org/apache/fop/tools/AreaTreeBuilder.java b/src/java/org/apache/fop/tools/AreaTreeBuilder.java
index 07b3683ff..dd25fdecc 100644
--- a/src/java/org/apache/fop/tools/AreaTreeBuilder.java
+++ b/src/java/org/apache/fop/tools/AreaTreeBuilder.java
@@ -100,7 +100,7 @@ import org.apache.fop.area.inline.Leader;
 import org.apache.fop.area.inline.Space;
 import org.apache.fop.area.inline.Viewport;
 import org.apache.fop.area.inline.Word;
-import org.apache.fop.control.Document;
+import org.apache.fop.apps.Document;
 import org.apache.fop.fonts.Font;
 import org.apache.fop.render.Renderer;
 import org.apache.fop.render.pdf.PDFRenderer;