You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by lb...@apache.org on 2015/03/05 12:45:21 UTC
svn commit: r1664314 [5/5] - in /xmlgraphics/batik/trunk: ./ lib/
resources/META-INF/services/ resources/org/apache/batik/anim/dom/
resources/org/apache/batik/apps/rasterizer/resources/
resources/org/apache/batik/apps/svgbrowser/resources/ resources/or...
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/extension/ExtensionElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/extension/ExtensionElement.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/extension/ExtensionElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/extension/ExtensionElement.java Thu Mar 5 11:45:15 2015
@@ -18,8 +18,8 @@
*/
package org.apache.batik.extension;
+import org.apache.batik.anim.dom.SVGOMElement;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGOMElement;
/**
* This class implements the basic features an element must have in order
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/extension/GraphicsExtensionElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/extension/GraphicsExtensionElement.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/extension/GraphicsExtensionElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/extension/GraphicsExtensionElement.java Thu Mar 5 11:45:15 2015
@@ -18,12 +18,12 @@
*/
package org.apache.batik.extension;
+import org.apache.batik.anim.dom.SVGLocatableSupport;
+import org.apache.batik.anim.dom.SVGOMAnimatedBoolean;
+import org.apache.batik.anim.dom.SVGOMAnimatedTransformList;
+import org.apache.batik.anim.dom.TraitInformation;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGLocatableSupport;
-import org.apache.batik.dom.svg.SVGOMAnimatedBoolean;
-import org.apache.batik.dom.svg.SVGOMAnimatedTransformList;
import org.apache.batik.dom.svg.SVGTestsSupport;
-import org.apache.batik.dom.svg.TraitInformation;
import org.apache.batik.dom.util.XMLSupport;
import org.apache.batik.util.DoublyIndexedTable;
import org.apache.batik.util.SVGTypes;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/BatikDomExtension.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/BatikDomExtension.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/BatikDomExtension.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/BatikDomExtension.java Thu Mar 5 11:45:15 2015
@@ -18,10 +18,10 @@
*/
package org.apache.batik.extension.svg;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.dom.AbstractDocument;
import org.apache.batik.dom.DomExtension;
import org.apache.batik.dom.ExtensibleDOMImplementation;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/BatikFlowTextElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/BatikFlowTextElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/BatikFlowTextElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/BatikFlowTextElementBridge.java Thu Mar 5 11:45:15 2015
@@ -31,6 +31,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import org.apache.batik.anim.dom.SVGOMElement;
import org.apache.batik.bridge.Bridge;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.BridgeException;
@@ -39,15 +40,14 @@ import org.apache.batik.bridge.CursorMan
import org.apache.batik.bridge.SVGAElementBridge;
import org.apache.batik.bridge.SVGTextElementBridge;
import org.apache.batik.bridge.SVGUtilities;
+import org.apache.batik.bridge.TextNode;
import org.apache.batik.bridge.TextUtilities;
import org.apache.batik.bridge.UnitProcessor;
import org.apache.batik.bridge.UserAgent;
import org.apache.batik.dom.events.NodeEventTarget;
import org.apache.batik.dom.util.XLinkSupport;
import org.apache.batik.dom.util.XMLSupport;
-import org.apache.batik.dom.svg.SVGOMElement;
import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
import org.apache.batik.gvt.text.TextPath;
import org.apache.batik.gvt.text.TextPaintInfo;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowExtGlyphLayout.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowExtGlyphLayout.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowExtGlyphLayout.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowExtGlyphLayout.java Thu Mar 5 11:45:15 2015
@@ -26,9 +26,9 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import org.apache.batik.bridge.GlyphLayout;
import org.apache.batik.gvt.font.GVTGlyphVector;
import org.apache.batik.gvt.font.MultiGlyphVector;
-import org.apache.batik.gvt.text.GlyphLayout;
/**
* A GlyphLayout class for SVG 1.2 flowing text.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowExtTextLayoutFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowExtTextLayoutFactory.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowExtTextLayoutFactory.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowExtTextLayoutFactory.java Thu Mar 5 11:45:15 2015
@@ -22,13 +22,13 @@ import java.awt.font.FontRenderContext;
import java.awt.geom.Point2D;
import java.text.AttributedCharacterIterator;
-import org.apache.batik.gvt.text.TextLayoutFactory;
-import org.apache.batik.gvt.text.TextSpanLayout;
+import org.apache.batik.bridge.TextLayoutFactory;
+import org.apache.batik.bridge.TextSpanLayout;
/**
* Factory instance that returns TextSpanLayouts appropriate to
* FlowRoot instances.
*
- * @see org.apache.batik.gvt.text.TextSpanLayout
+ * @see org.apache.batik.bridge.TextSpanLayout
* @author <a href="mailto:dewese@apache.org">Thomas DeWeese</a>
* @version $Id$
*/
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowExtTextNode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowExtTextNode.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowExtTextNode.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowExtTextNode.java Thu Mar 5 11:45:15 2015
@@ -19,8 +19,8 @@
package org.apache.batik.extension.svg;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextPainter;
/**
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowExtTextPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowExtTextPainter.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowExtTextPainter.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowExtTextPainter.java Thu Mar 5 11:45:15 2015
@@ -24,9 +24,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Iterator;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
-import org.apache.batik.gvt.renderer.StrokingTextPainter;
+import org.apache.batik.bridge.StrokingTextPainter;
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextPainter;
/**
* One line Class Desc
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowLineElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowLineElement.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowLineElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowLineElement.java Thu Mar 5 11:45:15 2015
@@ -18,8 +18,8 @@
*/
package org.apache.batik.extension.svg;
+import org.apache.batik.anim.dom.SVGOMTextPositioningElement;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGOMTextPositioningElement;
import org.w3c.dom.Node;
/**
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowParaElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowParaElement.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowParaElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowParaElement.java Thu Mar 5 11:45:15 2015
@@ -18,8 +18,8 @@
*/
package org.apache.batik.extension.svg;
+import org.apache.batik.anim.dom.SVGOMTextPositioningElement;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGOMTextPositioningElement;
import org.w3c.dom.Node;
/**
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowRegionBreakElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowRegionBreakElement.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowRegionBreakElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowRegionBreakElement.java Thu Mar 5 11:45:15 2015
@@ -18,8 +18,8 @@
*/
package org.apache.batik.extension.svg;
+import org.apache.batik.anim.dom.SVGOMTextPositioningElement;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGOMTextPositioningElement;
import org.w3c.dom.Node;
/**
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowSpanElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowSpanElement.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowSpanElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/extension/svg/FlowSpanElement.java Thu Mar 5 11:45:15 2015
@@ -18,8 +18,8 @@
*/
package org.apache.batik.extension.svg;
+import org.apache.batik.anim.dom.SVGOMTextPositioningElement;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGOMTextPositioningElement;
import org.w3c.dom.Node;
/**
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/flow/GlyphGroupInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/flow/GlyphGroupInfo.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/flow/GlyphGroupInfo.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/flow/GlyphGroupInfo.java Thu Mar 5 11:45:15 2015
@@ -29,7 +29,7 @@ import org.apache.batik.gvt.font.GVTGlyp
* @author <a href="mailto:deweese@apache.org">deweese</a>
* @version $Id$
*/
-class GlyphGroupInfo {
+public class GlyphGroupInfo {
int start, end;
int glyphCount, lastGlyphCount;
boolean hideLast;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/flow/WordInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/flow/WordInfo.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/flow/WordInfo.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/flow/WordInfo.java Thu Mar 5 11:45:15 2015
@@ -30,13 +30,13 @@ import org.apache.batik.gvt.font.GVTLine
* @author <a href="mailto:deweese@apache.org">deweese</a>
* @version $Id$
*/
-class WordInfo {
+public class WordInfo {
int index = -1;
float ascent=-1, descent=-1, lineHeight=-1;
GlyphGroupInfo [] glyphGroups=null;
Object flowLine=null;
- WordInfo(int index) {
+ public WordInfo(int index) {
this.index = index;
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/script/InterpreterPool.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/script/InterpreterPool.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/script/InterpreterPool.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/script/InterpreterPool.java Thu Mar 5 11:45:15 2015
@@ -24,7 +24,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.batik.dom.svg.SVGOMDocument;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.util.Service;
import org.w3c.dom.Document;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/JGVTComponent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/JGVTComponent.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/JGVTComponent.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/JGVTComponent.java Thu Mar 5 11:45:15 2015
@@ -51,6 +51,7 @@ import java.util.List;
import javax.swing.JComponent;
+import org.apache.batik.bridge.Mark;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.gvt.event.AWTEventDispatcher;
import org.apache.batik.gvt.event.EventDispatcher;
@@ -59,7 +60,6 @@ import org.apache.batik.gvt.event.Select
import org.apache.batik.gvt.renderer.ConcreteImageRendererFactory;
import org.apache.batik.gvt.renderer.ImageRenderer;
import org.apache.batik.gvt.renderer.ImageRendererFactory;
-import org.apache.batik.gvt.text.Mark;
import org.apache.batik.util.HaltingThread;
import org.apache.batik.util.Platform;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/TextSelectionManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/TextSelectionManager.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/TextSelectionManager.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/TextSelectionManager.java Thu Mar 5 11:45:15 2015
@@ -28,14 +28,14 @@ import java.awt.Shape;
import java.awt.BasicStroke;
import java.awt.geom.AffineTransform;
+import org.apache.batik.bridge.ConcreteTextSelector;
+import org.apache.batik.bridge.Mark;
import org.apache.batik.gvt.Selectable;
import org.apache.batik.gvt.event.EventDispatcher;
import org.apache.batik.gvt.event.GraphicsNodeMouseEvent;
import org.apache.batik.gvt.event.GraphicsNodeMouseListener;
import org.apache.batik.gvt.event.SelectionEvent;
import org.apache.batik.gvt.event.SelectionListener;
-import org.apache.batik.gvt.text.ConcreteTextSelector;
-import org.apache.batik.gvt.text.Mark;
/**
* This class represents an object which manage GVT text nodes selection.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/JSVGComponent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/JSVGComponent.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/JSVGComponent.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/JSVGComponent.java Thu Mar 5 11:45:15 2015
@@ -44,13 +44,18 @@ import java.util.Set;
import javax.swing.JOptionPane;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.BridgeException;
import org.apache.batik.bridge.BridgeExtension;
+import org.apache.batik.bridge.DefaultFontFamilyResolver;
import org.apache.batik.bridge.DefaultScriptSecurity;
import org.apache.batik.bridge.DocumentLoader;
import org.apache.batik.bridge.ErrorConstants;
import org.apache.batik.bridge.ExternalResourceSecurity;
+import org.apache.batik.bridge.FontFamilyResolver;
+import org.apache.batik.bridge.Mark;
import org.apache.batik.bridge.RelaxedExternalResourceSecurity;
import org.apache.batik.bridge.ScriptSecurity;
import org.apache.batik.bridge.UpdateManager;
@@ -59,8 +64,6 @@ import org.apache.batik.bridge.UpdateMan
import org.apache.batik.bridge.UserAgent;
import org.apache.batik.bridge.ViewBox;
import org.apache.batik.bridge.svg12.SVG12BridgeContext;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.dom.svg.SVGOMDocument;
import org.apache.batik.dom.util.DOMUtilities;
import org.apache.batik.dom.util.XLinkSupport;
import org.apache.batik.ext.awt.image.spi.ImageTagRegistry;
@@ -68,10 +71,7 @@ import org.apache.batik.gvt.CanvasGraphi
import org.apache.batik.gvt.CompositeGraphicsNode;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.gvt.event.EventDispatcher;
-import org.apache.batik.gvt.font.DefaultFontFamilyResolver;
-import org.apache.batik.gvt.font.FontFamilyResolver;
import org.apache.batik.gvt.renderer.ImageRenderer;
-import org.apache.batik.gvt.text.Mark;
import org.apache.batik.script.Interpreter;
import org.apache.batik.swing.gvt.GVTTreeRendererEvent;
import org.apache.batik.swing.gvt.JGVTComponent;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/SVGAbstractTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/SVGAbstractTranscoder.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/SVGAbstractTranscoder.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/SVGAbstractTranscoder.java Thu Mar 5 11:45:15 2015
@@ -26,6 +26,9 @@ import java.util.LinkedList;
import java.util.List;
import java.util.StringTokenizer;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.bridge.BaseScriptingEnvironment;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.BridgeException;
@@ -39,9 +42,6 @@ import org.apache.batik.bridge.UserAgent
import org.apache.batik.bridge.UserAgentAdapter;
import org.apache.batik.bridge.ViewBox;
import org.apache.batik.bridge.svg12.SVG12BridgeContext;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.dom.svg.SVGOMDocument;
import org.apache.batik.dom.util.DOMUtilities;
import org.apache.batik.dom.util.DocumentFactory;
import org.apache.batik.gvt.CanvasGraphicsNode;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/ToSVGAbstractTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/ToSVGAbstractTranscoder.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/ToSVGAbstractTranscoder.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/ToSVGAbstractTranscoder.java Thu Mar 5 11:45:15 2015
@@ -26,7 +26,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.svggen.SVGGraphics2D;
import org.apache.batik.transcoder.keys.BooleanKey;
import org.apache.batik.transcoder.keys.FloatKey;
Modified: xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/IWasLoaded.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/IWasLoaded.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/IWasLoaded.java (original)
+++ xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/IWasLoaded.java Thu Mar 5 11:45:15 2015
@@ -18,8 +18,6 @@
*/package org.apache.batik.bridge;
import org.w3c.dom.*;
-import org.apache.batik.script.ScriptHandler;
-import org.apache.batik.script.Window;
/**
* If this script is loaded by jarCheckNoLoad.svg, it will mark
Modified: xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/IWasLoadedToo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/IWasLoadedToo.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/IWasLoadedToo.java (original)
+++ xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/IWasLoadedToo.java Thu Mar 5 11:45:15 2015
@@ -18,8 +18,6 @@
*/package org.apache.batik.bridge;
import org.w3c.dom.*;
-import org.apache.batik.script.ScriptHandler;
-import org.apache.batik.script.Window;
/**
* If this script is loaded by jarCheckLoad.svg, it will mark
Modified: xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.java (original)
+++ xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.java Thu Mar 5 11:45:15 2015
@@ -38,9 +38,7 @@ import org.w3c.dom.events.Event;
import org.w3c.dom.events.EventListener;
import org.w3c.dom.events.EventTarget;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.script.ScriptHandler;
-import org.apache.batik.script.Window;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.util.ParsedURL;
/**
Modified: xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsGranted.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsGranted.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsGranted.java (original)
+++ xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsGranted.java Thu Mar 5 11:45:15 2015
@@ -38,9 +38,7 @@ import org.w3c.dom.events.Event;
import org.w3c.dom.events.EventListener;
import org.w3c.dom.events.EventTarget;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.script.ScriptHandler;
-import org.apache.batik.script.Window;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.util.ParsedURL;
/**
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/bridge/ExternalResourcesTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/bridge/ExternalResourcesTest.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/bridge/ExternalResourcesTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/bridge/ExternalResourcesTest.java Thu Mar 5 11:45:15 2015
@@ -30,7 +30,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.DefaultTestReport;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DOM3Test.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DOM3Test.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DOM3Test.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DOM3Test.java Thu Mar 5 11:45:15 2015
@@ -19,8 +19,8 @@
package org.apache.batik.dom;
import org.apache.batik.test.AbstractTest;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.w3c.dom.Document;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DOMUtilitiesCharacterEscaping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DOMUtilitiesCharacterEscaping.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DOMUtilitiesCharacterEscaping.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DOMUtilitiesCharacterEscaping.java Thu Mar 5 11:45:15 2015
@@ -22,9 +22,9 @@ import org.apache.batik.test.AbstractTes
import org.apache.batik.test.TestReport;
import org.apache.batik.util.SVGConstants;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
import org.apache.batik.dom.util.DOMUtilities;
import org.apache.batik.util.XMLResourceDescriptor;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/svg/CloneNodeTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/svg/CloneNodeTest.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/svg/CloneNodeTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/svg/CloneNodeTest.java Thu Mar 5 11:45:15 2015
@@ -26,6 +26,7 @@ import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.DefaultTestReport;
import org.apache.batik.test.TestReport;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/svg/ImportNodeTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/svg/ImportNodeTest.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/svg/ImportNodeTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/svg/ImportNodeTest.java Thu Mar 5 11:45:15 2015
@@ -27,6 +27,8 @@ import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.DefaultTestReport;
import org.apache.batik.test.TestReport;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/Bug21259.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/Bug21259.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/Bug21259.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/Bug21259.java Thu Mar 5 11:45:15 2015
@@ -29,7 +29,7 @@ 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.test.AbstractTest;
import org.apache.batik.test.TestReport;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/DoubleStringPerformanceTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/DoubleStringPerformanceTest.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/DoubleStringPerformanceTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/DoubleStringPerformanceTest.java Thu Mar 5 11:45:15 2015
@@ -21,7 +21,7 @@ package org.apache.batik.svggen;
import org.w3c.dom.Document;
import org.w3c.dom.DOMImplementation;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.test.PerformanceTest;
/**
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/GeneratorContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/GeneratorContext.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/GeneratorContext.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/GeneratorContext.java Thu Mar 5 11:45:15 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.svggen.SVGGeneratorContext.GraphicContextDefaults;
import org.apache.batik.util.SVGConstants;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/JPainterCompare.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/JPainterCompare.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/JPainterCompare.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/JPainterCompare.java Thu Mar 5 11:45:15 2015
@@ -31,7 +31,7 @@ import javax.swing.JPanel;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.swing.JSVGCanvas;
import org.apache.batik.swing.svg.SVGDocumentLoaderAdapter;
import org.apache.batik.swing.svg.SVGDocumentLoaderEvent;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/ShowGraphics2DOutput.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/ShowGraphics2DOutput.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/ShowGraphics2DOutput.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/ShowGraphics2DOutput.java Thu Mar 5 11:45:15 2015
@@ -27,11 +27,11 @@ import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Element;
import org.w3c.dom.svg.SVGDocument;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.bridge.BaseScriptingEnvironment;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.GVTBuilder;
import org.apache.batik.bridge.UserAgentAdapter;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.TestReport;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGMemoryLeakTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGMemoryLeakTest.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGMemoryLeakTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGMemoryLeakTest.java Thu Mar 5 11:45:15 2015
@@ -27,11 +27,11 @@ import javax.swing.SwingUtilities;
import org.w3c.dom.Element;
+import org.apache.batik.anim.dom.SVGOMDocument;
+import org.apache.batik.anim.dom.SVGOMElement;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.UpdateManager;
import org.apache.batik.dom.svg.SVGContext;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.dom.svg.SVGOMElement;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.test.DefaultTestReport;
import org.apache.batik.test.MemoryLeakTest;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/svg/AbstractRenderingAccuracyTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/svg/AbstractRenderingAccuracyTest.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/svg/AbstractRenderingAccuracyTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/svg/AbstractRenderingAccuracyTest.java Thu Mar 5 11:45:15 2015
@@ -349,7 +349,11 @@ public abstract class AbstractRenderingA
if (this.variationURLs == null) {
this.variationURLs = new LinkedList();
}
- this.variationURLs.add(resolveURL(variationURL));
+ try {
+ this.variationURLs.add(resolveURL(variationURL));
+ } catch (IllegalArgumentException iae) {
+ // no worries
+ }
}
/**
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/svg/SVGOnLoadExceptionTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/svg/SVGOnLoadExceptionTest.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/svg/SVGOnLoadExceptionTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/svg/SVGOnLoadExceptionTest.java Thu Mar 5 11:45:15 2015
@@ -35,6 +35,7 @@ import java.security.ProtectionDomain;
import java.security.cert.Certificate;
import java.util.Enumeration;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
import org.apache.batik.bridge.BaseScriptingEnvironment;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.BridgeException;
@@ -50,7 +51,6 @@ import org.apache.batik.bridge.RelaxedEx
import org.apache.batik.bridge.RelaxedScriptSecurity;
import org.apache.batik.bridge.ScriptSecurity;
import org.apache.batik.bridge.UserAgentAdapter;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.TestReport;
import org.apache.batik.util.ApplicationSecurityEnforcer;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/svg/SelfContainedSVGOnLoadTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/svg/SelfContainedSVGOnLoadTest.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/svg/SelfContainedSVGOnLoadTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/svg/SelfContainedSVGOnLoadTest.java Thu Mar 5 11:45:15 2015
@@ -27,13 +27,13 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
import org.apache.batik.bridge.BaseScriptingEnvironment;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.BridgeException;
import org.apache.batik.bridge.GVTBuilder;
import org.apache.batik.bridge.UserAgent;
import org.apache.batik.bridge.UserAgentAdapter;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.DefaultTestReport;
import org.apache.batik.test.TestReport;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/TranscoderInputTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/TranscoderInputTest.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/TranscoderInputTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/TranscoderInputTest.java Thu Mar 5 11:45:15 2015
@@ -28,9 +28,9 @@ import java.net.URL;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.dom.GenericDOMImplementation;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.apache.batik.dom.util.SAXDocumentFactory;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.TestReport;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/BackgroundColorTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/BackgroundColorTest.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/BackgroundColorTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/BackgroundColorTest.java Thu Mar 5 11:45:15 2015
@@ -30,7 +30,7 @@ import java.util.HashMap;
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/DOMTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/DOMTest.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/DOMTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/DOMTest.java Thu Mar 5 11:45:15 2015
@@ -26,7 +26,7 @@ import java.io.ByteArrayOutputStream;
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/ParametrizedDOMTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/ParametrizedDOMTest.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/ParametrizedDOMTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/ParametrizedDOMTest.java Thu Mar 5 11:45:15 2015
@@ -22,7 +22,7 @@ import java.io.IOException;
import org.w3c.dom.Document;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.util.XMLResourceDescriptor;