vmote 2003/08/22 10:42:42
Modified: src/java/org/apache/fop/apps Driver.java
src/java/org/apache/fop/fo FONode.java FOTreeBuilder.java
FObjMixed.java
src/java/org/apache/fop/fo/flow ExternalGraphic.java
ListItemBody.java ListItemLabel.java
TableColumn.java
src/java/org/apache/fop/fo/pagination StaticContent.java
Title.java
src/java/org/apache/fop/image AbstractFopImage.java
BmpImage.java FopImage.java GifImage.java
ImageCache.java ImageFactory.java ImageLoader.java
JimiImage.java JpegImage.java
src/java/org/apache/fop/image/analyser BMPReader.java
EPSReader.java GIFReader.java ImageReader.java
ImageReaderFactory.java JPEGReader.java
PNGReader.java SVGReader.java TIFFReader.java
XMLReader.java
src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java
AddLMVisitor.java BlockLayoutManager.java
ContentLayoutManager.java LayoutManager.java
LayoutManagerLS.java PageLayoutManager.java
src/java/org/apache/fop/layoutmgr/list
ListItemLayoutManager.java
src/java/org/apache/fop/layoutmgr/table Row.java
TableLayoutManager.java
src/java/org/apache/fop/pdf PDFEncryptionManager.java
src/java/org/apache/fop/render AbstractRenderer.java
Renderer.java RendererContext.java
src/java/org/apache/fop/render/pdf PDFRenderer.java
PDFXMLHandler.java
src/java/org/apache/fop/render/ps PSRenderer.java
PSXMLHandler.java
src/java/org/apache/fop/render/svg SVGRenderer.java
src/java/org/apache/fop/render/xml XMLRenderer.java
src/java/org/apache/fop/svg SVGElement.java
SVGUserAgent.java
src/java/org/apache/fop/tools AreaTreeBuilder.java
TestConverter.java
src/java/org/apache/fop/tools/anttasks Fop.java
Added: src/java/org/apache/fop/apps FOUserAgent.java
Removed: src/java/org/apache/fop/fo FOUserAgent.java
Log:
move fo/FOUserAgent to apps/FOUserAgent, as it manages configuration information for
the application as a whole
Revision Changes Path
1.35 +1 -1 xml-fop/src/java/org/apache/fop/apps/Driver.java
Index: Driver.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Driver.java 22 Aug 2003 17:21:48 -0000 1.34
+++ Driver.java 22 Aug 2003 17:42:41 -0000 1.35
@@ -55,7 +55,7 @@
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;
1.1 xml-fop/src/java/org/apache/fop/apps/FOUserAgent.java
Index: FOUserAgent.java
===================================================================
/*
* $Id: FOUserAgent.java,v 1.1 2003/08/22 17:42:41 vmote Exp $
* ============================================================================
* The Apache Software License, Version 1.1
* ============================================================================
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear.
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior
* written permission. For written permission, please contact
* [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache", nor may
* "Apache" appear in their name, without prior written permission of the
* Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
* DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================
*
* This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by
* James Tauber <[EMAIL PROTECTED]>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.fop.apps;
// Java
import java.util.Map;
import java.io.IOException;
import java.io.InputStream;
// XML
import org.w3c.dom.Document;
// Avalon
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
// FOP
import org.apache.fop.pdf.PDFEncryptionParams;
import org.apache.fop.render.XMLHandler;
import org.apache.fop.render.RendererContext;
/**
* The User Agent for fo.
* This user agent is used by the processing to obtain user configurable
* options.
* <p>
* Renderer specific extensions (that do not produce normal areas on
* the output) will be done like so:
* <br>
* The extension will create an area, custom if necessary
* <br>
* this area will be added to the user agent with a key
* <br>
* the renderer will know keys for particular extensions
* <br>
* eg. bookmarks will be held in a special hierarchical area representing
* the title and bookmark structure
* <br>
* These areas may contain resolveable areas that will be processed
* with other resolveable areas
*/
public class FOUserAgent implements LogEnabled {
private Logger log;
private Map defaults = new java.util.HashMap();
private Map handlers = new java.util.HashMap();
private String baseURL;
private PDFEncryptionParams pdfEncryptionParams;
private float px2mm = 0.35277777777777777778f; //72dpi (=25.4/dpi)
/**
* Sets the logger.
* @param log Logger to use
* @see org.apache.avalon.framework.logger.LogEnabled#enableLogging(Logger)
*/
public void enableLogging(Logger log) {
this.log = log;
}
/**
* Returns the logger to use.
* @see org.apache.avalon.framework.logger.AbstractLogEnabled#getLogger()
* (todo) This breaks IoC/SoC. Should be improved.
*/
public Logger getLogger() {
return this.log;
}
/**
* Sets the base URL.
* @param baseURL base URL
*/
public void setBaseURL(String baseURL) {
this.baseURL = baseURL;
}
/**
* Returns the base URL.
* @return the base URL
*/
public String getBaseURL() {
if ((this.baseURL == null) || (this.baseURL.trim().equals(""))) {
return "file:.";
} else {
return this.baseURL;
}
}
/**
* Returns the parameters for PDF encryption.
* @return the PDF encryption parameters, null if not applicable
*/
public PDFEncryptionParams getPDFEncryptionParams() {
return pdfEncryptionParams;
}
/**
* Sets the parameters for PDF encryption.
* @param pdfEncryptionParams the PDF encryption parameters, null to
* disable PDF encryption
*/
public void setPDFEncryptionParams(PDFEncryptionParams pdfEncryptionParams) {
this.pdfEncryptionParams = pdfEncryptionParams;
}
/**
* Get an input stream for a reference.
* Temporary solution until API better.
* @param uri URI to access
* @return InputStream for accessing the resource.
* @throws IOException in case of an I/O problem
*/
public InputStream getStream(String uri) throws IOException {
return null;
}
/**
* Returns the conversion factor from pixel units to millimeters. This
* depends on the desired reolution.
* @return float conversion factor
*/
public float getPixelUnitToMillimeter() {
return this.px2mm;
}
/**
* Sets the resolution in dpi.
* @param dpi resolution in dpi
*/
public void setResolution(int dpi) {
this.px2mm = (float)(25.4 / dpi);
}
/**
* If to create hot links to footnotes and before floats.
* @return True if hot links dhould be created
*/
public boolean linkToFootnotes() {
return true;
}
/**
* Set the default xml handler for the given mime type.
* @param mime MIME type
* @param handler XMLHandler to use
*/
public void setDefaultXMLHandler(String mime, XMLHandler handler) {
defaults.put(mime, handler);
}
/**
* Add an xml handler for the given mime type and xml namespace.
* @param mime MIME type
* @param ns Namespace URI
* @param handler XMLHandler to use
*/
public void addXMLHandler(String mime, String ns, XMLHandler handler) {
Map mh = (Map) handlers.get(mime);
if (mh == null) {
mh = new java.util.HashMap();
handlers.put(mime, mh);
}
mh.put(ns, handler);
}
/**
* Render the xml document with the given xml namespace.
* The Render Context is by the handle to render into the current
* rendering target.
* @param ctx rendering context
* @param doc DOM Document containing the source document
* @param namespace Namespace URI of the document
*/
public void renderXML(RendererContext ctx, Document doc,
String namespace) {
String mime = ctx.getMimeType();
Map mh = (Map) handlers.get(mime);
XMLHandler handler = null;
if (mh != null) {
handler = (XMLHandler) mh.get(namespace);
}
if (handler == null) {
handler = (XMLHandler) defaults.get(mime);
}
if (handler != null) {
try {
handler.handleXML(ctx, doc, namespace);
} catch (Throwable t) {
// could not handle document
getLogger().error("Some XML content will be ignored. "
+ "Could not render XML", t);
}
} else {
// no handler found for document
getLogger().warn("Some XML content will be ignored. "
+ "No handler defined for XML: " + namespace);
}
}
}
1.9 +1 -0 xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FONode.java 19 Aug 2003 05:19:21 -0000 1.8
+++ FONode.java 22 Aug 2003 17:42:41 -0000 1.9
@@ -63,6 +63,7 @@
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
1.12 +1 -0 xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java
Index: FOTreeBuilder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FOTreeBuilder.java 19 Aug 2003 05:19:21 -0000 1.11
+++ FOTreeBuilder.java 22 Aug 2003 17:42:41 -0000 1.12
@@ -74,6 +74,7 @@
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
1.11 +2 -0 xml-fop/src/java/org/apache/fop/fo/FObjMixed.java
Index: FObjMixed.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObjMixed.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FObjMixed.java 22 Aug 2003 06:27:34 -0000 1.10
+++ FObjMixed.java 22 Aug 2003 17:42:41 -0000 1.11
@@ -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
1.6 +1 -0 xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
Index: ExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ExternalGraphic.java 22 Aug 2003 06:27:34 -0000 1.5
+++ ExternalGraphic.java 22 Aug 2003 17:42:41 -0000 1.6
@@ -70,6 +70,7 @@
// Java
import java.awt.geom.Rectangle2D;
+import org.apache.fop.apps.*;
/**
* External graphic formatting object.
1.6 +1 -0 xml-fop/src/java/org/apache/fop/fo/flow/ListItemBody.java
Index: ListItemBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItemBody.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ListItemBody.java 22 Aug 2003 06:27:34 -0000 1.5
+++ ListItemBody.java 22 Aug 2003 17:42:41 -0000 1.6
@@ -56,6 +56,7 @@
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
1.6 +1 -0 xml-fop/src/java/org/apache/fop/fo/flow/ListItemLabel.java
Index: ListItemLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItemLabel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ListItemLabel.java 22 Aug 2003 06:27:34 -0000 1.5
+++ ListItemLabel.java 22 Aug 2003 17:42:41 -0000 1.6
@@ -56,6 +56,7 @@
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
1.6 +1 -0 xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java
Index: TableColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TableColumn.java 22 Aug 2003 06:27:34 -0000 1.5
+++ TableColumn.java 22 Aug 2003 17:42:41 -0000 1.6
@@ -62,6 +62,7 @@
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
1.4 +2 -1 xml-fop/src/java/org/apache/fop/fo/pagination/StaticContent.java
Index: StaticContent.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/StaticContent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StaticContent.java 22 Aug 2003 06:27:34 -0000 1.3
+++ StaticContent.java 22 Aug 2003 17:42:41 -0000 1.4
@@ -55,6 +55,7 @@
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
1.7 +2 -1 xml-fop/src/java/org/apache/fop/fo/pagination/Title.java
Index: Title.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Title.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Title.java 22 Aug 2003 06:27:34 -0000 1.6
+++ Title.java 22 Aug 2003 17:42:41 -0000 1.7
@@ -68,6 +68,7 @@
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.
1.2 +1 -1 xml-fop/src/java/org/apache/fop/image/AbstractFopImage.java
Index: AbstractFopImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/AbstractFopImage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractFopImage.java 11 Mar 2003 13:05:25 -0000 1.1
+++ AbstractFopImage.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -57,7 +57,7 @@
// 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.
1.2 +1 -1 xml-fop/src/java/org/apache/fop/image/BmpImage.java
Index: BmpImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/BmpImage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BmpImage.java 11 Mar 2003 13:05:25 -0000 1.1
+++ BmpImage.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -55,7 +55,7 @@
import java.awt.color.ColorSpace;
// FOP
-import org.apache.fop.fo.FOUserAgent;
+import org.apache.fop.apps.FOUserAgent;
/**
* Bitmap image.
1.3 +1 -1 xml-fop/src/java/org/apache/fop/image/FopImage.java
Index: FopImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/FopImage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FopImage.java 25 Apr 2003 07:06:42 -0000 1.2
+++ FopImage.java 22 Aug 2003 17:42:41 -0000 1.3
@@ -55,7 +55,7 @@
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.
1.2 +1 -1 xml-fop/src/java/org/apache/fop/image/GifImage.java
Index: GifImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/GifImage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GifImage.java 11 Mar 2003 13:05:25 -0000 1.1
+++ GifImage.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -61,7 +61,7 @@
// 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.
1.2 +1 -1 xml-fop/src/java/org/apache/fop/image/ImageCache.java
Index: ImageCache.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/ImageCache.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImageCache.java 11 Mar 2003 13:05:25 -0000 1.1
+++ ImageCache.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -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.
1.2 +1 -1 xml-fop/src/java/org/apache/fop/image/ImageFactory.java
Index: ImageFactory.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/ImageFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImageFactory.java 11 Mar 2003 13:05:25 -0000 1.1
+++ ImageFactory.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -66,7 +66,7 @@
// FOP
import org.apache.fop.image.analyser.ImageReaderFactory;
-import org.apache.fop.fo.FOUserAgent;
+import org.apache.fop.apps.FOUserAgent;
/**
1.2 +1 -1 xml-fop/src/java/org/apache/fop/image/ImageLoader.java
Index: ImageLoader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/ImageLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImageLoader.java 11 Mar 2003 13:05:25 -0000 1.1
+++ ImageLoader.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -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.
1.2 +1 -1 xml-fop/src/java/org/apache/fop/image/JimiImage.java
Index: JimiImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/JimiImage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JimiImage.java 11 Mar 2003 13:05:25 -0000 1.1
+++ JimiImage.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -64,7 +64,7 @@
// 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.
1.3 +1 -1 xml-fop/src/java/org/apache/fop/image/JpegImage.java
Index: JpegImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/JpegImage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JpegImage.java 15 Mar 2003 16:49:16 -0000 1.2
+++ JpegImage.java 22 Aug 2003 17:42:41 -0000 1.3
@@ -56,7 +56,7 @@
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;
/**
1.2 +1 -1 xml-fop/src/java/org/apache/fop/image/analyser/BMPReader.java
Index: BMPReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/analyser/BMPReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BMPReader.java 11 Mar 2003 13:05:35 -0000 1.1
+++ BMPReader.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -56,7 +56,7 @@
// 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.
1.2 +1 -1 xml-fop/src/java/org/apache/fop/image/analyser/EPSReader.java
Index: EPSReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/analyser/EPSReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EPSReader.java 11 Mar 2003 13:05:35 -0000 1.1
+++ EPSReader.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -58,7 +58,7 @@
// 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.
1.2 +1 -1 xml-fop/src/java/org/apache/fop/image/analyser/GIFReader.java
Index: GIFReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/analyser/GIFReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GIFReader.java 11 Mar 2003 13:05:35 -0000 1.1
+++ GIFReader.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -56,7 +56,7 @@
// 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.
1.2 +1 -1 xml-fop/src/java/org/apache/fop/image/analyser/ImageReader.java
Index: ImageReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/analyser/ImageReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImageReader.java 11 Mar 2003 13:05:35 -0000 1.1
+++ ImageReader.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -56,7 +56,7 @@
// 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.
1.2 +1 -1
xml-fop/src/java/org/apache/fop/image/analyser/ImageReaderFactory.java
Index: ImageReaderFactory.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/image/analyser/ImageReaderFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImageReaderFactory.java 11 Mar 2003 13:05:35 -0000 1.1
+++ ImageReaderFactory.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -57,7 +57,7 @@
// FOP
import org.apache.fop.image.FopImage;
-import org.apache.fop.fo.FOUserAgent;
+import org.apache.fop.apps.FOUserAgent;
/**
* Factory for ImageReader objects.
1.2 +1 -1 xml-fop/src/java/org/apache/fop/image/analyser/JPEGReader.java
Index: JPEGReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/analyser/JPEGReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JPEGReader.java 11 Mar 2003 13:05:35 -0000 1.1
+++ JPEGReader.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -56,7 +56,7 @@
// 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.
1.2 +1 -1 xml-fop/src/java/org/apache/fop/image/analyser/PNGReader.java
Index: PNGReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/analyser/PNGReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PNGReader.java 11 Mar 2003 13:05:35 -0000 1.1
+++ PNGReader.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -56,7 +56,7 @@
// 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.
1.2 +1 -1 xml-fop/src/java/org/apache/fop/image/analyser/SVGReader.java
Index: SVGReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/analyser/SVGReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGReader.java 11 Mar 2003 13:05:35 -0000 1.1
+++ SVGReader.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -69,7 +69,7 @@
// 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;
/**
1.2 +1 -1 xml-fop/src/java/org/apache/fop/image/analyser/TIFFReader.java
Index: TIFFReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/analyser/TIFFReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TIFFReader.java 11 Mar 2003 13:05:35 -0000 1.1
+++ TIFFReader.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -56,7 +56,7 @@
// 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.
1.3 +1 -1 xml-fop/src/java/org/apache/fop/image/analyser/XMLReader.java
Index: XMLReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/analyser/XMLReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLReader.java 25 Apr 2003 07:06:43 -0000 1.2
+++ XMLReader.java 22 Aug 2003 17:42:41 -0000 1.3
@@ -62,7 +62,7 @@
// 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 {
1.2 +1 -1
xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
Index: AbstractLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractLayoutManager.java 11 Mar 2003 13:05:24 -0000 1.1
+++ AbstractLayoutManager.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -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;
1.3 +2 -1 xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
Index: AddLMVisitor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AddLMVisitor.java 19 Aug 2003 05:19:21 -0000 1.2
+++ AddLMVisitor.java 22 Aug 2003 17:42:41 -0000 1.3
@@ -104,6 +104,7 @@
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
1.4 +1 -0
xml-fop/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
Index: BlockLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BlockLayoutManager.java 14 Aug 2003 15:31:10 -0000 1.3
+++ BlockLayoutManager.java 22 Aug 2003 17:42:41 -0000 1.4
@@ -64,6 +64,7 @@
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.
1.2 +1 -1
xml-fop/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
Index: ContentLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContentLayoutManager.java 11 Mar 2003 13:05:24 -0000 1.1
+++ ContentLayoutManager.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -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;
1.2 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManager.java
Index: LayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LayoutManager.java 11 Mar 2003 13:05:24 -0000 1.1
+++ LayoutManager.java 22 Aug 2003 17:42:41 -0000 1.2
@@ -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;
/**
1.8 +2 -1 xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
Index: LayoutManagerLS.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LayoutManagerLS.java 21 Aug 2003 19:01:24 -0000 1.7
+++ LayoutManagerLS.java 22 Aug 2003 17:42:41 -0000 1.8
@@ -59,6 +59,7 @@
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
1.3 +1 -0 xml-fop/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
Index: PageLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PageLayoutManager.java 17 Jul 2003 04:52:37 -0000 1.2
+++ PageLayoutManager.java 22 Aug 2003 17:42:41 -0000 1.3
@@ -76,6 +76,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.apache.fop.apps.*;
/**
* LayoutManager for a PageSequence and its flow.
1.3 +1 -0
xml-fop/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
Index: ListItemLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ListItemLayoutManager.java 12 Aug 2003 18:02:46 -0000 1.2
+++ ListItemLayoutManager.java 22 Aug 2003 17:42:41 -0000 1.3
@@ -68,6 +68,7 @@
import java.util.Iterator;
import java.util.ArrayList;
import java.util.List;
+import org.apache.fop.apps.*;
/**
* LayoutManager for a list-item FO.
1.3 +1 -0 xml-fop/src/java/org/apache/fop/layoutmgr/table/Row.java
Index: Row.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Row.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Row.java 12 Aug 2003 18:02:46 -0000 1.2
+++ Row.java 22 Aug 2003 17:42:41 -0000 1.3
@@ -69,6 +69,7 @@
import java.util.Iterator;
import java.util.ArrayList;
import java.util.List;
+import org.apache.fop.apps.*;
/**
* LayoutManager for a table-row FO.
1.3 +1 -0
xml-fop/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
Index: TableLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TableLayoutManager.java 12 Aug 2003 18:02:46 -0000 1.2
+++ TableLayoutManager.java 22 Aug 2003 17:42:41 -0000 1.3
@@ -68,6 +68,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.fop.apps.*;
/**
* LayoutManager for a table FO.
1.2 +1 -1 xml-fop/src/java/org/apache/fop/pdf/PDFEncryptionManager.java
Index: PDFEncryptionManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/pdf/PDFEncryptionManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PDFEncryptionManager.java 13 Mar 2003 16:46:05 -0000 1.1
+++ PDFEncryptionManager.java 22 Aug 2003 17:42:42 -0000 1.2
@@ -56,7 +56,7 @@
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
1.7 +1 -1 xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractRenderer.java 19 Aug 2003 06:54:31 -0000 1.6
+++ AbstractRenderer.java 22 Aug 2003 17:42:42 -0000 1.7
@@ -87,7 +87,7 @@
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
1.4 +1 -1 xml-fop/src/java/org/apache/fop/render/Renderer.java
Index: Renderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/Renderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Renderer.java 19 Aug 2003 06:54:31 -0000 1.3
+++ Renderer.java 22 Aug 2003 17:42:42 -0000 1.4
@@ -67,7 +67,7 @@
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
1.2 +1 -1 xml-fop/src/java/org/apache/fop/render/RendererContext.java
Index: RendererContext.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/RendererContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RendererContext.java 11 Mar 2003 13:05:39 -0000 1.1
+++ RendererContext.java 22 Aug 2003 17:42:42 -0000 1.2
@@ -54,7 +54,7 @@
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
1.12 +1 -1 xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java
Index: PDFRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PDFRenderer.java 21 Aug 2003 18:17:49 -0000 1.11
+++ PDFRenderer.java 22 Aug 2003 17:42:42 -0000 1.12
@@ -69,7 +69,7 @@
// 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;
1.4 +1 -0 xml-fop/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java
Index: PDFXMLHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PDFXMLHandler.java 20 Aug 2003 18:09:45 -0000 1.3
+++ PDFXMLHandler.java 22 Aug 2003 17:42:42 -0000 1.4
@@ -79,6 +79,7 @@
import org.w3c.dom.svg.SVGSVGElement;
import java.awt.geom.AffineTransform;
+import org.apache.fop.apps.*;
/**
* PDF XML handler.
1.11 +1 -1 xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java
Index: PSRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PSRenderer.java 20 Aug 2003 18:09:45 -0000 1.10
+++ PSRenderer.java 22 Aug 2003 17:42:42 -0000 1.11
@@ -71,7 +71,7 @@
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;
1.4 +1 -0 xml-fop/src/java/org/apache/fop/render/ps/PSXMLHandler.java
Index: PSXMLHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSXMLHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PSXMLHandler.java 20 Aug 2003 18:09:45 -0000 1.3
+++ PSXMLHandler.java 22 Aug 2003 17:42:42 -0000 1.4
@@ -72,6 +72,7 @@
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.
1.6 +1 -1 xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java
Index: SVGRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SVGRenderer.java 20 Aug 2003 18:09:45 -0000 1.5
+++ SVGRenderer.java 22 Aug 2003 17:42:42 -0000 1.6
@@ -58,7 +58,7 @@
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;
1.6 +1 -1 xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
Index: XMLRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLRenderer.java 20 Aug 2003 18:09:45 -0000 1.5
+++ XMLRenderer.java 22 Aug 2003 17:42:42 -0000 1.6
@@ -67,7 +67,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.apps.FOUserAgent;
import org.apache.fop.apps.Document;
import org.apache.fop.apps.FOPException;
import org.apache.fop.area.BeforeFloat;
1.3 +1 -0 xml-fop/src/java/org/apache/fop/svg/SVGElement.java
Index: SVGElement.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/svg/SVGElement.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGElement.java 19 Aug 2003 00:53:55 -0000 1.2
+++ SVGElement.java 22 Aug 2003 17:42:42 -0000 1.3
@@ -73,6 +73,7 @@
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
1.7 +1 -1 xml-fop/src/java/org/apache/fop/svg/SVGUserAgent.java
Index: SVGUserAgent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/svg/SVGUserAgent.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SVGUserAgent.java 12 Aug 2003 21:17:44 -0000 1.6
+++ SVGUserAgent.java 22 Aug 2003 17:42:42 -0000 1.7
@@ -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;
1.7 +1 -1 xml-fop/src/java/org/apache/fop/tools/AreaTreeBuilder.java
Index: AreaTreeBuilder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/AreaTreeBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AreaTreeBuilder.java 20 Aug 2003 18:09:46 -0000 1.6
+++ AreaTreeBuilder.java 22 Aug 2003 17:42:42 -0000 1.7
@@ -106,7 +106,7 @@
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;
1.6 +1 -1 xml-fop/src/java/org/apache/fop/tools/TestConverter.java
Index: TestConverter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/TestConverter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestConverter.java 12 Aug 2003 21:17:44 -0000 1.5
+++ TestConverter.java 22 Aug 2003 17:42:42 -0000 1.6
@@ -55,7 +55,7 @@
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;
1.9 +1 -1 xml-fop/src/java/org/apache/fop/tools/anttasks/Fop.java
Index: Fop.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/anttasks/Fop.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Fop.java 12 Aug 2003 21:36:43 -0000 1.8
+++ Fop.java 22 Aug 2003 17:42:42 -0000 1.9
@@ -70,7 +70,7 @@
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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
