svn commit: r1664570 - in /xmlgraphics/fop/trunk: lib/ src/java/org/apache/fop/afp/svg/ src/java/org/apache/fop/complexscripts/fonts/ src/java/org/apache/fop/complexscripts/util/ src/java/org/apache/fop/fo/ src/java/org/apache/fop/fo/extensions/svg/ sr...

Fri, 06 Mar 2015 01:42:51 -0800 

Author: lbernardo
Date: Fri Mar  6 09:41:07 2015
New Revision: 1664570

URL: http://svn.apache.org/r1664570
Log:
updated and renamed batik jar (note: many batik classes were moved to different 
packages)

Added:
    xmlgraphics/fop/trunk/lib/batik-all-svn-trunk.jar   (with props)
Removed:
    xmlgraphics/fop/trunk/lib/batik-all-trunk.jar
Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLObj.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/BatikImageFlavors.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/BatikUtil.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/GenericFOPBridgeContext.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/ImageConverterG2D2SVG.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColorHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDictionary.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerConfigurator.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSBatikFlowTextElementBridge.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSBridgeContext.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSSVGFlowRootElementBridge.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSTextElementBridge.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopPrintServlet.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTextElementBridge.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/NativeTextPainter.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFBridgeContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFFlowExtTextPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFFlowTextPainter.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFSVGFlowRootElementBridge.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFTextElementBridge.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUserAgent.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUtilities.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SimpleSVGUserAgent.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/AggregatingFontFamilyResolver.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/FOPFontFamilyResolver.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/text/ComplexGlyphLayout.java
    
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java
    
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java
    
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/layout/ComplexScriptsLayoutTestCase.java
    
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java
    
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java
    
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/properties/AltTextHolderTestCase.java
    
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java
    
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFLibraryTestSuite.java
    
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/VersionControllerTestCase.java
    
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java
    
xmlgraphics/fop/trunk/test/java/org/apache/fop/svg/NativeTextPainterTest.java
    
xmlgraphics/fop/trunk/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java
    
xmlgraphics/fop/trunk/test/java/org/apache/fop/svg/PSTextPainterTestCase.java
    
xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java

Added: xmlgraphics/fop/trunk/lib/batik-all-svn-trunk.jar
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/lib/batik-all-svn-trunk.jar?rev=1664570&view=auto
==============================================================================
Binary file - no diff available.

