updated and renamed batik jar (note: many batik classes were moved to different packages)

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

diff --git a/lib/batik-all-svn-trunk.jar b/lib/batik-all-svn-trunk.jar
new file mode 100644 (file)
index 0000000..26e93c7
Binary files /dev/null and b/lib/batik-all-svn-trunk.jar differ

diff --git a/lib/batik-all-trunk.jar b/lib/batik-all-trunk.jar
deleted file mode 100644 (file)
index 5aac032..0000000
Binary files a/lib/batik-all-trunk.jar and /dev/null differ

diff --git a/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java b/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java
index 5c13b9d921d39813d8e5181c21818d8f8fac24fa..1e8f2b606f14d290a86b95f08625c8c417541009 100644 (file)
--- a/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java
+++ b/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java
@@ -22,11 +22,11 @@ package org.apache.fop.afp.svg;
 import java.awt.geom.AffineTransform;
 
 import org.apache.batik.bridge.BridgeContext;
+import org.apache.batik.bridge.DefaultFontFamilyResolver;
 import org.apache.batik.bridge.DocumentLoader;
+import org.apache.batik.bridge.FontFamilyResolver;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.bridge.UserAgent;
-import org.apache.batik.gvt.TextPainter;
-import org.apache.batik.gvt.font.DefaultFontFamilyResolver;
-import org.apache.batik.gvt.font.FontFamilyResolver;
 
 import org.apache.xmlgraphics.image.loader.ImageManager;
 import org.apache.xmlgraphics.image.loader.ImageSessionContext;

diff --git a/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java b/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java
index 85bb785931e277e471aa1e770768d4a2d2f354e2..efc26eda3e4ec6d5e5352c6b8f5d5c218ef15589 100644 (file)
--- a/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java
+++ b/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java
@@ -19,7 +19,7 @@
 
 package org.apache.fop.afp.svg;
 
-import org.apache.batik.gvt.TextPainter;
+import org.apache.batik.bridge.TextPainter;
 
 import org.apache.fop.svg.AbstractFOPTextElementBridge;
 

diff --git a/src/java/org/apache/fop/afp/svg/AFPTextPainter.java b/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
index 996ae8691fae80c3ce6a4288a6133601e3735f7e..3cc377034c352848120b31795acaf835c7fe37dd 100644 (file)
--- a/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
+++ b/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
@@ -21,8 +21,8 @@ package org.apache.fop.afp.svg;
 
 import java.awt.Graphics2D;
 
-import org.apache.batik.gvt.font.FontFamilyResolver;
-import org.apache.batik.gvt.renderer.StrokingTextPainter;
+import org.apache.batik.bridge.FontFamilyResolver;
+import org.apache.batik.bridge.StrokingTextPainter;
 
 import org.apache.fop.afp.AFPGraphics2D;
 import org.apache.fop.svg.AbstractFOPTextPainter;

diff --git a/src/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java b/src/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java
index e5af471af1903a0bb732050667dbcdf2eaf97090..a53fdfd342dc7e77ed2f23e53f48e1f8a9a4805c 100644 (file)
--- a/src/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java
+++ b/src/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java
@@ -20,7 +20,6 @@
 package org.apache.fop.complexscripts.fonts;
 
 import java.lang.ref.WeakReference;
-
 import java.util.List;
 import java.util.Map;
 

diff --git a/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java b/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
index 8db7f109e940aeb44ad42d35ca74669e31e165f7..2b1d636e1572dcac7e578e1e52f7c5c769d17018 100644 (file)
--- a/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
+++ b/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
@@ -20,7 +20,6 @@
 package org.apache.fop.complexscripts.util;
 
 import java.nio.IntBuffer;
-
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/src/java/org/apache/fop/fo/XMLObj.java b/src/java/org/apache/fop/fo/XMLObj.java
index a62054e72e971ab1dfbdb45298c477bda8d51145..1c4597295d807381652fb9e5807f21cd4f892ee4 100644 (file)
--- a/src/java/org/apache/fop/fo/XMLObj.java
+++ b/src/java/org/apache/fop/fo/XMLObj.java
@@ -26,7 +26,6 @@ import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 

diff --git a/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java b/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
index 67f6567c9c6f0e642bd9a15a98df8a67f162524e..eacb29659185121b9ebb41d983868bc113d7e73a 100644 (file)
--- a/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
+++ b/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
@@ -26,12 +26,11 @@ import javax.xml.transform.sax.TransformerHandler;
 
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
-
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 
 import org.apache.fop.util.ContentHandlerFactory;
 import org.apache.fop.util.DelegatingContentHandler;

diff --git a/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java b/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
index 63506dd0a8c806227e7d58f711f1b65eff0a8a42..ccb73213233a086f444dee512a8e68d13534d320 100644 (file)
--- a/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
+++ b/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
@@ -27,11 +27,11 @@ import java.net.URI;
 
 import org.w3c.dom.Element;
 
+import org.apache.batik.anim.dom.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGOMDocument;
+import org.apache.batik.anim.dom.SVGOMElement;
 import org.apache.batik.bridge.UnitProcessor;
 import org.apache.batik.dom.svg.SVGContext;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.dom.svg.SVGOMElement;
 import org.apache.batik.dom.util.XMLSupport;
 import org.apache.batik.util.SVGConstants;
 

