From 07db034b1a23a51096f87b04b712d7733c47c641 Mon Sep 17 00:00:00 2001
From: Glen Mazza <gmazza@apache.org>
Date: Fri, 19 Mar 2004 00:53:38 +0000
Subject: [PATCH] Moved SVGUserAgent back to SVG package (not being used by SVG
 FO extensions.)

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197463 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/fop/image/analyser/SVGReader.java       | 2 +-
 src/java/org/apache/fop/render/pdf/PDFXMLHandler.java       | 2 +-
 src/java/org/apache/fop/render/ps/PSXMLHandler.java         | 2 +-
 .../apache/fop/{fo/extensions => }/svg/SVGUserAgent.java    | 6 ++----
 src/java/org/apache/fop/svg/package.html                    | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)
 rename src/java/org/apache/fop/{fo/extensions => }/svg/SVGUserAgent.java (97%)

diff --git a/src/java/org/apache/fop/image/analyser/SVGReader.java b/src/java/org/apache/fop/image/analyser/SVGReader.java
index 26ad5f8c0..7ffd6194a 100644
--- a/src/java/org/apache/fop/image/analyser/SVGReader.java
+++ b/src/java/org/apache/fop/image/analyser/SVGReader.java
@@ -38,7 +38,7 @@ import org.apache.batik.dom.svg.SVGDOMImplementation;
 import org.apache.fop.image.XMLImage;
 import org.apache.fop.image.FopImage;
 import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.fo.extensions.svg.SVGUserAgent;
+import org.apache.fop.svg.SVGUserAgent;
 
 /** 
  * ImageReader object for SVG document image type.
diff --git a/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java b/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java
index 2505892a6..01780d0b0 100644
--- a/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java
+++ b/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java
@@ -29,7 +29,7 @@ import org.apache.fop.pdf.PDFResourceContext;
 import org.apache.fop.svg.PDFTextElementBridge;
 import org.apache.fop.svg.PDFAElementBridge;
 import org.apache.fop.svg.PDFGraphics2D;
-import org.apache.fop.fo.extensions.svg.SVGUserAgent;
+import org.apache.fop.svg.SVGUserAgent;
 import org.apache.fop.apps.Document;
 
 /* org.w3c.dom.Document is not imported to avoid conflict with
diff --git a/src/java/org/apache/fop/render/ps/PSXMLHandler.java b/src/java/org/apache/fop/render/ps/PSXMLHandler.java
index c9f28a153..20e50e667 100644
--- a/src/java/org/apache/fop/render/ps/PSXMLHandler.java
+++ b/src/java/org/apache/fop/render/ps/PSXMLHandler.java
@@ -36,7 +36,7 @@ import org.apache.batik.gvt.GraphicsNode;
 // FOP
 import org.apache.fop.render.XMLHandler;
 import org.apache.fop.render.RendererContext;
-import org.apache.fop.fo.extensions.svg.SVGUserAgent;
+import org.apache.fop.svg.SVGUserAgent;
 
 /**
  * PostScript XML handler.
diff --git a/src/java/org/apache/fop/fo/extensions/svg/SVGUserAgent.java b/src/java/org/apache/fop/svg/SVGUserAgent.java
similarity index 97%
rename from src/java/org/apache/fop/fo/extensions/svg/SVGUserAgent.java
rename to src/java/org/apache/fop/svg/SVGUserAgent.java
index c3d3785f4..7d5e80f83 100644
--- a/src/java/org/apache/fop/fo/extensions/svg/SVGUserAgent.java
+++ b/src/java/org/apache/fop/svg/SVGUserAgent.java
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-/* $Id$ */
+/* $Id: SVGUserAgent.java,v 1.2 2004/02/27 17:43:22 jeremias Exp $ */
  
-package org.apache.fop.fo.extensions.svg;
+package org.apache.fop.svg;
 
 import org.apache.fop.apps.FOUserAgent;
-
 import org.apache.batik.bridge.UserAgentAdapter;
-
 import org.apache.avalon.framework.logger.Logger;
 
 // Java
diff --git a/src/java/org/apache/fop/svg/package.html b/src/java/org/apache/fop/svg/package.html
index 1f7cfb6be..a42efa921 100644
--- a/src/java/org/apache/fop/svg/package.html
+++ b/src/java/org/apache/fop/svg/package.html
@@ -16,7 +16,7 @@ The PDFTranscoder is a transcoder for use with batik to convert
 from SVG to a single page PDF document.
 </P>
 <P>
-SVGElement, SVGElementMapping, SVGObj and SVGUserAgent are used by
+SVGElement, SVGElementMapping and SVGObj are used by
 FOP for handling embedded SVG or external SVG graphics.
 </P>
 <P>
-- 
2.39.5