Propchange: xmlgraphics/fop/trunk/lib/batik-all-svn-trunk.jar
------------------------------------------------------------------------------
    svn:mime-type = application/java-archive

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java 
Fri Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java 
(original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java 
Fri Mar  6 09:41:07 2015
@@ -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;
 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextPainter.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextPainter.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextPainter.java 
Fri Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java
 Fri Mar  6 09:41:07 2015
@@ -20,7 +20,6 @@
 package org.apache.fop.complexscripts.fonts;
 
 import java.lang.ref.WeakReference;
-
 import java.util.List;
 import java.util.Map;
 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
 Fri Mar  6 09:41:07 2015
@@ -20,7 +20,6 @@
 package org.apache.fop.complexscripts.util;
 
 import java.nio.IntBuffer;
-
 import java.util.ArrayList;
 import java.util.List;
 

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLObj.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLObj.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLObj.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLObj.java Fri Mar  6 
09:41:07 2015
@@ -26,7 +26,6 @@ import javax.xml.parsers.DocumentBuilder
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
 Fri Mar  6 09:41:07 2015
@@ -26,12 +26,11 @@ import javax.xml.transform.sax.Transform
 
 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;

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java 
(original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java 
Fri Mar  6 09:41:07 2015
@@ -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;
 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java
 Fri Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java
 Fri Mar  6 09:41:07 2015
@@ -20,7 +20,6 @@
 package org.apache.fop.fo.properties;
 
 import java.awt.Color;
-
 import java.util.Iterator;
 import java.util.List;
 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/BatikImageFlavors.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/BatikImageFlavors.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/BatikImageFlavors.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/BatikImageFlavors.java
 Fri Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/BatikUtil.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/BatikUtil.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/BatikUtil.java 
(original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/BatikUtil.java 
Fri Mar  6 09:41:07 2015
@@ -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

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/GenericFOPBridgeContext.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/GenericFOPBridgeContext.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/GenericFOPBridgeContext.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/GenericFOPBridgeContext.java
 Fri Mar  6 09:41:07 2015
@@ -21,10 +21,10 @@ package org.apache.fop.image.loader.bati
 
 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;

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/ImageConverterG2D2SVG.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/ImageConverterG2D2SVG.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/ImageConverterG2D2SVG.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/ImageConverterG2D2SVG.java
 Fri Mar  6 09:41:07 2015
@@ -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;
 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
 Fri Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java
 Fri Mar  6 09:41:07 2015
@@ -22,7 +22,7 @@ package org.apache.fop.image.loader.bati
 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;

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
 Fri Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
 Fri Mar  6 09:41:07 2015
@@ -249,7 +249,7 @@ public class ListItemLayoutManager exten
             }
         }
         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 exten
             }
         }
         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)

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColorHandler.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColorHandler.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColorHandler.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColorHandler.java Fri 
Mar  6 09:41:07 2015
@@ -34,7 +34,6 @@ import org.apache.xmlgraphics.java2d.col
 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;
 
 /**

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDictionary.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDictionary.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDictionary.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDictionary.java Fri 
Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
 Fri Mar  6 09:41:07 2015
@@ -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;
 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerConfigurator.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerConfigurator.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerConfigurator.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerConfigurator.java
 Fri Mar  6 09:41:07 2015
@@ -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;
 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPSVGHandler.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPSVGHandler.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPSVGHandler.java 
Fri Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
 Fri Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
 Fri Mar  6 09:41:07 2015
@@ -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;
 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSBatikFlowTextElementBridge.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSBatikFlowTextElementBridge.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSBatikFlowTextElementBridge.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSBatikFlowTextElementBridge.java
 Fri Mar  6 09:41:07 2015
@@ -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;
 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSBridgeContext.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSBridgeContext.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSBridgeContext.java 
(original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSBridgeContext.java 
Fri Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSSVGFlowRootElementBridge.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSSVGFlowRootElementBridge.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSSVGFlowRootElementBridge.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSSVGFlowRootElementBridge.java
 Fri Mar  6 09:41:07 2015
@@ -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;
 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSTextElementBridge.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSTextElementBridge.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSTextElementBridge.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSTextElementBridge.java
 Fri Mar  6 09:41:07 2015
@@ -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.

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopPrintServlet.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopPrintServlet.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopPrintServlet.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopPrintServlet.java 
Fri Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTextElementBridge.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTextElementBridge.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTextElementBridge.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTextElementBridge.java
 Fri Mar  6 09:41:07 2015
@@ -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.

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java 
(original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java 
Fri Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java 
(original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java 
Fri Mar  6 09:41:07 2015
@@ -32,13 +32,12 @@ import org.apache.avalon.framework.confi
 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;

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java 
(original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java 
Fri Mar  6 09:41:07 2015
@@ -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.

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/NativeTextPainter.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/NativeTextPainter.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/NativeTextPainter.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/NativeTextPainter.java 
Fri Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java
 Fri Mar  6 09:41:07 2015
@@ -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;
 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFBridgeContext.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFBridgeContext.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFBridgeContext.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFBridgeContext.java Fri 
Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFFlowExtTextPainter.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFFlowExtTextPainter.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFFlowExtTextPainter.java 
(original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFFlowExtTextPainter.java 
Fri Mar  6 09:41:07 2015
@@ -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;
 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFFlowTextPainter.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFFlowTextPainter.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFFlowTextPainter.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFFlowTextPainter.java 
Fri Mar  6 09:41:07 2015
@@ -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;
 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFSVGFlowRootElementBridge.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFSVGFlowRootElementBridge.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFSVGFlowRootElementBridge.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFSVGFlowRootElementBridge.java
 Fri Mar  6 09:41:07 2015
@@ -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;
 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFTextElementBridge.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFTextElementBridge.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFTextElementBridge.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFTextElementBridge.java 
Fri Mar  6 09:41:07 2015
@@ -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.

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUserAgent.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUserAgent.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUserAgent.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUserAgent.java Fri Mar 
 6 09:41:07 2015
@@ -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;
 

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUtilities.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUtilities.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUtilities.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUtilities.java Fri Mar 
 6 09:41:07 2015
@@ -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;
 
 /**

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SimpleSVGUserAgent.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SimpleSVGUserAgent.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SimpleSVGUserAgent.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SimpleSVGUserAgent.java 
Fri Mar  6 09:41:07 2015
@@ -28,8 +28,8 @@ import javax.xml.parsers.SAXParserFactor
 
 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.

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/AggregatingFontFamilyResolver.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/AggregatingFontFamilyResolver.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/AggregatingFontFamilyResolver.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/AggregatingFontFamilyResolver.java
 Fri Mar  6 09:41:07 2015
@@ -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 {

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/FOPFontFamilyResolver.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/FOPFontFamilyResolver.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/FOPFontFamilyResolver.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/FOPFontFamilyResolver.java
 Fri Mar  6 09:41:07 2015
@@ -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 {
 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/text/ComplexGlyphLayout.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/text/ComplexGlyphLayout.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/text/ComplexGlyphLayout.java 
(original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/text/ComplexGlyphLayout.java 
Fri Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java
 Fri Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java 
(original)
+++ 
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java 
Fri Mar  6 09:41:07 2015
@@ -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;
 

Modified: 
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/layout/ComplexScriptsLayoutTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/layout/ComplexScriptsLayoutTestCase.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/layout/ComplexScriptsLayoutTestCase.java
 (original)
+++ 
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/layout/ComplexScriptsLayoutTestCase.java
 Fri Mar  6 09:41:07 2015
@@ -65,7 +65,6 @@ import org.apache.commons.io.filefilter.
 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;

Modified: 
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java
 (original)
+++ 
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java
 Fri Mar  6 09:41:07 2015
@@ -28,7 +28,6 @@ import static org.junit.Assert.assertEqu
 import org.apache.fop.datatypes.PercentBaseContext;
 import org.apache.fop.fo.FObj;
 
-
 public class TableColumnColumnNumberTestCase extends AbstractTableTest {
 
     /**

Modified: 
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java
 (original)
+++ 
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java
 Fri Mar  6 09:41:07 2015
@@ -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
  *

Modified: 
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/properties/AltTextHolderTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/properties/AltTextHolderTestCase.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/properties/AltTextHolderTestCase.java
 (original)
+++ 
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/properties/AltTextHolderTestCase.java
 Fri Mar  6 09:41:07 2015
@@ -36,7 +36,6 @@ import org.apache.fop.fo.flow.AbstractGr
 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.
  */