diff --git a/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java b/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java
index 0e46076cd654e3320e027705e1ddaebfff9cde33..1b1afe6abce0b89bbf4a614541b347e19d9b117f 100644 (file)
--- a/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java
+++ b/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java
@@ -28,7 +28,7 @@ import org.w3c.dom.DOMImplementation;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 import org.apache.batik.util.XMLResourceDescriptor;
 
 import org.apache.fop.fo.ElementMapping;

diff --git a/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java b/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java
index 7f843279eadbfe24460e1903c7e0c8af0c376c97..9ce22180eccc278afc5329aaf21d294743348e3e 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java
+++ b/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java
@@ -20,7 +20,6 @@
 package org.apache.fop.fo.properties;
 
 import java.awt.Color;
-
 import java.util.Iterator;
 import java.util.List;
 

diff --git a/src/java/org/apache/fop/image/loader/batik/BatikImageFlavors.java b/src/java/org/apache/fop/image/loader/batik/BatikImageFlavors.java
index 7766fdbcb90875bb03ccdf32ca308e70e0a74226..e96cb68ed879d9765fa998fac41b90a7b60f918d 100644 (file)
--- a/src/java/org/apache/fop/image/loader/batik/BatikImageFlavors.java
+++ b/src/java/org/apache/fop/image/loader/batik/BatikImageFlavors.java
@@ -19,7 +19,7 @@
 
 package org.apache.fop.image.loader.batik;
 
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 
 import org.apache.xmlgraphics.image.loader.ImageFlavor;
 import org.apache.xmlgraphics.image.loader.XMLNamespaceEnabledImageFlavor;

diff --git a/src/java/org/apache/fop/image/loader/batik/BatikUtil.java b/src/java/org/apache/fop/image/loader/batik/BatikUtil.java
index c5b6264b4f067aa191631721c6b404c8c02dcac1..cda57b59653ee9fd6889506343d3818a73d0dfc2 100644 (file)
--- a/src/java/org/apache/fop/image/loader/batik/BatikUtil.java
+++ b/src/java/org/apache/fop/image/loader/batik/BatikUtil.java
@@ -38,7 +38,7 @@ public final class BatikUtil {
      */
     public static boolean isBatikAvailable() {
         try {
-            Class.forName("org.apache.batik.dom.svg.SVGDOMImplementation");
+            Class.forName("org.apache.batik.anim.dom.SVGDOMImplementation");
             return true;
         } catch (Exception e) {
             //ignore

diff --git a/src/java/org/apache/fop/image/loader/batik/GenericFOPBridgeContext.java b/src/java/org/apache/fop/image/loader/batik/GenericFOPBridgeContext.java
index b1808a7b91b1f6a66dac41f3d251f79c5946dbc2..c1782dc135fa9396eba9d7cf6e2cdd2781e64eab 100644 (file)
--- a/src/java/org/apache/fop/image/loader/batik/GenericFOPBridgeContext.java
+++ b/src/java/org/apache/fop/image/loader/batik/GenericFOPBridgeContext.java
@@ -21,10 +21,10 @@ package org.apache.fop.image.loader.batik;
 
 import java.awt.geom.AffineTransform;
 
+import org.apache.batik.anim.dom.SVGOMDocument;
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.bridge.DocumentLoader;
 import org.apache.batik.bridge.UserAgent;
-import org.apache.batik.dom.svg.SVGOMDocument;
 
 import org.apache.xmlgraphics.image.loader.ImageManager;
 import org.apache.xmlgraphics.image.loader.ImageSessionContext;

diff --git a/src/java/org/apache/fop/image/loader/batik/ImageConverterG2D2SVG.java b/src/java/org/apache/fop/image/loader/batik/ImageConverterG2D2SVG.java
index d56f543c7a5be87156ece775a1259062a5c15f00..85244aea5a18f2b968ee2a9f8ce8a62d57b10174 100644 (file)
--- a/src/java/org/apache/fop/image/loader/batik/ImageConverterG2D2SVG.java
+++ b/src/java/org/apache/fop/image/loader/batik/ImageConverterG2D2SVG.java
@@ -27,8 +27,8 @@ import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 import org.apache.batik.dom.GenericDOMImplementation;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
 import org.apache.batik.svggen.SVGGeneratorContext;
 import org.apache.batik.svggen.SVGGraphics2D;
 

diff --git a/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java b/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
index ec187b8d0f458e467c4f94620bf62356cf1dec07..b5d8626f9a7d0a35d3c5863ca1b497446543a765 100644 (file)
--- a/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
+++ b/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
@@ -28,12 +28,12 @@ import org.w3c.dom.Document;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 import org.apache.batik.bridge.BridgeContext;
+import org.apache.batik.bridge.DefaultFontFamilyResolver;
 import org.apache.batik.bridge.GVTBuilder;
 import org.apache.batik.bridge.UserAgent;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.font.DefaultFontFamilyResolver;
 
 import org.apache.xmlgraphics.image.GraphicsConstants;
 import org.apache.xmlgraphics.image.loader.Image;

diff --git a/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java b/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java
index bb9c7d39595478800db6010f4295cbc9ce8f5c81..53a7e2cc7f4f80aeb16ba215ae115aecd578bc37 100644 (file)
--- a/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java
+++ b/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java
@@ -22,7 +22,7 @@ package org.apache.fop.image.loader.batik;
 import java.io.IOException;
 import java.util.Map;
 
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 
 import org.apache.xmlgraphics.image.loader.Image;
 import org.apache.xmlgraphics.image.loader.ImageException;

diff --git a/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java b/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
index 58daadc52ff1c57f33d48754115f401016adc949..7df9a6cb69aec07c223c4d78ccad653df532167d 100644 (file)
--- a/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
+++ b/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
@@ -33,12 +33,12 @@ import org.w3c.dom.svg.SVGDocument;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SVGOMDocument;
 import org.apache.batik.bridge.BridgeContext;
+import org.apache.batik.bridge.DefaultFontFamilyResolver;
 import org.apache.batik.bridge.UnitProcessor;
 import org.apache.batik.bridge.UserAgent;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.gvt.font.DefaultFontFamilyResolver;
 
 import org.apache.xmlgraphics.image.loader.ImageContext;
 import org.apache.xmlgraphics.image.loader.ImageInfo;

diff --git a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
index ba49b7dc0918a0334c7624f44be51ffcfa2ac43b..16abdb527963dc40f813f011be5eaadfb9c92eea 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
@@ -249,7 +249,7 @@ public class ListItemLayoutManager extends SpacedBorderedPaddedBlockLayoutManage
             }
         }
         labelList = !labelDone ? label.getNextKnuthElements(childLC, alignment, labelLMStack,
-                labelRestartPosition, labelRestartLM) : new LinkedList<KnuthElement>();
+                labelRestartPosition, labelRestartLM) : (List) new LinkedList<KnuthElement>();
 
         //Space resolution as if the contents were placed in a new reference area
         //(see 6.8.3, XSL 1.0, section on Constraints, last paragraph)
