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

13 files changed, 5 insertions, 13 deletions

diff --git a/test/java/org/apache/fop/complexscripts/layout/ComplexScriptsLayoutTestCase.java b/test/java/org/apache/fop/complexscripts/layout/ComplexScriptsLayoutTestCase.java
index 01dbaea57..416cbf8d0 100644
--- 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 2df0cac2a..be049eac9 100644
--- 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 d7bc2e11c..9a4515b31 100644
--- 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 89ed2733d..eae290be3 100644
--- 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 267e05c2c..cc2352300 100644
--- 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 5d423442c..fd6d8b94b 100644
--- 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 c7a9dff89..7f408ae2c 100644
--- 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 561e80b56..383208405 100644
--- 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 e74251be1..ab58e9892 100644
--- 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 1c2c3b582..5344e6a54 100644
--- 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 e7e47e7ba..3e64cb58f 100644
--- 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 2d5de7455..2b716e348 100644
--- 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 d8813c3bc..e4854d9a7 100644
--- 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
  */