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

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

src/java/org/apache/fop/fo/FOUserAgent.java → 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 <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.apps;
 
 // Java
 import java.util.Map;

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

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

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

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.

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

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

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

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

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.

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.

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.

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.

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.

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.

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;
 
 
 /**

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.

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.

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;
 
 /**

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.

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.

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.

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.

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.

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.

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.

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;
 
 /** 

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.

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 {

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;

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

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.

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;

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;
 
 /**

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

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.

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.

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.

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.

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

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

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

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

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;

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.

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;

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.

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;
 

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;

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

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;
 

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;
 

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;

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;