@@ -286,7 +286,7 @@ public class ListItemLayoutManager extends SpacedBorderedPaddedBlockLayoutManage
             }
         }
         bodyList = !bodyDone ? body.getNextKnuthElements(childLC, alignment, bodyLMStack,
-                bodyRestartPosition, bodyRestartLM) : new LinkedList<KnuthElement>();
+                bodyRestartPosition, bodyRestartLM) : (List) new LinkedList<KnuthElement>();
 
         //Space resolution as if the contents were placed in a new reference area
         //(see 6.8.3, XSL 1.0, section on Constraints, last paragraph)

diff --git a/src/java/org/apache/fop/pdf/PDFColorHandler.java b/src/java/org/apache/fop/pdf/PDFColorHandler.java
index 8dfcf7f24eff5e15d6ce44c9b32579af201be061..3477ea3e74d18031a1e847db6b995b91cd8f709d 100644 (file)
--- a/src/java/org/apache/fop/pdf/PDFColorHandler.java
+++ b/src/java/org/apache/fop/pdf/PDFColorHandler.java
@@ -34,7 +34,6 @@ import org.apache.xmlgraphics.java2d.color.ColorWithAlternatives;
 import org.apache.xmlgraphics.java2d.color.DeviceCMYKColorSpace;
 import org.apache.xmlgraphics.java2d.color.NamedColorSpace;
 import org.apache.xmlgraphics.java2d.color.profile.ColorProfileUtil;
