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 [3/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/samples/tests/resources/java/sources/com/untrusted/script/UntrustedScriptHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/samples/tests/resources/java/sources/com/untrusted/script/UntrustedScriptHandler.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/samples/tests/resources/java/sources/com/untrusted/script/UntrustedScriptHandler.java (original)
+++ xmlgraphics/batik/trunk/samples/tests/resources/java/sources/com/untrusted/script/UntrustedScriptHandler.java Thu Mar 5 11:45:15 2015
@@ -18,14 +18,6 @@
*/
package com.untrusted.script;
-import org.apache.batik.script.ScriptHandler;
-import org.apache.batik.script.Window;
-
-import org.apache.batik.dom.svg.SVGOMDocument;
-
-import org.w3c.dom.*;
-import org.w3c.dom.events.*;
-
import java.awt.AWTPermission;
import java.io.FilePermission;
import java.io.SerializablePermission;
@@ -35,11 +27,21 @@ import java.net.SocketPermission;
import java.net.URL;
import java.security.AllPermission;
import java.security.Permission;
-import java.security.SecurityPermission;
import java.sql.SQLPermission;
import java.util.PropertyPermission;
+
import javax.sound.sampled.AudioPermission;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Window;
+import org.w3c.dom.events.Event;
+import org.w3c.dom.events.EventListener;
+import org.w3c.dom.events.EventTarget;
+
+import org.apache.batik.anim.dom.SVGOMDocument;
+import org.apache.batik.bridge.ScriptHandler;
+
/**
* This class implements the ScriptHandler interface and represents an
* example of untrusted code.
@@ -292,5 +294,11 @@ public class UntrustedScriptHandler impl
}
+ @Override
+ public void run(Document doc, org.apache.batik.bridge.Window win) {
+ // TODO Auto-generated method stub
+
+ }
+
}
Modified: xmlgraphics/batik/trunk/sources/batik-anim.pom.template
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/batik-anim.pom.template?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/batik-anim.pom.template (original)
+++ xmlgraphics/batik/trunk/sources/batik-anim.pom.template Thu Mar 5 11:45:15 2015
@@ -79,6 +79,11 @@
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-css</artifactId>
+ <version>@version@</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-dom</artifactId>
<version>@version@</version>
</dependency>
@@ -104,12 +109,12 @@
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
+ <artifactId>xml-apis-ext</artifactId>
<version>1.3.04</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis-ext</artifactId>
+ <artifactId>xml-apis</artifactId>
<version>1.3.04</version>
</dependency>
</dependencies>
Modified: xmlgraphics/batik/trunk/sources/batik-bridge.pom.template
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/batik-bridge.pom.template?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/batik-bridge.pom.template (original)
+++ xmlgraphics/batik/trunk/sources/batik-bridge.pom.template Thu Mar 5 11:45:15 2015
@@ -134,12 +134,12 @@
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
+ <artifactId>xml-apis-ext</artifactId>
<version>1.3.04</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis-ext</artifactId>
+ <artifactId>xml-apis</artifactId>
<version>1.3.04</version>
</dependency>
</dependencies>
Modified: xmlgraphics/batik/trunk/sources/batik-css.pom.template
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/batik-css.pom.template?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/batik-css.pom.template (original)
+++ xmlgraphics/batik/trunk/sources/batik-css.pom.template Thu Mar 5 11:45:15 2015
@@ -84,12 +84,12 @@
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
+ <artifactId>xml-apis-ext</artifactId>
<version>1.3.04</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis-ext</artifactId>
+ <artifactId>xml-apis</artifactId>
<version>1.3.04</version>
</dependency>
</dependencies>
Modified: xmlgraphics/batik/trunk/sources/batik-dom.pom.template
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/batik-dom.pom.template?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/batik-dom.pom.template (original)
+++ xmlgraphics/batik/trunk/sources/batik-dom.pom.template Thu Mar 5 11:45:15 2015
@@ -99,12 +99,12 @@
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
+ <artifactId>xml-apis-ext</artifactId>
<version>1.3.04</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis-ext</artifactId>
+ <artifactId>xml-apis</artifactId>
<version>1.3.04</version>
</dependency>
</dependencies>
Modified: xmlgraphics/batik/trunk/sources/batik-ext.pom.template
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/batik-ext.pom.template?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/batik-ext.pom.template (original)
+++ xmlgraphics/batik/trunk/sources/batik-ext.pom.template Thu Mar 5 11:45:15 2015
@@ -72,10 +72,5 @@
</organization>
<dependencies>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.3.04</version>
- </dependency>
</dependencies>
</project>
Modified: xmlgraphics/batik/trunk/sources/batik-extension.pom.template
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/batik-extension.pom.template?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/batik-extension.pom.template (original)
+++ xmlgraphics/batik/trunk/sources/batik-extension.pom.template Thu Mar 5 11:45:15 2015
@@ -74,6 +74,11 @@
<dependencies>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-anim</artifactId>
+ <version>@version@</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-awt-util</artifactId>
<version>@version@</version>
</dependency>
@@ -119,12 +124,12 @@
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
+ <artifactId>xml-apis-ext</artifactId>
<version>1.3.04</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis-ext</artifactId>
+ <artifactId>xml-apis</artifactId>
<version>1.3.04</version>
</dependency>
</dependencies>
Modified: xmlgraphics/batik/trunk/sources/batik-gui-util.pom.template
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/batik-gui-util.pom.template?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/batik-gui-util.pom.template (original)
+++ xmlgraphics/batik/trunk/sources/batik-gui-util.pom.template Thu Mar 5 11:45:15 2015
@@ -77,5 +77,10 @@
<artifactId>batik-util</artifactId>
<version>@version@</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-xml</artifactId>
+ <version>@version@</version>
+ </dependency>
</dependencies>
</project>
Modified: xmlgraphics/batik/trunk/sources/batik-gvt.pom.template
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/batik-gvt.pom.template?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/batik-gvt.pom.template (original)
+++ xmlgraphics/batik/trunk/sources/batik-gvt.pom.template Thu Mar 5 11:45:15 2015
@@ -79,18 +79,8 @@
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-bridge</artifactId>
- <version>@version@</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-util</artifactId>
<version>@version@</version>
</dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.3.04</version>
- </dependency>
</dependencies>
</project>
Modified: xmlgraphics/batik/trunk/sources/batik-parser.pom.template
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/batik-parser.pom.template?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/batik-parser.pom.template (original)
+++ xmlgraphics/batik/trunk/sources/batik-parser.pom.template Thu Mar 5 11:45:15 2015
@@ -87,5 +87,15 @@
<artifactId>batik-xml</artifactId>
<version>@version@</version>
</dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis-ext</artifactId>
+ <version>1.3.04</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.04</version>
+ </dependency>
</dependencies>
</project>
Modified: xmlgraphics/batik/trunk/sources/batik-script.pom.template
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/batik-script.pom.template?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/batik-script.pom.template (original)
+++ xmlgraphics/batik/trunk/sources/batik-script.pom.template Thu Mar 5 11:45:15 2015
@@ -74,22 +74,7 @@
<dependencies>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-bridge</artifactId>
- <version>@version@</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-dom</artifactId>
- <version>@version@</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-ext</artifactId>
- <version>@version@</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-svg-dom</artifactId>
+ <artifactId>batik-anim</artifactId>
<version>@version@</version>
</dependency>
<dependency>
@@ -98,11 +83,6 @@
<version>@version@</version>
</dependency>
<dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-js</artifactId>
- <version>@version@</version>
- </dependency>
- <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.04</version>
Modified: xmlgraphics/batik/trunk/sources/batik-slideshow.pom.template
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/batik-slideshow.pom.template?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/batik-slideshow.pom.template (original)
+++ xmlgraphics/batik/trunk/sources/batik-slideshow.pom.template Thu Mar 5 11:45:15 2015
@@ -84,12 +84,12 @@
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
+ <artifactId>xml-apis-ext</artifactId>
<version>1.3.04</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis-ext</artifactId>
+ <artifactId>xml-apis</artifactId>
<version>1.3.04</version>
</dependency>
</dependencies>
Modified: xmlgraphics/batik/trunk/sources/batik-squiggle.pom.template
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/batik-squiggle.pom.template?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/batik-squiggle.pom.template (original)
+++ xmlgraphics/batik/trunk/sources/batik-squiggle.pom.template Thu Mar 5 11:45:15 2015
@@ -74,6 +74,11 @@
<dependencies>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-anim</artifactId>
+ <version>@version@</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-awt-util</artifactId>
<version>@version@</version>
</dependency>
@@ -109,11 +114,6 @@
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-svg-dom</artifactId>
- <version>@version@</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-swing</artifactId>
<version>@version@</version>
</dependency>
@@ -134,12 +134,12 @@
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
+ <artifactId>xml-apis-ext</artifactId>
<version>1.3.04</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis-ext</artifactId>
+ <artifactId>xml-apis</artifactId>
<version>1.3.04</version>
</dependency>
</dependencies>
Modified: xmlgraphics/batik/trunk/sources/batik-svg-dom.pom.template
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/batik-svg-dom.pom.template?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/batik-svg-dom.pom.template (original)
+++ xmlgraphics/batik/trunk/sources/batik-svg-dom.pom.template Thu Mar 5 11:45:15 2015
@@ -74,11 +74,6 @@
<dependencies>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-anim</artifactId>
- <version>@version@</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-awt-util</artifactId>
<version>@version@</version>
</dependency>
@@ -109,12 +104,12 @@
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
+ <artifactId>xml-apis-ext</artifactId>
<version>1.3.04</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis-ext</artifactId>
+ <artifactId>xml-apis</artifactId>
<version>1.3.04</version>
</dependency>
</dependencies>
Modified: xmlgraphics/batik/trunk/sources/batik-swing.pom.template
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/batik-swing.pom.template?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/batik-swing.pom.template (original)
+++ xmlgraphics/batik/trunk/sources/batik-swing.pom.template Thu Mar 5 11:45:15 2015
@@ -74,6 +74,11 @@
<dependencies>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-anim</artifactId>
+ <version>@version@</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-awt-util</artifactId>
<version>@version@</version>
</dependency>
@@ -109,7 +114,7 @@
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-svg-dom</artifactId>
+ <artifactId>batik-script</artifactId>
<version>@version@</version>
</dependency>
<dependency>
@@ -119,12 +124,12 @@
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
+ <artifactId>xml-apis-ext</artifactId>
<version>1.3.04</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis-ext</artifactId>
+ <artifactId>xml-apis</artifactId>
<version>1.3.04</version>
</dependency>
</dependencies>
Modified: xmlgraphics/batik/trunk/sources/batik-transcoder.pom.template
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/batik-transcoder.pom.template?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/batik-transcoder.pom.template (original)
+++ xmlgraphics/batik/trunk/sources/batik-transcoder.pom.template Thu Mar 5 11:45:15 2015
@@ -74,38 +74,8 @@
<dependencies>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
- <artifactId>fop</artifactId>
- <version>0.94</version>
- <exclusions>
- <exclusion>
- <groupId>batik</groupId>
- <artifactId>batik-svg-dom</artifactId>
- </exclusion>
- <exclusion>
- <groupId>batik</groupId>
- <artifactId>batik-bridge</artifactId>
- </exclusion>
- <exclusion>
- <groupId>batik</groupId>
- <artifactId>batik-awt-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>batik</groupId>
- <artifactId>batik-gvt</artifactId>
- </exclusion>
- <exclusion>
- <groupId>batik</groupId>
- <artifactId>batik-transcoder</artifactId>
- </exclusion>
- <exclusion>
- <groupId>batik</groupId>
- <artifactId>batik-extension</artifactId>
- </exclusion>
- <exclusion>
- <groupId>batik</groupId>
- <artifactId>batik-ext</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>batik-anim</artifactId>
+ <version>@version@</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
@@ -129,11 +99,6 @@
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-svg-dom</artifactId>
- <version>@version@</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-svggen</artifactId>
<version>@version@</version>
</dependency>
@@ -149,12 +114,12 @@
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
+ <artifactId>xml-apis-ext</artifactId>
<version>1.3.04</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
- <artifactId>xml-apis-ext</artifactId>
+ <artifactId>xml-apis</artifactId>
<version>1.3.04</version>
</dependency>
</dependencies>
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/AbstractAnimation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/AbstractAnimation.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/AbstractAnimation.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/AbstractAnimation.java Thu Mar 5 11:45:15 2015
@@ -18,9 +18,9 @@
*/
package org.apache.batik.anim;
+import org.apache.batik.anim.dom.AnimatableElement;
import org.apache.batik.anim.timing.TimedElement;
import org.apache.batik.anim.values.AnimatableValue;
-import org.apache.batik.dom.anim.AnimatableElement;
// import org.apache.batik.anim.timing.Trace;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/AnimationEngine.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/AnimationEngine.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/AnimationEngine.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/AnimationEngine.java Thu Mar 5 11:45:15 2015
@@ -23,12 +23,12 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import org.apache.batik.anim.dom.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTargetListener;
import org.apache.batik.anim.timing.TimedDocumentRoot;
import org.apache.batik.anim.timing.TimedElement;
import org.apache.batik.anim.timing.TimegraphListener;
import org.apache.batik.anim.values.AnimatableValue;
-import org.apache.batik.dom.anim.AnimationTarget;
-import org.apache.batik.dom.anim.AnimationTargetListener;
import org.apache.batik.util.DoublyIndexedTable;
import org.w3c.dom.Document;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/ColorAnimation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/ColorAnimation.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/ColorAnimation.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/ColorAnimation.java Thu Mar 5 11:45:15 2015
@@ -18,9 +18,9 @@
*/
package org.apache.batik.anim;
+import org.apache.batik.anim.dom.AnimatableElement;
import org.apache.batik.anim.timing.TimedElement;
import org.apache.batik.anim.values.AnimatableValue;
-import org.apache.batik.dom.anim.AnimatableElement;
/**
* An animation class for 'animateColor' animations.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/InterpolatingAnimation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/InterpolatingAnimation.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/InterpolatingAnimation.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/InterpolatingAnimation.java Thu Mar 5 11:45:15 2015
@@ -18,8 +18,8 @@
*/
package org.apache.batik.anim;
+import org.apache.batik.anim.dom.AnimatableElement;
import org.apache.batik.anim.timing.TimedElement;
-import org.apache.batik.dom.anim.AnimatableElement;
import org.apache.batik.ext.awt.geom.Cubic;
import org.apache.batik.util.SMILConstants;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/MotionAnimation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/MotionAnimation.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/MotionAnimation.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/MotionAnimation.java Thu Mar 5 11:45:15 2015
@@ -20,11 +20,11 @@ package org.apache.batik.anim;
import java.awt.geom.Point2D;
+import org.apache.batik.anim.dom.AnimatableElement;
import org.apache.batik.anim.timing.TimedElement;
import org.apache.batik.anim.values.AnimatableAngleValue;
import org.apache.batik.anim.values.AnimatableMotionPointValue;
import org.apache.batik.anim.values.AnimatableValue;
-import org.apache.batik.dom.anim.AnimatableElement;
import org.apache.batik.ext.awt.geom.Cubic;
import org.apache.batik.ext.awt.geom.ExtendedGeneralPath;
import org.apache.batik.ext.awt.geom.ExtendedPathIterator;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/SetAnimation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/SetAnimation.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/SetAnimation.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/SetAnimation.java Thu Mar 5 11:45:15 2015
@@ -19,8 +19,8 @@
package org.apache.batik.anim;
import org.apache.batik.anim.values.AnimatableValue;
+import org.apache.batik.anim.dom.AnimatableElement;
import org.apache.batik.anim.timing.TimedElement;
-import org.apache.batik.dom.anim.AnimatableElement;
/**
* An animation class for 'set' animations.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/SimpleAnimation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/SimpleAnimation.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/SimpleAnimation.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/SimpleAnimation.java Thu Mar 5 11:45:15 2015
@@ -20,9 +20,9 @@ package org.apache.batik.anim;
import java.awt.geom.Point2D;
+import org.apache.batik.anim.dom.AnimatableElement;
import org.apache.batik.anim.timing.TimedElement;
import org.apache.batik.anim.values.AnimatableValue;
-import org.apache.batik.dom.anim.AnimatableElement;
import org.apache.batik.ext.awt.geom.Cubic;
import org.apache.batik.util.SMILConstants;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/TransformAnimation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/TransformAnimation.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/TransformAnimation.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/TransformAnimation.java Thu Mar 5 11:45:15 2015
@@ -18,10 +18,10 @@
*/
package org.apache.batik.anim;
+import org.apache.batik.anim.dom.AnimatableElement;
import org.apache.batik.anim.timing.TimedElement;
import org.apache.batik.anim.values.AnimatableValue;
import org.apache.batik.anim.values.AnimatableTransformListValue;
-import org.apache.batik.dom.anim.AnimatableElement;
import org.w3c.dom.svg.SVGTransform;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableAngleOrIdentValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableAngleOrIdentValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableAngleOrIdentValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableAngleOrIdentValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
import org.w3c.dom.svg.SVGAngle;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableAngleValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableAngleValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableAngleValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableAngleValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
import org.w3c.dom.svg.SVGAngle;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableBooleanValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableBooleanValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableBooleanValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableBooleanValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
/**
* A boolean value in the animation system.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableColorValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableColorValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableColorValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableColorValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
/**
* An SVG color value in the animation system.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableIntegerValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableIntegerValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableIntegerValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableIntegerValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
/**
* An integer in the animation engine.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableLengthListValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableLengthListValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableLengthListValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableLengthListValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
import org.w3c.dom.svg.SVGLength;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableLengthOrIdentValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableLengthOrIdentValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableLengthOrIdentValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableLengthOrIdentValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
import org.w3c.dom.svg.SVGLength;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableLengthValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableLengthValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableLengthValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableLengthValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
import org.w3c.dom.svg.SVGLength;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableMotionPointValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableMotionPointValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableMotionPointValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableMotionPointValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
/**
* A point value in the animation system from a motion animation.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberListValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberListValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberListValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberListValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
/**
* A number list in the animation system.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberOptionalNumberValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberOptionalNumberValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberOptionalNumberValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberOptionalNumberValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
/**
* A number-optional-number value in the animation system.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberOrIdentValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberOrIdentValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberOrIdentValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberOrIdentValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
/**
* A number-or-identifier value in the animation system.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberOrPercentageValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberOrPercentageValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberOrPercentageValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberOrPercentageValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
/**
* A number-or-percentage value in the animation system.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableNumberValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
/**
* A number value in the animation system.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePaintValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePaintValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePaintValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePaintValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
/**
* An SVG paint value in the animation system.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePathDataValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePathDataValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePathDataValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePathDataValue.java Thu Mar 5 11:45:15 2015
@@ -20,7 +20,7 @@ package org.apache.batik.anim.values;
import java.util.Arrays;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
/**
* An SVG path value in the animation system.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePercentageValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePercentageValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePercentageValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePercentageValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
/**
* A percentage value in the animation system.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePointListValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePointListValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePointListValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePointListValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
/**
* An SVG point list value in the animation system.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePreserveAspectRatioValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePreserveAspectRatioValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePreserveAspectRatioValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatablePreserveAspectRatioValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
import org.apache.batik.util.SVGConstants;
import org.w3c.dom.svg.SVGPreserveAspectRatio;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableRectValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableRectValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableRectValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableRectValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
/**
* An SVG rect value in the animation system.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableStringValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableStringValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableStringValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableStringValue.java Thu Mar 5 11:45:15 2015
@@ -18,7 +18,7 @@
*/
package org.apache.batik.anim.values;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
/**
* A string value in the animation system.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableTransformListValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableTransformListValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableTransformListValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableTransformListValue.java Thu Mar 5 11:45:15 2015
@@ -22,7 +22,7 @@ import java.util.Iterator;
import java.util.Vector;
import java.util.List;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
import org.apache.batik.dom.svg.AbstractSVGTransform;
import org.apache.batik.dom.svg.SVGOMTransform;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableValue.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableValue.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/values/AnimatableValue.java Thu Mar 5 11:45:15 2015
@@ -22,7 +22,7 @@ import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.util.Locale;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
/**
* An abstract class for values in the animation engine.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/DOMViewer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/DOMViewer.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/DOMViewer.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/DOMViewer.java Thu Mar 5 11:45:15 2015
@@ -73,6 +73,8 @@ import javax.swing.tree.MutableTreeNode;
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
+import org.apache.batik.anim.dom.SVGOMDocument;
+import org.apache.batik.anim.dom.XBLOMContentElement;
import org.apache.batik.apps.svgbrowser.DOMDocumentTree.DOMDocumentTreeAdapter;
import org.apache.batik.apps.svgbrowser.DOMDocumentTree.DOMDocumentTreeEvent;
import org.apache.batik.apps.svgbrowser.DOMDocumentTree.DropCompletedInfo;
@@ -86,8 +88,6 @@ import org.apache.batik.apps.svgbrowser.
import org.apache.batik.bridge.svg12.ContentManager;
import org.apache.batik.bridge.svg12.DefaultXBLManager;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.dom.svg12.XBLOMContentElement;
import org.apache.batik.dom.util.DOMUtilities;
import org.apache.batik.dom.util.SAXDocumentFactory;
import org.apache.batik.dom.xbl.NodeXBL;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/FindDialog.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/FindDialog.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/FindDialog.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/FindDialog.java Thu Mar 5 11:45:15 2015
@@ -47,10 +47,10 @@ import javax.swing.JPanel;
import javax.swing.JRadioButton;
import javax.swing.JTextField;
+import org.apache.batik.bridge.Mark;
+import org.apache.batik.bridge.TextNode;
import org.apache.batik.gvt.GVTTreeWalker;
import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.text.Mark;
import org.apache.batik.swing.JSVGCanvas;
import org.apache.batik.util.resources.ResourceManager;
import org.apache.batik.util.gui.ExtendedGridBagConstraints;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java Thu Mar 5 11:45:15 2015
@@ -86,6 +86,7 @@ import javax.swing.KeyStroke;
import javax.swing.filechooser.FileFilter;
import javax.swing.text.Document;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.bridge.DefaultExternalResourceSecurity;
import org.apache.batik.bridge.DefaultScriptSecurity;
import org.apache.batik.bridge.EmbededExternalResourceSecurity;
@@ -100,7 +101,6 @@ import org.apache.batik.bridge.UpdateMan
import org.apache.batik.bridge.UpdateManagerEvent;
import org.apache.batik.bridge.UpdateManagerListener;
import org.apache.batik.dom.StyleSheetProcessingInstruction;
-import org.apache.batik.dom.svg.SVGOMDocument;
import org.apache.batik.dom.util.HashTable;
import org.apache.batik.dom.util.DOMUtilities;
import org.apache.batik.ext.swing.JAffineTransformChooser;
@@ -941,7 +941,7 @@ public class JSVGViewerFrame
/**
* The {@code getContextFactory} method on the {@link
- * org.apache.batik.script.rhino.RhinoInterpreter} class.
+ * org.apache.batik.bridge.RhinoInterpreter} class.
*/
protected static Method getContextFactoryMethod;
@@ -1153,7 +1153,7 @@ public class JSVGViewerFrame
/**
* Calls {@code getContextFactory} on the given instance of
- * {@link org.apache.batik.script.rhino.RhinoInterpreter}.
+ * {@link org.apache.batik.bridge.RhinoInterpreter}.
*/
protected Object getContextFactory(Object rhinoInterpreter) {
try {
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/XMLInputHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/XMLInputHandler.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/XMLInputHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/XMLInputHandler.java Thu Mar 5 11:45:15 2015
@@ -32,8 +32,8 @@ import javax.xml.transform.dom.DOMSource
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
-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.util.DOMUtilities;
import org.apache.batik.dom.util.HashTable;
import org.apache.batik.util.ParsedURL;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AbstractGraphicsNodeBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AbstractGraphicsNodeBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AbstractGraphicsNodeBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AbstractGraphicsNodeBridge.java Thu Mar 5 11:45:15 2015
@@ -23,16 +23,16 @@ import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
import java.lang.ref.SoftReference;
+import org.apache.batik.anim.dom.AnimatedLiveAttributeValue;
+import org.apache.batik.anim.dom.SVGOMAnimatedTransformList;
+import org.apache.batik.anim.dom.SVGOMElement;
import org.apache.batik.css.engine.CSSEngineEvent;
import org.apache.batik.css.engine.SVGCSSEngine;
import org.apache.batik.dom.events.AbstractEvent;
import org.apache.batik.dom.svg.AbstractSVGTransformList;
-import org.apache.batik.dom.svg.AnimatedLiveAttributeValue;
import org.apache.batik.dom.svg.LiveAttributeException;
import org.apache.batik.dom.svg.SVGContext;
import org.apache.batik.dom.svg.SVGMotionAnimatableElement;
-import org.apache.batik.dom.svg.SVGOMElement;
-import org.apache.batik.dom.svg.SVGOMAnimatedTransformList;
import org.apache.batik.ext.awt.geom.SegmentList;
import org.apache.batik.gvt.CanvasGraphicsNode;
import org.apache.batik.gvt.CompositeGraphicsNode;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AnimatableGenericSVGBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AnimatableGenericSVGBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AnimatableGenericSVGBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AnimatableGenericSVGBridge.java Thu Mar 5 11:45:15 2015
@@ -21,10 +21,10 @@ package org.apache.batik.bridge;
import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
+import org.apache.batik.anim.dom.AnimatedLiveAttributeValue;
+import org.apache.batik.anim.dom.SVGOMElement;
import org.apache.batik.css.engine.CSSEngineEvent;
-import org.apache.batik.dom.svg.AnimatedLiveAttributeValue;
import org.apache.batik.dom.svg.SVGContext;
-import org.apache.batik.dom.svg.SVGOMElement;
import org.w3c.dom.Element;
import org.w3c.dom.events.MutationEvent;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AnimatableSVGBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AnimatableSVGBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AnimatableSVGBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AnimatableSVGBridge.java Thu Mar 5 11:45:15 2015
@@ -22,9 +22,9 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
-import org.apache.batik.dom.anim.AnimationTarget;
-import org.apache.batik.dom.anim.AnimationTargetListener;
-import org.apache.batik.dom.svg.SVGAnimationTargetContext;
+import org.apache.batik.anim.dom.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTargetListener;
+import org.apache.batik.anim.dom.SVGAnimationTargetContext;
import org.w3c.dom.Element;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AnimationSupport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AnimationSupport.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AnimationSupport.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AnimationSupport.java Thu Mar 5 11:45:15 2015
@@ -20,10 +20,10 @@ package org.apache.batik.bridge;
import java.util.Calendar;
+import org.apache.batik.anim.dom.SVGOMAnimationElement;
import org.apache.batik.anim.timing.TimedElement;
import org.apache.batik.dom.events.DOMTimeEvent;
import org.apache.batik.dom.svg.IdContainer;
-import org.apache.batik.dom.svg.SVGOMAnimationElement;
import org.apache.batik.dom.svg.SVGOMUseShadowRoot;
import org.apache.batik.util.XMLConstants;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/BaseScriptingEnvironment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/BaseScriptingEnvironment.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/BaseScriptingEnvironment.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/BaseScriptingEnvironment.java Thu Mar 5 11:45:15 2015
@@ -43,7 +43,6 @@ import org.apache.batik.dom.util.XLinkSu
import org.apache.batik.script.Interpreter;
import org.apache.batik.script.InterpreterException;
import org.apache.batik.script.ScriptEventWrapper;
-import org.apache.batik.script.ScriptHandler;
import org.apache.batik.util.ParsedURL;
import org.apache.batik.util.SVGConstants;
import org.apache.batik.util.XMLConstants;
@@ -251,7 +250,7 @@ public class BaseScriptingEnvironment {
protected Interpreter interpreter;
/**
- * Map of {@link Interpreter} to {@link org.apache.batik.script.Window}
+ * Map of {@link Interpreter} to {@link org.apache.batik.bridge.Window}
* objects.
*/
protected Map windowObjects = new HashMap();
@@ -275,10 +274,10 @@ public class BaseScriptingEnvironment {
/**
* Returns the Window object for the specified {@link Interpreter}.
*/
- public org.apache.batik.script.Window getWindow(Interpreter interp,
+ public org.apache.batik.bridge.Window getWindow(Interpreter interp,
String lang) {
- org.apache.batik.script.Window w =
- (org.apache.batik.script.Window) windowObjects.get(interp);
+ org.apache.batik.bridge.Window w =
+ (org.apache.batik.bridge.Window) windowObjects.get(interp);
if (w == null) {
w = interp == null ? new Window(null, null)
: createWindow(interp, lang);
@@ -291,14 +290,14 @@ public class BaseScriptingEnvironment {
* Returns the Window object for scripting languages that have no
* {@link Interpreter} object.
*/
- public org.apache.batik.script.Window getWindow() {
+ public org.apache.batik.bridge.Window getWindow() {
return getWindow(null, null);
}
/**
* Creates a new Window object.
*/
- protected org.apache.batik.script.Window createWindow(Interpreter interp,
+ protected org.apache.batik.bridge.Window createWindow(Interpreter interp,
String lang) {
return new Window(interp, lang);
@@ -756,7 +755,7 @@ public class BaseScriptingEnvironment {
/**
* Represents the window object of this environment.
*/
- protected class Window implements org.apache.batik.script.Window {
+ protected class Window implements org.apache.batik.bridge.Window {
/**
* The associated interpreter.
@@ -778,7 +777,7 @@ public class BaseScriptingEnvironment {
/**
* Implements {@link
- * org.apache.batik.script.Window#setInterval(String,long)}.
+ * org.apache.batik.bridge.Window#setInterval(String,long)}.
*/
public Object setInterval(final String script, long interval) {
return null;
@@ -786,7 +785,7 @@ public class BaseScriptingEnvironment {
/**
* Implements {@link
- * org.apache.batik.script.Window#setInterval(Runnable,long)}.
+ * org.apache.batik.bridge.Window#setInterval(Runnable,long)}.
*/
public Object setInterval(final Runnable r, long interval) {
return null;
@@ -794,14 +793,14 @@ public class BaseScriptingEnvironment {
/**
* Implements {@link
- * org.apache.batik.script.Window#clearInterval(Object)}.
+ * org.apache.batik.bridge.Window#clearInterval(Object)}.
*/
public void clearInterval(Object interval) {
}
/**
* Implements {@link
- * org.apache.batik.script.Window#setTimeout(String,long)}.
+ * org.apache.batik.bridge.Window#setTimeout(String,long)}.
*/
public Object setTimeout(final String script, long timeout) {
return null;
@@ -809,7 +808,7 @@ public class BaseScriptingEnvironment {
/**
* Implements {@link
- * org.apache.batik.script.Window#setTimeout(Runnable,long)}.
+ * org.apache.batik.bridge.Window#setTimeout(Runnable,long)}.
*/
public Object setTimeout(final Runnable r, long timeout) {
return null;
@@ -817,7 +816,7 @@ public class BaseScriptingEnvironment {
/**
* Implements {@link
- * org.apache.batik.script.Window#clearTimeout(Object)}.
+ * org.apache.batik.bridge.Window#clearTimeout(Object)}.
*/
public void clearTimeout(Object timeout) {
}
@@ -844,7 +843,7 @@ public class BaseScriptingEnvironment {
* @param uri The URI where the data is located.
* @param h A handler called when the data is available.
*/
- public void getURL(String uri, org.apache.batik.script.Window.URLResponseHandler h) {
+ public void getURL(String uri, org.apache.batik.bridge.Window.URLResponseHandler h) {
getURL(uri, h, "UTF8");
}
@@ -855,24 +854,24 @@ public class BaseScriptingEnvironment {
* @param enc The character encoding of the data.
*/
public void getURL(String uri,
- org.apache.batik.script.Window.URLResponseHandler h,
+ org.apache.batik.bridge.Window.URLResponseHandler h,
String enc) {
}
public void postURL(String uri, String content,
- org.apache.batik.script.Window.URLResponseHandler h) {
+ org.apache.batik.bridge.Window.URLResponseHandler h) {
postURL(uri, content, h, "text/plain", null);
}
public void postURL(String uri, String content,
- org.apache.batik.script.Window.URLResponseHandler h,
+ org.apache.batik.bridge.Window.URLResponseHandler h,
String mimeType) {
postURL(uri, content, h, mimeType, null);
}
public void postURL(String uri,
String content,
- org.apache.batik.script.Window.URLResponseHandler h,
+ org.apache.batik.bridge.Window.URLResponseHandler h,
String mimeType,
String fEnc) {
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/BridgeContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/BridgeContext.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/BridgeContext.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/BridgeContext.java Thu Mar 5 11:45:15 2015
@@ -35,6 +35,12 @@ import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
+import org.apache.batik.anim.dom.AnimatedAttributeListener;
+import org.apache.batik.anim.dom.AnimatedLiveAttributeValue;
+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.anim.dom.SVGStylableElement;
import org.apache.batik.bridge.svg12.SVG12BridgeContext;
import org.apache.batik.bridge.svg12.SVG12BridgeExtension;
import org.apache.batik.css.engine.CSSContext;
@@ -47,18 +53,10 @@ import org.apache.batik.css.engine.Syste
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.dom.AbstractNode;
import org.apache.batik.dom.events.NodeEventTarget;
-import org.apache.batik.dom.svg.AnimatedAttributeListener;
-import org.apache.batik.dom.svg.AnimatedLiveAttributeValue;
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.svg.SVGStylableElement;
import org.apache.batik.dom.xbl.XBLManager;
import org.apache.batik.gvt.CompositeGraphicsNode;
import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextPainter;
-import org.apache.batik.gvt.font.FontFamilyResolver;
import org.apache.batik.script.Interpreter;
import org.apache.batik.script.InterpreterPool;
import org.apache.batik.util.CSSConstants;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/BridgeEventSupport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/BridgeEventSupport.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/BridgeEventSupport.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/BridgeEventSupport.java Thu Mar 5 11:45:15 2015
@@ -32,16 +32,12 @@ import org.apache.batik.dom.events.DOMMo
import org.apache.batik.dom.events.NodeEventTarget;
import org.apache.batik.dom.util.DOMUtilities;
import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
import org.apache.batik.gvt.event.EventDispatcher;
import org.apache.batik.gvt.event.GraphicsNodeKeyEvent;
import org.apache.batik.gvt.event.GraphicsNodeKeyListener;
import org.apache.batik.gvt.event.GraphicsNodeMouseEvent;
import org.apache.batik.gvt.event.GraphicsNodeMouseListener;
-import org.apache.batik.gvt.renderer.StrokingTextPainter;
import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
-import org.apache.batik.gvt.text.TextHit;
-import org.apache.batik.gvt.text.TextSpanLayout;
import org.apache.batik.util.SVGConstants;
import org.apache.batik.util.XMLConstants;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/BridgeUpdateHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/BridgeUpdateHandler.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/BridgeUpdateHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/BridgeUpdateHandler.java Thu Mar 5 11:45:15 2015
@@ -18,8 +18,8 @@
*/
package org.apache.batik.bridge;
+import org.apache.batik.anim.dom.AnimatedLiveAttributeValue;
import org.apache.batik.css.engine.CSSEngineEvent;
-import org.apache.batik.dom.svg.AnimatedLiveAttributeValue;
import org.w3c.dom.events.MutationEvent;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/CSSUtilities.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/CSSUtilities.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/CSSUtilities.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/CSSUtilities.java Thu Mar 5 11:45:15 2015
@@ -26,12 +26,12 @@ import java.awt.RenderingHints;
import java.awt.geom.GeneralPath;
import java.awt.geom.Rectangle2D;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.css.engine.CSSEngine;
import org.apache.batik.css.engine.CSSStylableElement;
import org.apache.batik.css.engine.SVGCSSEngine;
import org.apache.batik.css.engine.value.ListValue;
import org.apache.batik.css.engine.value.Value;
-import org.apache.batik.dom.svg.SVGOMDocument;
import org.apache.batik.ext.awt.MultipleGradientPaint;
import org.apache.batik.ext.awt.image.renderable.ClipRable;
import org.apache.batik.ext.awt.image.renderable.Filter;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/DocumentLoader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/DocumentLoader.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/DocumentLoader.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/DocumentLoader.java Thu Mar 5 11:45:15 2015
@@ -22,7 +22,7 @@ import java.io.InputStream;
import java.io.IOException;
import java.util.HashMap;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
import org.apache.batik.dom.svg.SVGDocumentFactory;
import org.apache.batik.dom.util.DocumentDescriptor;
import org.apache.batik.util.CleanerThread;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/FontFace.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/FontFace.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/FontFace.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/FontFace.java Thu Mar 5 11:45:15 2015
@@ -27,7 +27,6 @@ import org.w3c.dom.Node;
import org.w3c.dom.svg.SVGDocument;
import org.apache.batik.dom.AbstractNode;
-import org.apache.batik.gvt.font.FontFamilyResolver;
import org.apache.batik.gvt.font.GVTFontFace;
import org.apache.batik.gvt.font.GVTFontFamily;
import org.apache.batik.util.ParsedURL;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/Location.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/Location.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/Location.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/Location.java Thu Mar 5 11:45:15 2015
@@ -19,8 +19,9 @@
package org.apache.batik.bridge;
import java.net.URL;
+
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.bridge.BridgeContext;
-import org.apache.batik.dom.svg.SVGOMDocument;
import org.apache.batik.dom.AbstractDocument;
/**
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAElementBridge.java Thu Mar 5 11:45:15 2015
@@ -23,11 +23,11 @@ import java.awt.Cursor;
import java.util.Iterator;
import java.util.List;
+import org.apache.batik.anim.dom.SVGOMAElement;
+import org.apache.batik.anim.dom.SVGOMAnimationElement;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.dom.events.AbstractEvent;
import org.apache.batik.dom.events.NodeEventTarget;
-import org.apache.batik.dom.svg.SVGOMAElement;
-import org.apache.batik.dom.svg.SVGOMAnimationElement;
-import org.apache.batik.dom.svg.SVGOMDocument;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.util.ParsedURL;
import org.apache.batik.util.XMLConstants;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAltGlyphElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAltGlyphElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAltGlyphElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAltGlyphElementBridge.java Thu Mar 5 11:45:15 2015
@@ -20,8 +20,8 @@ package org.apache.batik.bridge;
import java.text.AttributedCharacterIterator;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.dom.AbstractNode;
-import org.apache.batik.dom.svg.SVGOMDocument;
import org.apache.batik.dom.util.XLinkSupport;
import org.apache.batik.gvt.font.Glyph;
import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimateColorElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimateColorElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimateColorElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimateColorElementBridge.java Thu Mar 5 11:45:15 2015
@@ -19,8 +19,8 @@
package org.apache.batik.bridge;
import org.apache.batik.anim.AbstractAnimation;
-import org.apache.batik.dom.anim.AnimationTarget;
import org.apache.batik.anim.ColorAnimation;
+import org.apache.batik.anim.dom.AnimationTarget;
import org.apache.batik.anim.values.AnimatableColorValue;
import org.apache.batik.anim.values.AnimatablePaintValue;
import org.apache.batik.anim.values.AnimatableValue;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimateElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimateElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimateElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimateElementBridge.java Thu Mar 5 11:45:15 2015
@@ -23,8 +23,8 @@ import java.util.List;
import org.apache.batik.anim.AbstractAnimation;
import org.apache.batik.anim.AnimationEngine;
-import org.apache.batik.dom.anim.AnimationTarget;
import org.apache.batik.anim.SimpleAnimation;
+import org.apache.batik.anim.dom.AnimationTarget;
import org.apache.batik.anim.values.AnimatableValue;
import org.apache.batik.util.SMILConstants;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimateMotionElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimateMotionElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimateMotionElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimateMotionElementBridge.java Thu Mar 5 11:45:15 2015
@@ -23,14 +23,14 @@ import java.util.List;
import org.apache.batik.anim.AbstractAnimation;
import org.apache.batik.anim.AnimationEngine;
-import org.apache.batik.dom.anim.AnimationTarget;
import org.apache.batik.anim.MotionAnimation;
+import org.apache.batik.anim.dom.AnimationTarget;
+import org.apache.batik.anim.dom.SVGOMElement;
+import org.apache.batik.anim.dom.SVGOMPathElement;
import org.apache.batik.anim.values.AnimatableMotionPointValue;
import org.apache.batik.anim.values.AnimatableValue;
import org.apache.batik.ext.awt.geom.ExtendedGeneralPath;
import org.apache.batik.dom.svg.SVGAnimatedPathDataSupport;
-import org.apache.batik.dom.svg.SVGOMElement;
-import org.apache.batik.dom.svg.SVGOMPathElement;
import org.apache.batik.dom.util.XLinkSupport;
import org.apache.batik.parser.AWTPathProducer;
import org.apache.batik.parser.AngleHandler;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimateTransformElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimateTransformElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimateTransformElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimateTransformElementBridge.java Thu Mar 5 11:45:15 2015
@@ -21,8 +21,8 @@ package org.apache.batik.bridge;
import java.util.ArrayList;
import org.apache.batik.anim.AbstractAnimation;
-import org.apache.batik.dom.anim.AnimationTarget;
import org.apache.batik.anim.TransformAnimation;
+import org.apache.batik.anim.dom.AnimationTarget;
import org.apache.batik.anim.values.AnimatableValue;
import org.apache.batik.anim.values.AnimatableTransformListValue;
import org.apache.batik.dom.svg.SVGOMTransform;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimationElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimationElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimationElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimationElementBridge.java Thu Mar 5 11:45:15 2015
@@ -25,16 +25,16 @@ import java.util.Calendar;
import org.apache.batik.anim.AbstractAnimation;
import org.apache.batik.anim.AnimationEngine;
+import org.apache.batik.anim.dom.AnimatableElement;
+import org.apache.batik.anim.dom.AnimatedLiveAttributeValue;
+import org.apache.batik.anim.dom.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTargetListener;
+import org.apache.batik.anim.dom.SVGOMElement;
import org.apache.batik.anim.timing.TimedElement;
import org.apache.batik.anim.values.AnimatableValue;
import org.apache.batik.css.engine.CSSEngineEvent;
import org.apache.batik.dom.AbstractNode;
-import org.apache.batik.dom.anim.AnimatableElement;
-import org.apache.batik.dom.anim.AnimationTarget;
-import org.apache.batik.dom.anim.AnimationTargetListener;
-import org.apache.batik.dom.svg.AnimatedLiveAttributeValue;
import org.apache.batik.dom.svg.SVGAnimationContext;
-import org.apache.batik.dom.svg.SVGOMElement;
import org.apache.batik.dom.util.XLinkSupport;
import org.apache.batik.util.SVGTypes;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimationEngine.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimationEngine.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimationEngine.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGAnimationEngine.java Thu Mar 5 11:45:15 2015
@@ -30,7 +30,10 @@ import java.util.Set;
import org.apache.batik.anim.AnimationEngine;
import org.apache.batik.anim.AnimationException;
-import org.apache.batik.dom.anim.AnimationTarget;
+import org.apache.batik.anim.dom.AnimationTarget;
+import org.apache.batik.anim.dom.SVGOMDocument;
+import org.apache.batik.anim.dom.SVGOMElement;
+import org.apache.batik.anim.dom.SVGStylableElement;
import org.apache.batik.anim.timing.TimedDocumentRoot;
import org.apache.batik.anim.timing.TimedElement;
import org.apache.batik.anim.values.AnimatableAngleValue;
@@ -59,9 +62,6 @@ import org.apache.batik.css.engine.value
import org.apache.batik.css.engine.value.StringValue;
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueManager;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.dom.svg.SVGOMElement;
-import org.apache.batik.dom.svg.SVGStylableElement;
import org.apache.batik.parser.DefaultPreserveAspectRatioHandler;
import org.apache.batik.parser.FloatArrayProducer;
import org.apache.batik.parser.DefaultLengthHandler;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGCircleElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGCircleElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGCircleElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGCircleElementBridge.java Thu Mar 5 11:45:15 2015
@@ -21,10 +21,10 @@ package org.apache.batik.bridge;
import java.awt.geom.Ellipse2D;
import java.awt.geom.Rectangle2D;
-import org.apache.batik.dom.svg.AbstractSVGAnimatedLength;
-import org.apache.batik.dom.svg.AnimatedLiveAttributeValue;
+import org.apache.batik.anim.dom.AbstractSVGAnimatedLength;
+import org.apache.batik.anim.dom.AnimatedLiveAttributeValue;
+import org.apache.batik.anim.dom.SVGOMCircleElement;
import org.apache.batik.dom.svg.LiveAttributeException;
-import org.apache.batik.dom.svg.SVGOMCircleElement;
import org.apache.batik.gvt.ShapeNode;
import org.apache.batik.gvt.ShapePainter;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGClipPathElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGClipPathElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGClipPathElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGClipPathElementBridge.java Thu Mar 5 11:45:15 2015
@@ -24,7 +24,7 @@ import java.awt.geom.AffineTransform;
import java.awt.geom.Area;
import java.awt.geom.GeneralPath;
-import org.apache.batik.dom.svg.SVGOMUseElement;
+import org.apache.batik.anim.dom.SVGOMUseElement;
import org.apache.batik.ext.awt.image.renderable.ClipRable;
import org.apache.batik.ext.awt.image.renderable.ClipRable8Bit;
import org.apache.batik.ext.awt.image.renderable.Filter;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGDescriptiveElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGDescriptiveElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGDescriptiveElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGDescriptiveElementBridge.java Thu Mar 5 11:45:15 2015
@@ -25,10 +25,10 @@ import java.awt.geom.Rectangle2D;
import org.w3c.dom.Element;
import org.w3c.dom.events.MutationEvent;
+import org.apache.batik.anim.dom.AnimatedLiveAttributeValue;
+import org.apache.batik.anim.dom.SVGOMElement;
import org.apache.batik.css.engine.CSSEngineEvent;
-import org.apache.batik.dom.svg.AnimatedLiveAttributeValue;
import org.apache.batik.dom.svg.SVGContext;
-import org.apache.batik.dom.svg.SVGOMElement;
/**
* Base class for 'descriptive' elements, mostly title and desc.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGDocumentBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGDocumentBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGDocumentBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGDocumentBridge.java Thu Mar 5 11:45:15 2015
@@ -21,10 +21,10 @@ package org.apache.batik.bridge;
import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
+import org.apache.batik.anim.dom.AnimatedLiveAttributeValue;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.css.engine.CSSEngineEvent;
-import org.apache.batik.dom.svg.AnimatedLiveAttributeValue;
import org.apache.batik.dom.svg.SVGContext;
-import org.apache.batik.dom.svg.SVGOMDocument;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.gvt.RootGraphicsNode;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGEllipseElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGEllipseElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGEllipseElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGEllipseElementBridge.java Thu Mar 5 11:45:15 2015
@@ -21,10 +21,10 @@ package org.apache.batik.bridge;
import java.awt.geom.Ellipse2D;
import java.awt.geom.Rectangle2D;
-import org.apache.batik.dom.svg.AbstractSVGAnimatedLength;
-import org.apache.batik.dom.svg.AnimatedLiveAttributeValue;
+import org.apache.batik.anim.dom.AbstractSVGAnimatedLength;
+import org.apache.batik.anim.dom.AnimatedLiveAttributeValue;
+import org.apache.batik.anim.dom.SVGOMEllipseElement;
import org.apache.batik.dom.svg.LiveAttributeException;
-import org.apache.batik.dom.svg.SVGOMEllipseElement;
import org.apache.batik.gvt.ShapeNode;
import org.apache.batik.gvt.ShapePainter;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGFilterElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGFilterElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGFilterElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGFilterElementBridge.java Thu Mar 5 11:45:15 2015
@@ -25,7 +25,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import org.apache.batik.dom.svg.SVGOMDocument;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.dom.util.XLinkSupport;
import org.apache.batik.ext.awt.image.PadMode;
import org.apache.batik.ext.awt.image.renderable.Filter;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGFontUtilities.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGFontUtilities.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGFontUtilities.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGFontUtilities.java Thu Mar 5 11:45:15 2015
@@ -25,12 +25,12 @@ import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
-import org.apache.batik.dom.svg.SVGOMDocument;
import org.apache.batik.gvt.font.GVTFontFamily;
import org.apache.batik.gvt.font.GVTFontFace;
import org.apache.batik.gvt.font.UnresolvedFontFamily;
import org.apache.batik.util.SVGConstants;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.css.engine.CSSEngine;
import org.apache.batik.css.engine.FontFaceRule;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGImageElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGImageElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGImageElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGImageElementBridge.java Thu Mar 5 11:45:15 2015
@@ -31,17 +31,17 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import org.apache.batik.anim.dom.AbstractSVGAnimatedLength;
+import org.apache.batik.anim.dom.AnimatedLiveAttributeValue;
+import org.apache.batik.anim.dom.SVGOMAnimatedPreserveAspectRatio;
+import org.apache.batik.anim.dom.SVGOMDocument;
+import org.apache.batik.anim.dom.SVGOMElement;
import org.apache.batik.css.engine.CSSEngine;
import org.apache.batik.css.engine.SVGCSSEngine;
import org.apache.batik.dom.AbstractNode;
import org.apache.batik.dom.events.DOMMouseEvent;
import org.apache.batik.dom.events.NodeEventTarget;
-import org.apache.batik.dom.svg.AbstractSVGAnimatedLength;
-import org.apache.batik.dom.svg.AnimatedLiveAttributeValue;
import org.apache.batik.dom.svg.LiveAttributeException;
-import org.apache.batik.dom.svg.SVGOMAnimatedPreserveAspectRatio;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.dom.svg.SVGOMElement;
import org.apache.batik.dom.util.DOMUtilities;
import org.apache.batik.ext.awt.image.renderable.ClipRable8Bit;
import org.apache.batik.ext.awt.image.renderable.Filter;