move svg classes related to the FO Tree building from svg to fo/extensions/svg

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

9 files changed, 17 insertions, 14 deletions

diff --git a/src/java/org/apache/fop/fo/FOTreeBuilder.java b/src/java/org/apache/fop/fo/FOTreeBuilder.java
index 2237bf3e6..f87bd8b6b 100644
--- a/src/java/org/apache/fop/fo/FOTreeBuilder.java
+++ b/src/java/org/apache/fop/fo/FOTreeBuilder.java
@@ -162,7 +162,7 @@ public class FOTreeBuilder extends DefaultHandler {
      */
     private void setupDefaultMappings() {
         addElementMapping("org.apache.fop.fo.FOElementMapping");
-        addElementMapping("org.apache.fop.svg.SVGElementMapping");
+        addElementMapping("org.apache.fop.fo.extensions.svg.SVGElementMapping");
         addElementMapping("org.apache.fop.fo.extensions.ExtensionElementMapping");
 
         // add mappings from available services
diff --git a/src/java/org/apache/fop/fo/FOTreeVisitor.java b/src/java/org/apache/fop/fo/FOTreeVisitor.java
index 8df70f75b..112a2753a 100644
--- a/src/java/org/apache/fop/fo/FOTreeVisitor.java
+++ b/src/java/org/apache/fop/fo/FOTreeVisitor.java
@@ -115,8 +115,8 @@ import org.apache.fop.fo.flow.MultiSwitch;
 import org.apache.fop.fo.flow.MultiToggle;
 import org.apache.fop.fo.flow.TableAndCaption;
 import org.apache.fop.fo.flow.TableCaption;
-import org.apache.fop.svg.SVGObj;
-import org.apache.fop.svg.SVGElement;
+import org.apache.fop.fo.extensions.svg.SVGObj;
+import org.apache.fop.fo.extensions.svg.SVGElement;
 
 /**
  * <p>Implements the GoF Visitor design pattern to allow access to the FOTree
diff --git a/src/java/org/apache/fop/svg/SVGElement.java b/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
index 75712da90..893a72041 100644
--- a/src/java/org/apache/fop/svg/SVGElement.java
+++ b/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
@@ -1,5 +1,5 @@
 /*
- * $Id: SVGElement.java,v 1.34 2003/03/05 15:08:45 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.svg;
+package org.apache.fop.fo.extensions.svg;
 
 // FOP
 import org.apache.fop.fo.FONode;
@@ -74,6 +74,7 @@ import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import org.apache.fop.apps.*;
+import org.apache.fop.svg.*;
 
 /**
  * class representing the SVG root element
diff --git a/src/java/org/apache/fop/svg/SVGElementMapping.java b/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java
index 3c958527f..b4a1ce3e0 100644
--- a/src/java/org/apache/fop/svg/SVGElementMapping.java
+++ b/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java
@@ -1,5 +1,5 @@
 /*
- * $Id: SVGElementMapping.java,v 1.24 2003/03/07 09:51:25 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.svg;
+package org.apache.fop.fo.extensions.svg;
 
 import java.util.HashMap;
 
@@ -59,6 +59,8 @@ import org.apache.fop.apps.FOFileHandler;
 import org.apache.batik.util.XMLResourceDescriptor;
 import org.apache.batik.dom.svg.SVGDOMImplementation;
 
+import org.apache.fop.svg.*;
+
 /**
  * Setup the SVG element mapping.
  * This adds the svg element mappings used to create the objects
diff --git a/src/java/org/apache/fop/svg/SVGObj.java b/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java
index 8016821f0..8ec55fd2b 100644
--- a/src/java/org/apache/fop/svg/SVGObj.java
+++ b/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java
@@ -1,5 +1,5 @@
 /*
- * $Id: SVGObj.java,v 1.12 2003/03/07 09:51:25 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.svg;
+package org.apache.fop.fo.extensions.svg;
 
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.XMLObj;
diff --git a/src/java/org/apache/fop/svg/SVGUserAgent.java b/src/java/org/apache/fop/fo/extensions/svg/SVGUserAgent.java
index e84c8e1c0..9fc07bd53 100644
--- a/src/java/org/apache/fop/svg/SVGUserAgent.java
+++ b/src/java/org/apache/fop/fo/extensions/svg/SVGUserAgent.java
@@ -1,5 +1,5 @@
 /*
- * $Id: SVGUserAgent.java,v 1.14 2003/03/07 09:51:25 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.svg;
+package org.apache.fop.fo.extensions.svg;
 
 import org.apache.fop.apps.FOUserAgent;
 
diff --git a/src/java/org/apache/fop/image/analyser/SVGReader.java b/src/java/org/apache/fop/image/analyser/SVGReader.java
index ddd0b1240..71476719c 100644
--- a/src/java/org/apache/fop/image/analyser/SVGReader.java
+++ b/src/java/org/apache/fop/image/analyser/SVGReader.java
@@ -70,7 +70,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.svg.SVGUserAgent;
+import org.apache.fop.fo.extensions.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 ef135533d..f2f8debf7 100644
--- a/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java
+++ b/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java
@@ -61,7 +61,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.svg.SVGUserAgent;
+import org.apache.fop.fo.extensions.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 b6c50f915..558691daa 100644
--- a/src/java/org/apache/fop/render/ps/PSXMLHandler.java
+++ b/src/java/org/apache/fop/render/ps/PSXMLHandler.java
@@ -71,7 +71,7 @@ import org.apache.batik.gvt.TextPainter;
 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.fo.extensions.svg.SVGUserAgent;
 import org.apache.fop.apps.*;
 
 /**