-
 import org.apache.xmlgraphics.util.DoubleFormatUtil;
 
 /**

diff --git a/src/java/org/apache/fop/pdf/PDFDictionary.java b/src/java/org/apache/fop/pdf/PDFDictionary.java
index d3e2e57d18f51fa2564f18ec3b3c9e9d55f63d18..d91e87d92fd80f7879c6a4d3d40b4bcba7d4fa75 100644 (file)
--- a/src/java/org/apache/fop/pdf/PDFDictionary.java
+++ b/src/java/org/apache/fop/pdf/PDFDictionary.java
@@ -21,7 +21,6 @@ package org.apache.fop.pdf;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;

diff --git a/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java b/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
index 983a5ad9056b299374c19ef3f1a26672138f703a..e329765db81a113d43dd3248637dcb2c579d8a53 100644 (file)
--- a/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
+++ b/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
@@ -26,12 +26,12 @@ import java.io.IOException;
 
 import org.w3c.dom.Document;
 
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 import org.apache.batik.bridge.BridgeContext;
+import org.apache.batik.bridge.DefaultFontFamilyResolver;
 import org.apache.batik.bridge.GVTBuilder;
 import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.font.DefaultFontFamilyResolver;
 
 import org.apache.xmlgraphics.java2d.Graphics2DImagePainter;
 

diff --git a/src/java/org/apache/fop/render/XMLHandlerConfigurator.java b/src/java/org/apache/fop/render/XMLHandlerConfigurator.java
index fbce59a07ddf1b240595e5f874847f869cadb942..9baed9959a98f3449520c0e799da04bff7c677c7 100644 (file)
--- a/src/java/org/apache/fop/render/XMLHandlerConfigurator.java
+++ b/src/java/org/apache/fop/render/XMLHandlerConfigurator.java
@@ -21,7 +21,6 @@ package org.apache.fop.render;
 
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

diff --git a/src/java/org/apache/fop/render/afp/AFPSVGHandler.java b/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
index aa3ed824d4349bb65ce19c1602efa00ceba4f66a..9ea871d17328d6aff63016a101498954ae2e03fd 100644 (file)
--- a/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
+++ b/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
@@ -26,10 +26,10 @@ import java.io.IOException;
 
 import org.w3c.dom.Document;
 
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 import org.apache.batik.bridge.BridgeContext;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.bridge.DefaultFontFamilyResolver;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.font.DefaultFontFamilyResolver;
 
 import org.apache.xmlgraphics.image.loader.ImageManager;
 import org.apache.xmlgraphics.image.loader.ImageSessionContext;

diff --git a/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java b/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
index f3128c600f16b0db2fc51fa9e9018eb1c6a148a8..b4347070d1c3d3b81f7a848691c1ef5ad59bccdd 100644 (file)
--- a/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
+++ b/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
@@ -29,9 +29,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.batik.bridge.BridgeContext;
+import org.apache.batik.bridge.DefaultFontFamilyResolver;
 import org.apache.batik.bridge.GVTBuilder;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.font.DefaultFontFamilyResolver;
 
 import org.apache.fop.image.loader.batik.BatikUtil;
 import org.apache.fop.render.AbstractGenericSVGHandler;

diff --git a/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java b/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
index fa3813d061b5f88a0d3d8f5c2d25bff4aba08fc5..fac9f4005b393376e699df1236b679f74383716a 100644 (file)
--- a/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
+++ b/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
@@ -29,9 +29,9 @@ import org.w3c.dom.Document;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.bridge.GVTBuilder;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
 import org.apache.batik.gvt.GraphicsNode;
 import org.apache.batik.util.SVGConstants;
 

diff --git a/src/java/org/apache/fop/render/ps/PSBatikFlowTextElementBridge.java b/src/java/org/apache/fop/render/ps/PSBatikFlowTextElementBridge.java
index 31571f987e3b68679840bb6a6c510c0e08cafae9..a09f55becf5ccc480a8129074b5ceb2946922055 100644 (file)
--- a/src/java/org/apache/fop/render/ps/PSBatikFlowTextElementBridge.java
+++ b/src/java/org/apache/fop/render/ps/PSBatikFlowTextElementBridge.java
@@ -22,11 +22,11 @@ package org.apache.fop.render.ps;
 import java.text.AttributedCharacterIterator;
 import java.util.List;
 
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.extension.svg.BatikFlowTextElementBridge;
 import org.apache.batik.extension.svg.FlowExtTextPainter;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
 
 import org.apache.fop.fonts.FontInfo;
 

diff --git a/src/java/org/apache/fop/render/ps/PSBridgeContext.java b/src/java/org/apache/fop/render/ps/PSBridgeContext.java
index c0244db04e4517e11be8dfa462b6f28f75122a6f..b774c598f385ccba1b4d0b004be4da1127e8aeb3 100644 (file)
--- a/src/java/org/apache/fop/render/ps/PSBridgeContext.java
+++ b/src/java/org/apache/fop/render/ps/PSBridgeContext.java
@@ -24,8 +24,8 @@ import java.awt.geom.AffineTransform;
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.bridge.DocumentLoader;
 import org.apache.batik.bridge.SVGTextElementBridge;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.bridge.UserAgent;
-import org.apache.batik.gvt.TextPainter;
 
 import org.apache.xmlgraphics.image.loader.ImageManager;
 import org.apache.xmlgraphics.image.loader.ImageSessionContext;

diff --git a/src/java/org/apache/fop/render/ps/PSSVGFlowRootElementBridge.java b/src/java/org/apache/fop/render/ps/PSSVGFlowRootElementBridge.java
index 56b1f91bd028251c96a72f75cb13f5a261a9008a..df9e22053f0f3b9e268d957353e5b57f50d60811 100644 (file)
--- a/src/java/org/apache/fop/render/ps/PSSVGFlowRootElementBridge.java
+++ b/src/java/org/apache/fop/render/ps/PSSVGFlowRootElementBridge.java
@@ -22,11 +22,11 @@ package org.apache.fop.render.ps;
 import java.text.AttributedCharacterIterator;
 import java.util.List;
 
+import org.apache.batik.bridge.FlowTextPainter;
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.bridge.svg12.SVGFlowRootElementBridge;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
-import org.apache.batik.gvt.flow.FlowTextPainter;
 
 import org.apache.fop.fonts.FontInfo;
 

diff --git a/src/java/org/apache/fop/render/ps/PSTextElementBridge.java b/src/java/org/apache/fop/render/ps/PSTextElementBridge.java
index c5240dff20f2fd971192d3461d134fe815ba2347..f331ecad9f1e91d75b5d5d60fde924c643bff0ca 100644 (file)
--- a/src/java/org/apache/fop/render/ps/PSTextElementBridge.java
+++ b/src/java/org/apache/fop/render/ps/PSTextElementBridge.java
@@ -23,9 +23,9 @@ import org.w3c.dom.Element;
 
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.bridge.SVGTextElementBridge;
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
 
 /**
  * <p>Bridge class for the &lt;text> element.

diff --git a/src/java/org/apache/fop/servlet/FopPrintServlet.java b/src/java/org/apache/fop/servlet/FopPrintServlet.java
index 0fe77142f604d641c6e817ab716f8ede7316322d..006a95dfcff64b15914cbd9925c522ecbc887a9d 100644 (file)
--- a/src/java/org/apache/fop/servlet/FopPrintServlet.java
+++ b/src/java/org/apache/fop/servlet/FopPrintServlet.java
@@ -23,7 +23,6 @@ import java.io.IOException;
 import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletResponse;
-
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;

diff --git a/src/java/org/apache/fop/svg/AbstractFOPTextElementBridge.java b/src/java/org/apache/fop/svg/AbstractFOPTextElementBridge.java
index 6efa31e4583830cdf171c4eb9c8bf30fdd52d466..59db21d6331be73653985958b72473c4655fc1a1 100644 (file)
--- a/src/java/org/apache/fop/svg/AbstractFOPTextElementBridge.java
+++ b/src/java/org/apache/fop/svg/AbstractFOPTextElementBridge.java
@@ -23,9 +23,9 @@ import org.w3c.dom.Element;
 
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.bridge.SVGTextElementBridge;
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
 
 /**
  * <p>Bridge class for the &lt;text> element.

diff --git a/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java b/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java
index 9cb868448a6e7bc6a227a689140ec0f49a0d3600..df24dbb92c1604e59b404a753051afd21a61511d 100644 (file)
--- a/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java
+++ b/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java
@@ -32,11 +32,11 @@ import java.text.CharacterIterator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
-import org.apache.batik.gvt.renderer.StrokingTextPainter;
+import org.apache.batik.bridge.Mark;
+import org.apache.batik.bridge.StrokingTextPainter;
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
-import org.apache.batik.gvt.text.Mark;
 import org.apache.batik.gvt.text.TextPaintInfo;
 
 import org.apache.fop.afp.AFPGraphics2D;

diff --git a/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java b/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java
index 33f5aecf6c9f7e47534e14129d7436e29efd4e1b..430638a4b3e92824a2189da74a3cbff511095b16 100644 (file)
--- a/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java
+++ b/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java
@@ -32,13 +32,12 @@ import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.configuration.DefaultConfiguration;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.impl.SimpleLog;
 
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
+import org.apache.batik.bridge.FontFamilyResolver;
 import org.apache.batik.dom.util.DocumentFactory;
-import org.apache.batik.gvt.font.FontFamilyResolver;
 import org.apache.batik.transcoder.ErrorHandler;
 import org.apache.batik.transcoder.SVGAbstractTranscoder;
 import org.apache.batik.transcoder.TranscoderException;

diff --git a/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java b/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java
index fce6ed2b6e6307c2a72d06486f99cadd19e38cf7..b8e73a29dbb9b46b2351f0f9bacf691f22c6251e 100644 (file)
--- a/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java
+++ b/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java
@@ -22,12 +22,11 @@ package org.apache.fop.svg;
 import java.io.IOException;
 
 import org.w3c.dom.Document;
-
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
 
 /**
  * This is a special subclass to allow setting a special EntityResolver.

diff --git a/src/java/org/apache/fop/svg/NativeTextPainter.java b/src/java/org/apache/fop/svg/NativeTextPainter.java
index cb96368c80462a8900905da8bbefb542d4bd1f69..126e1efc322b863df2c25a8969f57e34e43ac887 100644 (file)
--- a/src/java/org/apache/fop/svg/NativeTextPainter.java
+++ b/src/java/org/apache/fop/svg/NativeTextPainter.java
@@ -36,16 +36,15 @@ import java.util.Set;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.apache.batik.bridge.FontFamilyResolver;
+import org.apache.batik.bridge.GlyphLayout;
 import org.apache.batik.bridge.SVGGVTFont;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.font.FontFamilyResolver;
+import org.apache.batik.bridge.StrokingTextPainter;
+import org.apache.batik.bridge.TextLayoutFactory;
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextSpanLayout;
 import org.apache.batik.gvt.font.GVTGlyphVector;
-import org.apache.batik.gvt.renderer.StrokingTextPainter;
-import org.apache.batik.gvt.renderer.StrokingTextPainter.TextChunk;
-import org.apache.batik.gvt.text.GlyphLayout;
-import org.apache.batik.gvt.text.TextLayoutFactory;
 import org.apache.batik.gvt.text.TextPaintInfo;
-import org.apache.batik.gvt.text.TextSpanLayout;
 
 import org.apache.fop.fonts.Font;
 import org.apache.fop.fonts.FontInfo;

diff --git a/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java b/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java
index 90dd9f3048696ad06afa8364a5c1cb61c85a4c33..44f3b10fa4da67a041c33792ab6be2df8310123d 100644 (file)
--- a/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java
+++ b/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java
@@ -19,10 +19,10 @@
 
 package org.apache.fop.svg;
 
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.extension.svg.BatikFlowTextElementBridge;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
 
 import org.apache.fop.fonts.FontInfo;
 

diff --git a/src/java/org/apache/fop/svg/PDFBridgeContext.java b/src/java/org/apache/fop/svg/PDFBridgeContext.java
index 4a6e6e27583d569347054aaa30ded4d2a455172b..0f6ba60c888d360bdf43de7de99f94792f4fc767 100644 (file)
--- a/src/java/org/apache/fop/svg/PDFBridgeContext.java
+++ b/src/java/org/apache/fop/svg/PDFBridgeContext.java
@@ -21,12 +21,12 @@ package org.apache.fop.svg;
 
 import java.awt.geom.AffineTransform;
 
+import org.apache.batik.anim.dom.SVGOMDocument;
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.bridge.DocumentLoader;
 import org.apache.batik.bridge.SVGTextElementBridge;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.bridge.UserAgent;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.gvt.TextPainter;
 
 import org.apache.xmlgraphics.image.loader.ImageManager;
 import org.apache.xmlgraphics.image.loader.ImageSessionContext;

diff --git a/src/java/org/apache/fop/svg/PDFFlowExtTextPainter.java b/src/java/org/apache/fop/svg/PDFFlowExtTextPainter.java
index 0f11e99bf319a2af09ba22ca483b0ad7b0c8a30c..5472a9fa1cb97a798f48edcea7c76f01080cc9ba 100644 (file)
--- a/src/java/org/apache/fop/svg/PDFFlowExtTextPainter.java
+++ b/src/java/org/apache/fop/svg/PDFFlowExtTextPainter.java
@@ -22,8 +22,8 @@ package org.apache.fop.svg;
 import java.text.AttributedCharacterIterator;
 import java.util.List;
 
+import org.apache.batik.bridge.TextNode;
 import org.apache.batik.extension.svg.FlowExtTextPainter;
-import org.apache.batik.gvt.TextNode;
 
 import org.apache.fop.fonts.FontInfo;
 

diff --git a/src/java/org/apache/fop/svg/PDFFlowTextPainter.java b/src/java/org/apache/fop/svg/PDFFlowTextPainter.java
index 7b07ec297e651ce06c981ca9cdb316f341bc7bb3..beb97c53998d0a9e5f5cda966eed91c3d2dd858a 100644 (file)
--- a/src/java/org/apache/fop/svg/PDFFlowTextPainter.java
+++ b/src/java/org/apache/fop/svg/PDFFlowTextPainter.java
@@ -22,8 +22,8 @@ package org.apache.fop.svg;
 import java.text.AttributedCharacterIterator;
 import java.util.List;
 
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.flow.FlowTextPainter;
+import org.apache.batik.bridge.FlowTextPainter;
+import org.apache.batik.bridge.TextNode;
 
 import org.apache.fop.fonts.FontInfo;
 

diff --git a/src/java/org/apache/fop/svg/PDFSVGFlowRootElementBridge.java b/src/java/org/apache/fop/svg/PDFSVGFlowRootElementBridge.java
index 7d2b947e75fb768fb07579d0910626a4047bad7f..c65630819098d7639cabe9112616633dac67bb37 100644 (file)
--- a/src/java/org/apache/fop/svg/PDFSVGFlowRootElementBridge.java
+++ b/src/java/org/apache/fop/svg/PDFSVGFlowRootElementBridge.java
@@ -19,10 +19,10 @@
 
 package org.apache.fop.svg;
 
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.bridge.svg12.SVGFlowRootElementBridge;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
 
 import org.apache.fop.fonts.FontInfo;
 

diff --git a/src/java/org/apache/fop/svg/PDFTextElementBridge.java b/src/java/org/apache/fop/svg/PDFTextElementBridge.java
index 339bb36f3cb369d058acc37c23416c8887ed86a2..e63b580f2e1378bb5a8dae3489a2df9cb3970906 100644 (file)
--- a/src/java/org/apache/fop/svg/PDFTextElementBridge.java
+++ b/src/java/org/apache/fop/svg/PDFTextElementBridge.java
@@ -19,7 +19,7 @@
 
 package org.apache.fop.svg;
 
-import org.apache.batik.gvt.TextPainter;
+import org.apache.batik.bridge.TextPainter;
 
 /**
  * <p>Bridge class for the &lt;text> element.

diff --git a/src/java/org/apache/fop/svg/SVGUserAgent.java b/src/java/org/apache/fop/svg/SVGUserAgent.java
index a265b4fefa215c19ee346b293a7bd7621eb92215..6a4d9d0de81398b79b859dac49939ce30996af8a 100644 (file)
--- a/src/java/org/apache/fop/svg/SVGUserAgent.java
+++ b/src/java/org/apache/fop/svg/SVGUserAgent.java
@@ -21,7 +21,7 @@ package org.apache.fop.svg;
 
 import java.awt.geom.AffineTransform;
 
-import org.apache.batik.gvt.font.FontFamilyResolver;
+import org.apache.batik.bridge.FontFamilyResolver;
 
 import org.apache.fop.apps.FOUserAgent;
 

diff --git a/src/java/org/apache/fop/svg/SVGUtilities.java b/src/java/org/apache/fop/svg/SVGUtilities.java
index 3401307cf6e5c5fd06f36ade4f44d2084231dd8a..d75aa209988809736d36cbf608de69000679c9b6 100644 (file)
--- a/src/java/org/apache/fop/svg/SVGUtilities.java
+++ b/src/java/org/apache/fop/svg/SVGUtilities.java
@@ -28,7 +28,7 @@ import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 import org.apache.batik.util.XMLConstants;
 
 /**

diff --git a/src/java/org/apache/fop/svg/SimpleSVGUserAgent.java b/src/java/org/apache/fop/svg/SimpleSVGUserAgent.java
index 03108f819c82f1b0241e5586d4f3218b9109ed76..0267cb6837f878faf6a8bfc26f4458932dbdca7e 100644 (file)
--- a/src/java/org/apache/fop/svg/SimpleSVGUserAgent.java
+++ b/src/java/org/apache/fop/svg/SimpleSVGUserAgent.java
@@ -28,8 +28,8 @@ import javax.xml.parsers.SAXParserFactory;
 
 import org.xml.sax.SAXException;
 
+import org.apache.batik.bridge.FontFamilyResolver;
 import org.apache.batik.bridge.UserAgentAdapter;
-import org.apache.batik.gvt.font.FontFamilyResolver;
 
 /**
  * A simple SVG user agent.

diff --git a/src/java/org/apache/fop/svg/font/AggregatingFontFamilyResolver.java b/src/java/org/apache/fop/svg/font/AggregatingFontFamilyResolver.java
index a5a25c4cee067821c69a3d4d8166e41b0169885f..9ac0ccc472d50ab8246ddb233eda51616fdef463 100644 (file)
--- a/src/java/org/apache/fop/svg/font/AggregatingFontFamilyResolver.java
+++ b/src/java/org/apache/fop/svg/font/AggregatingFontFamilyResolver.java
@@ -24,7 +24,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.batik.bridge.FontFace;
-import org.apache.batik.gvt.font.FontFamilyResolver;
+import org.apache.batik.bridge.FontFamilyResolver;
 import org.apache.batik.gvt.font.GVTFontFamily;
 
 public class AggregatingFontFamilyResolver implements FontFamilyResolver {

diff --git a/src/java/org/apache/fop/svg/font/FOPFontFamilyResolver.java b/src/java/org/apache/fop/svg/font/FOPFontFamilyResolver.java
index 7af5f0b4faeb2e8f021002e1a4b20aea78be42a2..92911d0ee4c9f5bbd1feb96f8fe04cbd76ebe33d 100644 (file)
--- a/src/java/org/apache/fop/svg/font/FOPFontFamilyResolver.java
+++ b/src/java/org/apache/fop/svg/font/FOPFontFamilyResolver.java
@@ -19,7 +19,7 @@
 
 package org.apache.fop.svg.font;
 
-import org.apache.batik.gvt.font.FontFamilyResolver;
+import org.apache.batik.bridge.FontFamilyResolver;
 
 public interface FOPFontFamilyResolver extends FontFamilyResolver {
 

diff --git a/src/java/org/apache/fop/svg/text/ComplexGlyphLayout.java b/src/java/org/apache/fop/svg/text/ComplexGlyphLayout.java
index 06a7188ff5c85452f793ef9250abf5540daed40a..b90e89b01963791d4788add4069e0c6fd793b87d 100644 (file)
--- a/src/java/org/apache/fop/svg/text/ComplexGlyphLayout.java
+++ b/src/java/org/apache/fop/svg/text/ComplexGlyphLayout.java
@@ -23,10 +23,10 @@ import java.awt.font.FontRenderContext;
 import java.awt.geom.Point2D;
 import java.text.AttributedCharacterIterator;
 
+import org.apache.batik.bridge.GlyphLayout;
 import org.apache.batik.gvt.font.GVTFont;
 import org.apache.batik.gvt.font.GVTGlyphVector;
 import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
-import org.apache.batik.gvt.text.GlyphLayout;
 
 import org.apache.fop.fonts.Font;
 import org.apache.fop.svg.font.FOPGVTFont;

diff --git a/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java b/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java
index 6e39733f5b722b8654e942f66be3840ec4740a9b..371f5a768edae13cb0a5b289f2eedfb0e88524d6 100644 (file)
--- a/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java
+++ b/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java
@@ -30,7 +30,6 @@ import javax.xml.transform.sax.SAXResult;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;

diff --git a/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java b/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java
index 57079bf031fb981d456ba68db418746a2bbc4275..9c571db97ecb21dd85d98af7e4d0e81db9af78ca 100644 (file)
--- a/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java
+++ b/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java
@@ -26,7 +26,7 @@ import org.w3c.dom.svg.SVGDocument;
 import org.w3c.dom.svg.SVGElement;
 import org.w3c.dom.svg.SVGSVGElement;
 
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 import org.apache.batik.dom.util.DOMUtilities;
 import org.apache.batik.dom.util.XMLSupport;
 

diff --git a/test/java/org/apache/fop/complexscripts/layout/ComplexScriptsLayoutTestCase.java b/test/java/org/apache/fop/complexscripts/layout/ComplexScriptsLayoutTestCase.java
index 01dbaea57fe47e0af3b3a283420736c16195398a..416cbf8d0d9c3da0e3edefa6b269a46cb90557b5 100644 (file)
--- a/test/java/org/apache/fop/complexscripts/layout/ComplexScriptsLayoutTestCase.java
+++ b/test/java/org/apache/fop/complexscripts/layout/ComplexScriptsLayoutTestCase.java
@@ -65,7 +65,6 @@ import org.apache.commons.io.filefilter.SuffixFileFilter;
 import org.apache.commons.io.filefilter.TrueFileFilter;
 
 import org.apache.fop.DebugHelper;
-
 import org.apache.fop.apps.EnvironmentProfile;
 import org.apache.fop.apps.EnvironmentalProfileFactory;
 import org.apache.fop.apps.FOUserAgent;

diff --git a/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java b/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java
index 2df0cac2a869703066e98b43d14d90336cb673c5..be049eac98baa39df3e9d7115f20eaf6f671bfb2 100644 (file)
--- a/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java
+++ b/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java
@@ -28,7 +28,6 @@ import static org.junit.Assert.assertEquals;
 import org.apache.fop.datatypes.PercentBaseContext;
 import org.apache.fop.fo.FObj;
 
-
 public class TableColumnColumnNumberTestCase extends AbstractTableTest {
 
     /**

diff --git a/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java b/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java
index d7bc2e11c7a5892d913b12c1628eaf5331824ddc..9a4515b31e4efda0c65d5531d122466ea8ee27f0 100644 (file)
--- a/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java
+++ b/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java
@@ -36,7 +36,6 @@ import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.layoutmgr.BlockLevelEventProducer;
 
-
 /**
  * Unit Test for PageSequenceMaster
  *

diff --git a/test/java/org/apache/fop/fo/properties/AltTextHolderTestCase.java b/test/java/org/apache/fop/fo/properties/AltTextHolderTestCase.java
index 89ed2733d50dce29bb1b1491a4647d0ae1ef06a6..eae290be3245e65686b6dda1fbea65a37015b96d 100644 (file)
--- a/test/java/org/apache/fop/fo/properties/AltTextHolderTestCase.java
+++ b/test/java/org/apache/fop/fo/properties/AltTextHolderTestCase.java
@@ -36,7 +36,6 @@ import org.apache.fop.fo.flow.AbstractGraphics;
 import org.apache.fop.fo.flow.ExternalGraphic;
 import org.apache.fop.fo.flow.InstreamForeignObject;
 
-
 /**
  * Tests that the fox:alt-text property is correctly set on objects that support it.
  */

