From 8557c71491d1a744b9e717793c4fa7dd1c8a636a Mon Sep 17 00:00:00 2001 From: William Victor Mote Date: Fri, 22 Aug 2003 17:42:42 +0000 Subject: [PATCH] move fo/FOUserAgent to apps/FOUserAgent, as it manages configuration information for the application as a whole git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196827 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/apps/Driver.java | 2 +- src/java/org/apache/fop/{fo => apps}/FOUserAgent.java | 4 ++-- src/java/org/apache/fop/fo/FONode.java | 1 + src/java/org/apache/fop/fo/FOTreeBuilder.java | 1 + src/java/org/apache/fop/fo/FObjMixed.java | 2 ++ src/java/org/apache/fop/fo/flow/ExternalGraphic.java | 1 + src/java/org/apache/fop/fo/flow/ListItemBody.java | 1 + src/java/org/apache/fop/fo/flow/ListItemLabel.java | 1 + src/java/org/apache/fop/fo/flow/TableColumn.java | 1 + src/java/org/apache/fop/fo/pagination/StaticContent.java | 1 + src/java/org/apache/fop/fo/pagination/Title.java | 1 + src/java/org/apache/fop/image/AbstractFopImage.java | 2 +- src/java/org/apache/fop/image/BmpImage.java | 2 +- src/java/org/apache/fop/image/FopImage.java | 2 +- src/java/org/apache/fop/image/GifImage.java | 2 +- src/java/org/apache/fop/image/ImageCache.java | 2 +- src/java/org/apache/fop/image/ImageFactory.java | 2 +- src/java/org/apache/fop/image/ImageLoader.java | 2 +- src/java/org/apache/fop/image/JimiImage.java | 2 +- src/java/org/apache/fop/image/JpegImage.java | 2 +- src/java/org/apache/fop/image/analyser/BMPReader.java | 2 +- src/java/org/apache/fop/image/analyser/EPSReader.java | 2 +- src/java/org/apache/fop/image/analyser/GIFReader.java | 2 +- src/java/org/apache/fop/image/analyser/ImageReader.java | 2 +- .../org/apache/fop/image/analyser/ImageReaderFactory.java | 2 +- src/java/org/apache/fop/image/analyser/JPEGReader.java | 2 +- src/java/org/apache/fop/image/analyser/PNGReader.java | 2 +- src/java/org/apache/fop/image/analyser/SVGReader.java | 2 +- src/java/org/apache/fop/image/analyser/TIFFReader.java | 2 +- src/java/org/apache/fop/image/analyser/XMLReader.java | 2 +- src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java | 2 +- src/java/org/apache/fop/layoutmgr/AddLMVisitor.java | 1 + src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java | 1 + src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java | 2 +- src/java/org/apache/fop/layoutmgr/LayoutManager.java | 2 +- src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java | 1 + src/java/org/apache/fop/layoutmgr/PageLayoutManager.java | 1 + .../org/apache/fop/layoutmgr/list/ListItemLayoutManager.java | 1 + src/java/org/apache/fop/layoutmgr/table/Row.java | 1 + .../org/apache/fop/layoutmgr/table/TableLayoutManager.java | 1 + src/java/org/apache/fop/pdf/PDFEncryptionManager.java | 2 +- src/java/org/apache/fop/render/AbstractRenderer.java | 2 +- src/java/org/apache/fop/render/Renderer.java | 2 +- src/java/org/apache/fop/render/RendererContext.java | 2 +- src/java/org/apache/fop/render/pdf/PDFRenderer.java | 2 +- src/java/org/apache/fop/render/pdf/PDFXMLHandler.java | 1 + src/java/org/apache/fop/render/ps/PSRenderer.java | 2 +- src/java/org/apache/fop/render/ps/PSXMLHandler.java | 1 + src/java/org/apache/fop/render/svg/SVGRenderer.java | 2 +- src/java/org/apache/fop/render/xml/XMLRenderer.java | 2 +- src/java/org/apache/fop/svg/SVGElement.java | 1 + src/java/org/apache/fop/svg/SVGUserAgent.java | 2 +- src/java/org/apache/fop/tools/AreaTreeBuilder.java | 2 +- src/java/org/apache/fop/tools/TestConverter.java | 2 +- src/java/org/apache/fop/tools/anttasks/Fop.java | 2 +- 55 files changed, 57 insertions(+), 37 deletions(-) rename src/java/org/apache/fop/{fo => apps}/FOUserAgent.java (98%) diff --git a/src/java/org/apache/fop/apps/Driver.java b/src/java/org/apache/fop/apps/Driver.java index 39bff6799..f6d71aeaa 100644 --- a/src/java/org/apache/fop/apps/Driver.java +++ b/src/java/org/apache/fop/apps/Driver.java @@ -55,7 +55,7 @@ import org.apache.fop.area.AreaTree; import org.apache.fop.fo.ElementMapping; import org.apache.fop.fo.FOTreeBuilder; -import org.apache.fop.fo.FOUserAgent; + import org.apache.fop.fo.FOInputHandler; import org.apache.fop.fo.FOTreeHandler; import org.apache.fop.mif.MIFHandler; diff --git a/src/java/org/apache/fop/fo/FOUserAgent.java b/src/java/org/apache/fop/apps/FOUserAgent.java similarity index 98% rename from src/java/org/apache/fop/fo/FOUserAgent.java rename to src/java/org/apache/fop/apps/FOUserAgent.java index 9fbcf9ae4..437c2d5fb 100644 --- a/src/java/org/apache/fop/fo/FOUserAgent.java +++ b/src/java/org/apache/fop/apps/FOUserAgent.java @@ -1,5 +1,5 @@ /* - * $Id: FOUserAgent.java,v 1.15 2003/03/05 21:48:02 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.apps; // Java import java.util.Map; diff --git a/src/java/org/apache/fop/fo/FONode.java b/src/java/org/apache/fop/fo/FONode.java index 732be0af9..d4091e68c 100644 --- a/src/java/org/apache/fop/fo/FONode.java +++ b/src/java/org/apache/fop/fo/FONode.java @@ -63,6 +63,7 @@ import org.apache.avalon.framework.logger.Logger; import org.apache.fop.apps.FOPException; import org.apache.fop.fo.FOTreeControl; import org.apache.fop.util.CharUtilities; +import org.apache.fop.apps.*; /** * base class for nodes in the XML tree diff --git a/src/java/org/apache/fop/fo/FOTreeBuilder.java b/src/java/org/apache/fop/fo/FOTreeBuilder.java index 7f07bfc4a..34fa5b4dd 100644 --- a/src/java/org/apache/fop/fo/FOTreeBuilder.java +++ b/src/java/org/apache/fop/fo/FOTreeBuilder.java @@ -74,6 +74,7 @@ import java.io.Reader; import java.util.Enumeration; import java.util.Iterator; import java.util.List; +import org.apache.fop.apps.*; /** * SAX Handler that passes parsed data to the various diff --git a/src/java/org/apache/fop/fo/FObjMixed.java b/src/java/org/apache/fop/fo/FObjMixed.java index 179f2fe91..54afc4750 100644 --- a/src/java/org/apache/fop/fo/FObjMixed.java +++ b/src/java/org/apache/fop/fo/FObjMixed.java @@ -50,6 +50,8 @@ */ package org.apache.fop.fo; +import org.apache.fop.apps.*; + /** * Base class for representation of mixed content formatting objects * and their processing diff --git a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java index a5fafe7a9..f5d5740d0 100644 --- a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java +++ b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java @@ -70,6 +70,7 @@ import org.apache.fop.datatypes.Length; // Java import java.awt.geom.Rectangle2D; +import org.apache.fop.apps.*; /** * External graphic formatting object. diff --git a/src/java/org/apache/fop/fo/flow/ListItemBody.java b/src/java/org/apache/fop/fo/flow/ListItemBody.java index f45e47a0e..3a8113714 100644 --- a/src/java/org/apache/fop/fo/flow/ListItemBody.java +++ b/src/java/org/apache/fop/fo/flow/ListItemBody.java @@ -56,6 +56,7 @@ import org.apache.fop.fo.FObj; import org.apache.fop.fo.FOTreeVisitor; import org.apache.fop.fo.properties.CommonAccessibility; import org.apache.fop.layoutmgr.list.Item; +import org.apache.fop.apps.*; /** * Class modelling the fo:list-item-body object. See Sec. 6.8.4 of the XSL-FO diff --git a/src/java/org/apache/fop/fo/flow/ListItemLabel.java b/src/java/org/apache/fop/fo/flow/ListItemLabel.java index a0dea63b9..502b70392 100644 --- a/src/java/org/apache/fop/fo/flow/ListItemLabel.java +++ b/src/java/org/apache/fop/fo/flow/ListItemLabel.java @@ -56,6 +56,7 @@ import org.apache.fop.fo.FObj; import org.apache.fop.fo.FOTreeVisitor; import org.apache.fop.fo.properties.CommonAccessibility; import org.apache.fop.layoutmgr.list.Item; +import org.apache.fop.apps.*; /** * Class modelling the fo:list-item-label object. See Sec. 6.8.5 of the XSL-FO diff --git a/src/java/org/apache/fop/fo/flow/TableColumn.java b/src/java/org/apache/fop/fo/flow/TableColumn.java index bf3ea4410..b7bd579bd 100644 --- a/src/java/org/apache/fop/fo/flow/TableColumn.java +++ b/src/java/org/apache/fop/fo/flow/TableColumn.java @@ -62,6 +62,7 @@ import org.apache.fop.fo.properties.CommonBackground; import org.apache.fop.fo.properties.CommonBorderAndPadding; import org.apache.fop.layoutmgr.LayoutManager; import org.apache.fop.layoutmgr.table.Column; +import org.apache.fop.apps.*; /** * Class modelling the fo:table-column object. See Sec. 6.7.4 of the XSL-FO diff --git a/src/java/org/apache/fop/fo/pagination/StaticContent.java b/src/java/org/apache/fop/fo/pagination/StaticContent.java index 39c5d3117..b3abbda4b 100644 --- a/src/java/org/apache/fop/fo/pagination/StaticContent.java +++ b/src/java/org/apache/fop/fo/pagination/StaticContent.java @@ -55,6 +55,7 @@ import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTreeVisitor; import org.apache.fop.apps.FOPException; import org.apache.fop.layoutmgr.StaticContentLayoutManager; +import org.apache.fop.apps.*; /** * Class modelling the fo:static-content object. See Sec. 6.4.19 of the XSL-FO diff --git a/src/java/org/apache/fop/fo/pagination/Title.java b/src/java/org/apache/fop/fo/pagination/Title.java index 94591c151..7ad6dfb09 100644 --- a/src/java/org/apache/fop/fo/pagination/Title.java +++ b/src/java/org/apache/fop/fo/pagination/Title.java @@ -68,6 +68,7 @@ import org.apache.fop.fo.properties.CommonMarginInline; import org.apache.fop.layoutmgr.ContentLayoutManager; import org.apache.fop.layoutmgr.InlineStackingLayoutManager; import org.apache.fop.layoutmgr.LMiter; +import org.apache.fop.apps.*; /** * Class modelling the fo:title object. See Sec. 6.4.20 in the XSL-FO Standard. diff --git a/src/java/org/apache/fop/image/AbstractFopImage.java b/src/java/org/apache/fop/image/AbstractFopImage.java index 775e6e054..d5186d03c 100644 --- a/src/java/org/apache/fop/image/AbstractFopImage.java +++ b/src/java/org/apache/fop/image/AbstractFopImage.java @@ -57,7 +57,7 @@ import java.io.InputStream; // FOP import org.apache.fop.pdf.PDFColor; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** * Base class to implement the FopImage interface. diff --git a/src/java/org/apache/fop/image/BmpImage.java b/src/java/org/apache/fop/image/BmpImage.java index 58b4607a8..4e724af3e 100644 --- a/src/java/org/apache/fop/image/BmpImage.java +++ b/src/java/org/apache/fop/image/BmpImage.java @@ -55,7 +55,7 @@ import java.io.IOException; import java.awt.color.ColorSpace; // FOP -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** * Bitmap image. diff --git a/src/java/org/apache/fop/image/FopImage.java b/src/java/org/apache/fop/image/FopImage.java index f38ece196..8b60971b6 100644 --- a/src/java/org/apache/fop/image/FopImage.java +++ b/src/java/org/apache/fop/image/FopImage.java @@ -55,7 +55,7 @@ import java.awt.color.ColorSpace; import java.awt.color.ICC_Profile; import org.apache.fop.pdf.PDFColor; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** * Fop image interface for loading images. diff --git a/src/java/org/apache/fop/image/GifImage.java b/src/java/org/apache/fop/image/GifImage.java index 70b57b71f..82ea25431 100644 --- a/src/java/org/apache/fop/image/GifImage.java +++ b/src/java/org/apache/fop/image/GifImage.java @@ -61,7 +61,7 @@ import java.net.URLConnection; // FOP import org.apache.fop.pdf.PDFColor; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** * FopImage object for GIF images, using Java native classes. diff --git a/src/java/org/apache/fop/image/ImageCache.java b/src/java/org/apache/fop/image/ImageCache.java index 2b28afaa2..e0eb9676a 100644 --- a/src/java/org/apache/fop/image/ImageCache.java +++ b/src/java/org/apache/fop/image/ImageCache.java @@ -51,7 +51,7 @@ package org.apache.fop.image; // FOP -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** * Image cache holder. diff --git a/src/java/org/apache/fop/image/ImageFactory.java b/src/java/org/apache/fop/image/ImageFactory.java index 2707afca6..92a6c39ad 100644 --- a/src/java/org/apache/fop/image/ImageFactory.java +++ b/src/java/org/apache/fop/image/ImageFactory.java @@ -66,7 +66,7 @@ import org.apache.avalon.framework.logger.Logger; // FOP import org.apache.fop.image.analyser.ImageReaderFactory; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** diff --git a/src/java/org/apache/fop/image/ImageLoader.java b/src/java/org/apache/fop/image/ImageLoader.java index 9d4a667f3..a2c4e5854 100644 --- a/src/java/org/apache/fop/image/ImageLoader.java +++ b/src/java/org/apache/fop/image/ImageLoader.java @@ -50,7 +50,7 @@ */ package org.apache.fop.image; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** * Class to load images. diff --git a/src/java/org/apache/fop/image/JimiImage.java b/src/java/org/apache/fop/image/JimiImage.java index de67345f2..d39c2a601 100644 --- a/src/java/org/apache/fop/image/JimiImage.java +++ b/src/java/org/apache/fop/image/JimiImage.java @@ -64,7 +64,7 @@ import org.apache.avalon.framework.logger.Logger; // FOP import org.apache.fop.pdf.PDFColor; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** * FopImage object for several images types, using Jimi. diff --git a/src/java/org/apache/fop/image/JpegImage.java b/src/java/org/apache/fop/image/JpegImage.java index 81b2cf686..05265baf2 100644 --- a/src/java/org/apache/fop/image/JpegImage.java +++ b/src/java/org/apache/fop/image/JpegImage.java @@ -56,7 +56,7 @@ import java.awt.color.ColorSpace; import java.awt.color.ICC_Profile; // FOP -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; import org.apache.fop.util.CMYKColorSpace; /** diff --git a/src/java/org/apache/fop/image/analyser/BMPReader.java b/src/java/org/apache/fop/image/analyser/BMPReader.java index c97d0778b..a54c1c702 100644 --- a/src/java/org/apache/fop/image/analyser/BMPReader.java +++ b/src/java/org/apache/fop/image/analyser/BMPReader.java @@ -56,7 +56,7 @@ import java.io.IOException; // FOP import org.apache.fop.image.FopImage; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** * ImageReader object for BMP image type. diff --git a/src/java/org/apache/fop/image/analyser/EPSReader.java b/src/java/org/apache/fop/image/analyser/EPSReader.java index 1ea9833be..d8176c242 100644 --- a/src/java/org/apache/fop/image/analyser/EPSReader.java +++ b/src/java/org/apache/fop/image/analyser/EPSReader.java @@ -58,7 +58,7 @@ import java.io.IOException; // FOP import org.apache.fop.image.FopImage; import org.apache.fop.image.EPSImage; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** * ImageReader object for EPS document image type. diff --git a/src/java/org/apache/fop/image/analyser/GIFReader.java b/src/java/org/apache/fop/image/analyser/GIFReader.java index 311320ee3..e725bb367 100644 --- a/src/java/org/apache/fop/image/analyser/GIFReader.java +++ b/src/java/org/apache/fop/image/analyser/GIFReader.java @@ -56,7 +56,7 @@ import java.io.IOException; // FOP import org.apache.fop.image.FopImage; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** * ImageReader object for GIF image type. diff --git a/src/java/org/apache/fop/image/analyser/ImageReader.java b/src/java/org/apache/fop/image/analyser/ImageReader.java index f9b959745..0e5741fc2 100644 --- a/src/java/org/apache/fop/image/analyser/ImageReader.java +++ b/src/java/org/apache/fop/image/analyser/ImageReader.java @@ -56,7 +56,7 @@ import java.io.IOException; // FOP import org.apache.fop.image.FopImage; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** * ImageReader objects read image headers to determine the image size. diff --git a/src/java/org/apache/fop/image/analyser/ImageReaderFactory.java b/src/java/org/apache/fop/image/analyser/ImageReaderFactory.java index 5d88fe958..c691fc04a 100644 --- a/src/java/org/apache/fop/image/analyser/ImageReaderFactory.java +++ b/src/java/org/apache/fop/image/analyser/ImageReaderFactory.java @@ -57,7 +57,7 @@ import java.util.ArrayList; // FOP import org.apache.fop.image.FopImage; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** * Factory for ImageReader objects. diff --git a/src/java/org/apache/fop/image/analyser/JPEGReader.java b/src/java/org/apache/fop/image/analyser/JPEGReader.java index 32597d7cc..894416620 100644 --- a/src/java/org/apache/fop/image/analyser/JPEGReader.java +++ b/src/java/org/apache/fop/image/analyser/JPEGReader.java @@ -56,7 +56,7 @@ import java.io.IOException; // FOP import org.apache.fop.image.FopImage; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** * ImageReader object for JPEG image type. diff --git a/src/java/org/apache/fop/image/analyser/PNGReader.java b/src/java/org/apache/fop/image/analyser/PNGReader.java index 58748988f..1c44f4530 100644 --- a/src/java/org/apache/fop/image/analyser/PNGReader.java +++ b/src/java/org/apache/fop/image/analyser/PNGReader.java @@ -56,7 +56,7 @@ import java.io.IOException; // FOP import org.apache.fop.image.FopImage; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** * ImageReader object for PNG image type. diff --git a/src/java/org/apache/fop/image/analyser/SVGReader.java b/src/java/org/apache/fop/image/analyser/SVGReader.java index c8e9145e9..ddd0b1240 100644 --- a/src/java/org/apache/fop/image/analyser/SVGReader.java +++ b/src/java/org/apache/fop/image/analyser/SVGReader.java @@ -69,7 +69,7 @@ import org.apache.batik.dom.svg.SVGDOMImplementation; // FOP import org.apache.fop.image.XMLImage; import org.apache.fop.image.FopImage; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; import org.apache.fop.svg.SVGUserAgent; /** diff --git a/src/java/org/apache/fop/image/analyser/TIFFReader.java b/src/java/org/apache/fop/image/analyser/TIFFReader.java index 4041f31e7..cba95f676 100644 --- a/src/java/org/apache/fop/image/analyser/TIFFReader.java +++ b/src/java/org/apache/fop/image/analyser/TIFFReader.java @@ -56,7 +56,7 @@ import java.io.IOException; // FOP import org.apache.fop.image.FopImage; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** * ImageReader object for TIFF image type. diff --git a/src/java/org/apache/fop/image/analyser/XMLReader.java b/src/java/org/apache/fop/image/analyser/XMLReader.java index 01e09e4cd..d1ac57dbb 100644 --- a/src/java/org/apache/fop/image/analyser/XMLReader.java +++ b/src/java/org/apache/fop/image/analyser/XMLReader.java @@ -62,7 +62,7 @@ import org.w3c.dom.Element; // FOP import org.apache.fop.image.FopImage; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** ImageReader object for XML document image type. */ public class XMLReader implements ImageReader { diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java index 63b3f4f76..7f113b851 100644 --- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java @@ -51,7 +51,7 @@ package org.apache.fop.layoutmgr; import org.apache.fop.fo.FObj; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; import org.apache.fop.fo.flow.Marker; import org.apache.fop.area.Area; import org.apache.fop.area.Resolveable; diff --git a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java index 7b0a9b718..bb40e9bd6 100644 --- a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java +++ b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java @@ -104,6 +104,7 @@ import org.apache.fop.util.CharUtilities; import java.util.List; import java.util.ListIterator; import java.util.ArrayList; +import org.apache.fop.apps.*; /** * Concrete implementation of FOTreeVisitor for the purpose of adding diff --git a/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java index 4061e475e..c4e980c56 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java @@ -64,6 +64,7 @@ import org.apache.fop.traits.LayoutProps; import org.apache.fop.fo.properties.CommonBorderAndPadding; import org.apache.fop.fo.properties.CommonBackground; import org.apache.fop.fonts.*; +import org.apache.fop.apps.*; /** * LayoutManager for a block FO. diff --git a/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java index 730ecc1a9..86d101d63 100644 --- a/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java @@ -51,7 +51,7 @@ package org.apache.fop.layoutmgr; import org.apache.fop.fo.FObj; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; import org.apache.fop.fo.flow.Marker; import org.apache.fop.area.Area; import org.apache.fop.area.Resolveable; diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManager.java b/src/java/org/apache/fop/layoutmgr/LayoutManager.java index 628c46847..77d4b452d 100644 --- a/src/java/org/apache/fop/layoutmgr/LayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/LayoutManager.java @@ -50,7 +50,7 @@ */ package org.apache.fop.layoutmgr; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; import org.apache.fop.fo.FObj; /** diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java b/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java index 9412f9044..e8cbdbc5f 100644 --- a/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java +++ b/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java @@ -59,6 +59,7 @@ import org.apache.fop.area.AreaTree; import org.apache.fop.area.Title; import org.apache.fop.fo.pagination.PageSequence; import org.apache.fop.fo.FOTreeHandler; +import org.apache.fop.apps.*; /** * The implementation of LayoutStrategy for the "redesign" or second generation diff --git a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java index dd65ad663..e20ce986e 100644 --- a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java @@ -76,6 +76,7 @@ import org.apache.fop.fo.pagination.StaticContent; import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.apache.fop.apps.*; /** * LayoutManager for a PageSequence and its flow. diff --git a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java index 60ec598b1..b0acd3896 100644 --- a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java @@ -68,6 +68,7 @@ import org.apache.fop.fo.properties.CommonBackground; import java.util.Iterator; import java.util.ArrayList; import java.util.List; +import org.apache.fop.apps.*; /** * LayoutManager for a list-item FO. diff --git a/src/java/org/apache/fop/layoutmgr/table/Row.java b/src/java/org/apache/fop/layoutmgr/table/Row.java index cab411241..a22c6cab4 100644 --- a/src/java/org/apache/fop/layoutmgr/table/Row.java +++ b/src/java/org/apache/fop/layoutmgr/table/Row.java @@ -69,6 +69,7 @@ import org.apache.fop.fo.properties.CommonBackground; import java.util.Iterator; import java.util.ArrayList; import java.util.List; +import org.apache.fop.apps.*; /** * LayoutManager for a table-row FO. diff --git a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java index dd6c494c8..3c4303f48 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java @@ -68,6 +68,7 @@ import org.apache.fop.fo.properties.CommonBackground; import java.util.ArrayList; import java.util.List; +import org.apache.fop.apps.*; /** * LayoutManager for a table FO. diff --git a/src/java/org/apache/fop/pdf/PDFEncryptionManager.java b/src/java/org/apache/fop/pdf/PDFEncryptionManager.java index cd8794474..652dea337 100644 --- a/src/java/org/apache/fop/pdf/PDFEncryptionManager.java +++ b/src/java/org/apache/fop/pdf/PDFEncryptionManager.java @@ -56,7 +56,7 @@ import java.security.Provider; import java.security.Security; import org.apache.avalon.framework.logger.Logger; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** * This class acts as a factory for PDF encryption support. It enables the diff --git a/src/java/org/apache/fop/render/AbstractRenderer.java b/src/java/org/apache/fop/render/AbstractRenderer.java index aae674a74..38f0844bd 100644 --- a/src/java/org/apache/fop/render/AbstractRenderer.java +++ b/src/java/org/apache/fop/render/AbstractRenderer.java @@ -87,7 +87,7 @@ 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.area.inline.Character; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; import org.apache.fop.fo.FOTreeControl; // Avalon diff --git a/src/java/org/apache/fop/render/Renderer.java b/src/java/org/apache/fop/render/Renderer.java index 6141b9771..99dbee711 100644 --- a/src/java/org/apache/fop/render/Renderer.java +++ b/src/java/org/apache/fop/render/Renderer.java @@ -67,7 +67,7 @@ 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.fo.FOTreeControl; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** * Interface implemented by all renderers. This interface is used to control diff --git a/src/java/org/apache/fop/render/RendererContext.java b/src/java/org/apache/fop/render/RendererContext.java index 4ffbd2297..80d4907d4 100644 --- a/src/java/org/apache/fop/render/RendererContext.java +++ b/src/java/org/apache/fop/render/RendererContext.java @@ -54,7 +54,7 @@ package org.apache.fop.render; import java.util.Map; //FOP -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; /** * The Render Context for external handlers. This provides a rendering context diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderer.java b/src/java/org/apache/fop/render/pdf/PDFRenderer.java index 43420e090..f810c852e 100644 --- a/src/java/org/apache/fop/render/pdf/PDFRenderer.java +++ b/src/java/org/apache/fop/render/pdf/PDFRenderer.java @@ -69,7 +69,7 @@ import org.apache.avalon.framework.configuration.ConfigurationException; // FOP import org.apache.fop.render.PrintRenderer; import org.apache.fop.render.RendererContext; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; import org.apache.fop.image.FopImage; import org.apache.fop.image.XMLImage; import org.apache.fop.image.ImageFactory; diff --git a/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java b/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java index 1ca612be6..ef135533d 100644 --- a/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java +++ b/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java @@ -79,6 +79,7 @@ import org.w3c.dom.svg.SVGDocument; import org.w3c.dom.svg.SVGSVGElement; import java.awt.geom.AffineTransform; +import org.apache.fop.apps.*; /** * PDF XML handler. diff --git a/src/java/org/apache/fop/render/ps/PSRenderer.java b/src/java/org/apache/fop/render/ps/PSRenderer.java index d1d9a1fa2..d21bebc7b 100644 --- a/src/java/org/apache/fop/render/ps/PSRenderer.java +++ b/src/java/org/apache/fop/render/ps/PSRenderer.java @@ -71,7 +71,7 @@ import org.apache.fop.area.Trait; import org.apache.fop.area.inline.ForeignObject; import org.apache.fop.area.inline.Word; import org.apache.fop.datatypes.ColorType; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; import org.apache.fop.fonts.Typeface; import org.apache.fop.apps.Document; import org.apache.fop.render.AbstractRenderer; diff --git a/src/java/org/apache/fop/render/ps/PSXMLHandler.java b/src/java/org/apache/fop/render/ps/PSXMLHandler.java index 7960d04fc..b6c50f915 100644 --- a/src/java/org/apache/fop/render/ps/PSXMLHandler.java +++ b/src/java/org/apache/fop/render/ps/PSXMLHandler.java @@ -72,6 +72,7 @@ import org.apache.fop.apps.Document; import org.apache.fop.render.XMLHandler; import org.apache.fop.render.RendererContext; import org.apache.fop.svg.SVGUserAgent; +import org.apache.fop.apps.*; /** * PostScript XML handler. diff --git a/src/java/org/apache/fop/render/svg/SVGRenderer.java b/src/java/org/apache/fop/render/svg/SVGRenderer.java index 26ae4cb55..e2c217cb0 100644 --- a/src/java/org/apache/fop/render/svg/SVGRenderer.java +++ b/src/java/org/apache/fop/render/svg/SVGRenderer.java @@ -58,7 +58,7 @@ import org.apache.fop.area.inline.Leader; import org.apache.fop.area.inline.Word; import org.apache.fop.svg.SVGUtilities; import org.apache.fop.apps.Document; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.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 816b268ec..af896b9a4 100644 --- a/src/java/org/apache/fop/render/xml/XMLRenderer.java +++ b/src/java/org/apache/fop/render/xml/XMLRenderer.java @@ -67,7 +67,7 @@ import java.awt.geom.Rectangle2D; 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.apps.FOUserAgent; import org.apache.fop.apps.Document; import org.apache.fop.apps.FOPException; import org.apache.fop.area.BeforeFloat; diff --git a/src/java/org/apache/fop/svg/SVGElement.java b/src/java/org/apache/fop/svg/SVGElement.java index 685563514..75712da90 100644 --- a/src/java/org/apache/fop/svg/SVGElement.java +++ b/src/java/org/apache/fop/svg/SVGElement.java @@ -73,6 +73,7 @@ import java.net.URL; import java.awt.geom.AffineTransform; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; +import org.apache.fop.apps.*; /** * class representing the SVG root element diff --git a/src/java/org/apache/fop/svg/SVGUserAgent.java b/src/java/org/apache/fop/svg/SVGUserAgent.java index 5c5dd481c..e84c8e1c0 100644 --- a/src/java/org/apache/fop/svg/SVGUserAgent.java +++ b/src/java/org/apache/fop/svg/SVGUserAgent.java @@ -50,7 +50,7 @@ */ package org.apache.fop.svg; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; import org.apache.batik.bridge.UserAgentAdapter; diff --git a/src/java/org/apache/fop/tools/AreaTreeBuilder.java b/src/java/org/apache/fop/tools/AreaTreeBuilder.java index dd25fdecc..0131e61a8 100644 --- a/src/java/org/apache/fop/tools/AreaTreeBuilder.java +++ b/src/java/org/apache/fop/tools/AreaTreeBuilder.java @@ -106,7 +106,7 @@ import org.apache.fop.render.Renderer; import org.apache.fop.render.pdf.PDFRenderer; import org.apache.fop.render.svg.SVGRenderer; import org.apache.fop.render.xml.XMLRenderer; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; import org.apache.fop.fo.properties.RuleStyle; import org.apache.fop.fonts.FontMetrics; diff --git a/src/java/org/apache/fop/tools/TestConverter.java b/src/java/org/apache/fop/tools/TestConverter.java index d7fb0f697..eb4bbafd1 100644 --- a/src/java/org/apache/fop/tools/TestConverter.java +++ b/src/java/org/apache/fop/tools/TestConverter.java @@ -55,7 +55,7 @@ import org.apache.fop.apps.FOFileHandler; import org.apache.fop.apps.FOPException; import org.apache.fop.apps.InputHandler; import org.apache.fop.apps.XSLTInputHandler; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; import org.apache.avalon.framework.logger.ConsoleLogger; import org.apache.avalon.framework.logger.AbstractLogEnabled; diff --git a/src/java/org/apache/fop/tools/anttasks/Fop.java b/src/java/org/apache/fop/tools/anttasks/Fop.java index b28cc0dca..9cd1d4fb5 100644 --- a/src/java/org/apache/fop/tools/anttasks/Fop.java +++ b/src/java/org/apache/fop/tools/anttasks/Fop.java @@ -70,7 +70,7 @@ import org.apache.fop.apps.InputHandler; import org.apache.fop.apps.FOFileHandler; import org.apache.fop.apps.Driver; import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.apps.FOUserAgent; // Avalon import org.apache.avalon.framework.logger.AbstractLogEnabled; -- 2.39.5