Modified: 
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java 
(original)
+++ 
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java 
Fri Mar  6 09:41:07 2015
@@ -31,7 +31,6 @@ import static org.junit.Assert.fail;
 
 import org.apache.commons.io.output.CountingOutputStream;
 
-
 /**
  * Test case for {@link PDFDictionary}.
  */

Modified: 
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java
 (original)
+++ 
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java
 Fri Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFLibraryTestSuite.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFLibraryTestSuite.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFLibraryTestSuite.java 
(original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFLibraryTestSuite.java 
Fri Mar  6 09:41:07 2015
@@ -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.
  */

Modified: 
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/VersionControllerTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/VersionControllerTestCase.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/VersionControllerTestCase.java
 (original)
+++ 
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/VersionControllerTestCase.java
 Fri Mar  6 09:41:07 2015
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
-
 /**
  * A test class for {@link VersionController}.
  */

Modified: 
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java
 (original)
+++ 
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java
 Fri Mar  6 09:41:07 2015
@@ -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.*
  */

Modified: 
xmlgraphics/fop/trunk/test/java/org/apache/fop/svg/NativeTextPainterTest.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/svg/NativeTextPainterTest.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/test/java/org/apache/fop/svg/NativeTextPainterTest.java 
(original)
+++ 
xmlgraphics/fop/trunk/test/java/org/apache/fop/svg/NativeTextPainterTest.java 
Fri Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java 
(original)
+++ 
xmlgraphics/fop/trunk/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java 
Fri Mar  6 09:41:07 2015
@@ -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;
 

Modified: 
xmlgraphics/fop/trunk/test/java/org/apache/fop/svg/PSTextPainterTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/svg/PSTextPainterTestCase.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/test/java/org/apache/fop/svg/PSTextPainterTestCase.java 
(original)
+++ 
xmlgraphics/fop/trunk/test/java/org/apache/fop/svg/PSTextPainterTestCase.java 
Fri Mar  6 09:41:07 2015
@@ -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;

Modified: 
xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java?rev=1664570&r1=1664569&r2=1664570&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java
 (original)
+++ 
xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java
 Fri Mar  6 09:41:07 2015
@@ -23,7 +23,6 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
 
-
 /**
  * JUnit test case for the LineBreakStatus class
  */



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscr...@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-h...@xmlgraphics.apache.org

Reply via email to