diff --git a/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java b/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java
index 267e05c2cff3bfc76a13cec318bc8c1d1705307e..cc2352300cb371f52a19d81acb5feef96c54c581 100644 (file)
--- a/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java
+++ b/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java
@@ -31,7 +31,6 @@ import static org.junit.Assert.fail;
 
 import org.apache.commons.io.output.CountingOutputStream;
 
-
 /**
  * Test case for {@link PDFDictionary}.
  */

diff --git a/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java b/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java
index 5d423442c8970883b34dfdc3af5a1539e7eba0df..fd6d8b94b0a71b7ad887a4d125ec23468b39ba0f 100644 (file)
--- a/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java
+++ b/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java
@@ -25,6 +25,7 @@ import java.awt.Font;
 import java.awt.Graphics2D;
 
 import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 
 import org.apache.commons.io.output.ByteArrayOutputStream;

diff --git a/test/java/org/apache/fop/pdf/PDFLibraryTestSuite.java b/test/java/org/apache/fop/pdf/PDFLibraryTestSuite.java
index c7a9dff89a5f74e528d186cd99e9fd1d49035191..7f408ae2c69e72bdffdae024f9c652aea9074e86 100644 (file)
--- a/test/java/org/apache/fop/pdf/PDFLibraryTestSuite.java
+++ b/test/java/org/apache/fop/pdf/PDFLibraryTestSuite.java
@@ -23,7 +23,6 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-
 /**
  * Test suite for FOP's utility classes.
  */

diff --git a/test/java/org/apache/fop/pdf/VersionControllerTestCase.java b/test/java/org/apache/fop/pdf/VersionControllerTestCase.java
index 561e80b569a0f90d3093a04859c20d9e3a03469c..3832084058b1cd33ae826080a02a171bdf61de35 100644 (file)
--- a/test/java/org/apache/fop/pdf/VersionControllerTestCase.java
+++ b/test/java/org/apache/fop/pdf/VersionControllerTestCase.java
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
-
 /**
  * A test class for {@link VersionController}.
  */

diff --git a/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java b/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java
index e74251be115326a03921e7637ee9e7d5dcdbf7f6..ab58e9892539d379f5d63f281fcff6c6d73c6c8e 100644 (file)
--- a/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java
+++ b/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java
@@ -23,7 +23,6 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-
 /**
  * A test suite for org.apache.fop.render.pdf.*
  */

diff --git a/test/java/org/apache/fop/svg/NativeTextPainterTest.java b/test/java/org/apache/fop/svg/NativeTextPainterTest.java
index 1c2c3b58272eff9b8f28d35595ebe41bf4896e99..5344e6a54bc56a49583a8f2563b1af486a6cadf7 100644 (file)
--- a/test/java/org/apache/fop/svg/NativeTextPainterTest.java
+++ b/test/java/org/apache/fop/svg/NativeTextPainterTest.java
@@ -26,11 +26,11 @@ import java.io.IOException;
 
 import org.w3c.dom.Document;
 
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.bridge.GVTBuilder;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextPainter;
 
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.apps.FopFactory;

diff --git a/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java b/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java
index e7e47e7bade0551e3c357b4f620f15139d26ed7c..3e64cb58f8353528d9c272fe99caa3e002b85a43 100644 (file)
--- a/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java
+++ b/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java
@@ -24,7 +24,7 @@ import java.io.StringWriter;
 
 import org.junit.Test;
 
-import org.apache.batik.gvt.TextPainter;
+import org.apache.batik.bridge.TextPainter;
 
 import org.apache.xmlgraphics.java2d.GraphicContext;
 

diff --git a/test/java/org/apache/fop/svg/PSTextPainterTestCase.java b/test/java/org/apache/fop/svg/PSTextPainterTestCase.java
index 2d5de745528046587c7cc573daf4f475fa594c22..2b716e348ac2ccf329b199113847b71d85ad9743 100644 (file)
--- a/test/java/org/apache/fop/svg/PSTextPainterTestCase.java
+++ b/test/java/org/apache/fop/svg/PSTextPainterTestCase.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 
 import org.apache.commons.io.output.NullOutputStream;
 
-import org.apache.batik.gvt.TextPainter;
+import org.apache.batik.bridge.TextPainter;
 
 import org.apache.xmlgraphics.java2d.GraphicContext;
 import org.apache.xmlgraphics.java2d.ps.PSGraphics2D;

diff --git a/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java b/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java
index d8813c3bc66bb48eeec4cb88bb2df806c853ceb9..e4854d9a7944558922b583ceb4613d1e1e1d7aca 100644 (file)
--- a/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java
+++ b/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java
@@ -23,7 +23,6 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
 
-
 /**
  * JUnit test case for the LineBreakStatus class
  */