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 [4/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/bridge/SVGLineElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGLineElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGLineElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGLineElementBridge.java Thu Mar 5 11:45:15 2015
@@ -20,10 +20,10 @@ package org.apache.batik.bridge;
import java.awt.geom.Line2D;
-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.SVGOMLineElement;
import org.apache.batik.dom.svg.LiveAttributeException;
-import org.apache.batik.dom.svg.SVGOMLineElement;
import org.apache.batik.gvt.ShapeNode;
import org.apache.batik.gvt.ShapePainter;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGPathElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGPathElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGPathElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGPathElementBridge.java Thu Mar 5 11:45:15 2015
@@ -22,12 +22,12 @@ import java.awt.Shape;
import java.awt.geom.GeneralPath;
import java.awt.geom.Point2D;
+import org.apache.batik.anim.dom.AnimatedLiveAttributeValue;
+import org.apache.batik.anim.dom.SVGOMAnimatedPathData;
+import org.apache.batik.anim.dom.SVGOMPathElement;
import org.apache.batik.css.engine.SVGCSSEngine;
-import org.apache.batik.dom.svg.AnimatedLiveAttributeValue;
import org.apache.batik.dom.svg.LiveAttributeException;
import org.apache.batik.dom.svg.SVGAnimatedPathDataSupport;
-import org.apache.batik.dom.svg.SVGOMAnimatedPathData;
-import org.apache.batik.dom.svg.SVGOMPathElement;
import org.apache.batik.dom.svg.SVGPathContext;
import org.apache.batik.ext.awt.geom.PathLength;
import org.apache.batik.gvt.ShapeNode;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGPatternElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGPatternElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGPatternElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGPatternElementBridge.java Thu Mar 5 11:45:15 2015
@@ -27,7 +27,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-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.ConcreteComponentTransferFunction;
import org.apache.batik.ext.awt.image.renderable.ComponentTransferRable8Bit;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGPolygonElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGPolygonElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGPolygonElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGPolygonElementBridge.java Thu Mar 5 11:45:15 2015
@@ -21,11 +21,11 @@ package org.apache.batik.bridge;
import java.awt.Shape;
import java.awt.geom.GeneralPath;
+import org.apache.batik.anim.dom.AnimatedLiveAttributeValue;
+import org.apache.batik.anim.dom.SVGOMAnimatedPoints;
+import org.apache.batik.anim.dom.SVGOMPolygonElement;
import org.apache.batik.css.engine.SVGCSSEngine;
-import org.apache.batik.dom.svg.AnimatedLiveAttributeValue;
import org.apache.batik.dom.svg.LiveAttributeException;
-import org.apache.batik.dom.svg.SVGOMAnimatedPoints;
-import org.apache.batik.dom.svg.SVGOMPolygonElement;
import org.apache.batik.gvt.ShapeNode;
import org.apache.batik.parser.AWTPolygonProducer;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGPolylineElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGPolylineElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGPolylineElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGPolylineElementBridge.java Thu Mar 5 11:45:15 2015
@@ -21,11 +21,11 @@ package org.apache.batik.bridge;
import java.awt.Shape;
import java.awt.geom.GeneralPath;
+import org.apache.batik.anim.dom.AnimatedLiveAttributeValue;
+import org.apache.batik.anim.dom.SVGOMAnimatedPoints;
+import org.apache.batik.anim.dom.SVGOMPolylineElement;
import org.apache.batik.css.engine.SVGCSSEngine;
-import org.apache.batik.dom.svg.AnimatedLiveAttributeValue;
import org.apache.batik.dom.svg.LiveAttributeException;
-import org.apache.batik.dom.svg.SVGOMAnimatedPoints;
-import org.apache.batik.dom.svg.SVGOMPolylineElement;
import org.apache.batik.gvt.ShapeNode;
import org.apache.batik.parser.AWTPolylineProducer;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGRectElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGRectElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGRectElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGRectElementBridge.java Thu Mar 5 11:45:15 2015
@@ -22,10 +22,10 @@ import java.awt.Shape;
import java.awt.geom.Rectangle2D;
import java.awt.geom.RoundRectangle2D;
-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.SVGOMRectElement;
import org.apache.batik.dom.svg.LiveAttributeException;
-import org.apache.batik.dom.svg.SVGOMRectElement;
import org.apache.batik.gvt.ShapeNode;
import org.apache.batik.gvt.ShapePainter;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGSVGElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGSVGElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGSVGElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGSVGElementBridge.java Thu Mar 5 11:45:15 2015
@@ -29,13 +29,13 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-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.SVGOMAnimatedRect;
+import org.apache.batik.anim.dom.SVGOMElement;
+import org.apache.batik.anim.dom.SVGOMSVGElement;
import org.apache.batik.dom.svg.LiveAttributeException;
import org.apache.batik.dom.svg.SVGContext;
-import org.apache.batik.dom.svg.SVGOMAnimatedRect;
-import org.apache.batik.dom.svg.SVGOMElement;
-import org.apache.batik.dom.svg.SVGOMSVGElement;
import org.apache.batik.dom.svg.SVGSVGContext;
import org.apache.batik.ext.awt.image.renderable.ClipRable8Bit;
import org.apache.batik.ext.awt.image.renderable.Filter;
@@ -43,7 +43,6 @@ import org.apache.batik.gvt.CanvasGraphi
import org.apache.batik.gvt.CompositeGraphicsNode;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.gvt.ShapeNode;
-import org.apache.batik.gvt.TextNode;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGSetElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGSetElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGSetElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGSetElementBridge.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.SetAnimation;
+import org.apache.batik.anim.dom.AnimationTarget;
import org.apache.batik.anim.values.AnimatableValue;
/**
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGTextElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGTextElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGTextElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGTextElementBridge.java Thu Mar 5 11:45:15 2015
@@ -40,6 +40,13 @@ import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
+import org.apache.batik.anim.dom.AbstractSVGAnimatedLength;
+import org.apache.batik.anim.dom.AnimatedLiveAttributeValue;
+import org.apache.batik.anim.dom.SVGOMAnimatedEnumeration;
+import org.apache.batik.anim.dom.SVGOMAnimatedLengthList;
+import org.apache.batik.anim.dom.SVGOMAnimatedNumberList;
+import org.apache.batik.anim.dom.SVGOMElement;
+import org.apache.batik.anim.dom.SVGOMTextPositioningElement;
import org.apache.batik.css.engine.CSSEngineEvent;
import org.apache.batik.css.engine.CSSStylableElement;
import org.apache.batik.css.engine.SVGCSSEngine;
@@ -47,32 +54,20 @@ import org.apache.batik.css.engine.Style
import org.apache.batik.css.engine.value.ListValue;
import org.apache.batik.css.engine.value.Value;
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.SVGContext;
-import org.apache.batik.dom.svg.SVGOMAnimatedEnumeration;
-import org.apache.batik.dom.svg.SVGOMAnimatedLengthList;
-import org.apache.batik.dom.svg.SVGOMAnimatedNumberList;
-import org.apache.batik.dom.svg.SVGOMElement;
-import org.apache.batik.dom.svg.SVGOMTextPositioningElement;
import org.apache.batik.dom.svg.SVGTextContent;
import org.apache.batik.dom.util.XLinkSupport;
import org.apache.batik.dom.util.XMLSupport;
import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
import org.apache.batik.gvt.font.GVTFont;
import org.apache.batik.gvt.font.GVTFontFamily;
import org.apache.batik.gvt.font.GVTGlyphMetrics;
import org.apache.batik.gvt.font.GVTGlyphVector;
import org.apache.batik.gvt.font.UnresolvedFontFamily;
-import org.apache.batik.gvt.renderer.StrokingTextPainter;
import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
-import org.apache.batik.gvt.text.Mark;
-import org.apache.batik.gvt.text.TextHit;
import org.apache.batik.gvt.text.TextPaintInfo;
import org.apache.batik.gvt.text.TextPath;
-import org.apache.batik.gvt.text.TextSpanLayout;
import org.apache.batik.util.XMLConstants;
import org.w3c.dom.Element;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGUseElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGUseElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGUseElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGUseElementBridge.java Thu Mar 5 11:45:15 2015
@@ -23,13 +23,13 @@ import java.awt.RenderingHints;
import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
+import org.apache.batik.anim.dom.AbstractSVGAnimatedLength;
+import org.apache.batik.anim.dom.AnimatedLiveAttributeValue;
+import org.apache.batik.anim.dom.SVGOMAnimatedLength;
+import org.apache.batik.anim.dom.SVGOMDocument;
+import org.apache.batik.anim.dom.SVGOMUseElement;
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.SVGOMAnimatedLength;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.dom.svg.SVGOMUseElement;
import org.apache.batik.dom.svg.SVGOMUseShadowRoot;
import org.apache.batik.gvt.CompositeGraphicsNode;
import org.apache.batik.gvt.GraphicsNode;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/ScriptingEnvironment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/ScriptingEnvironment.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/ScriptingEnvironment.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/ScriptingEnvironment.java Thu Mar 5 11:45:15 2015
@@ -43,12 +43,12 @@ import java.util.zip.GZIPOutputStream;
import org.apache.batik.dom.AbstractElement;
import org.apache.batik.dom.GenericDOMImplementation;
import org.apache.batik.dom.events.NodeEventTarget;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.dom.svg.SVGOMScriptElement;
import org.apache.batik.dom.util.DOMUtilities;
import org.apache.batik.dom.util.SAXDocumentFactory;
import org.apache.batik.dom.util.XLinkSupport;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SVGOMDocument;
+import org.apache.batik.anim.dom.SVGOMScriptElement;
import org.apache.batik.bridge.Location;
import org.apache.batik.script.Interpreter;
import org.apache.batik.script.InterpreterException;
@@ -378,7 +378,7 @@ public class ScriptingEnvironment extend
/**
* 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);
}
@@ -796,7 +796,7 @@ public class ScriptingEnvironment extend
/**
* 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 {
/**
* A <code>TimerTask</code> to invoke a
@@ -932,7 +932,7 @@ public class ScriptingEnvironment extend
/**
* 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) {
IntervalScriptTimerTask tt = new IntervalScriptTimerTask(script);
@@ -942,7 +942,7 @@ public class ScriptingEnvironment extend
/**
* 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) {
IntervalRunnableTimerTask tt = new IntervalRunnableTimerTask(r);
@@ -952,7 +952,7 @@ public class ScriptingEnvironment extend
/**
* Implements {@link
- * org.apache.batik.script.Window#clearInterval(Object)}.
+ * org.apache.batik.bridge.Window#clearInterval(Object)}.
*/
public void clearInterval(Object interval) {
if (interval == null) return;
@@ -961,7 +961,7 @@ public class ScriptingEnvironment extend
/**
* 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) {
TimeoutScriptTimerTask tt = new TimeoutScriptTimerTask(script);
@@ -971,7 +971,7 @@ public class ScriptingEnvironment extend
/**
* 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) {
TimeoutRunnableTimerTask tt = new TimeoutRunnableTimerTask(r);
@@ -981,7 +981,7 @@ public class ScriptingEnvironment extend
/**
* Implements {@link
- * org.apache.batik.script.Window#clearTimeout(Object)}.
+ * org.apache.batik.bridge.Window#clearTimeout(Object)}.
*/
public void clearTimeout(Object timeout) {
if (timeout == null) return;
@@ -990,7 +990,7 @@ public class ScriptingEnvironment extend
/**
* Implements {@link
- * org.apache.batik.script.Window#parseXML(String,Document)}.
+ * org.apache.batik.bridge.Window#parseXML(String,Document)}.
*/
public Node parseXML(String text, Document doc) {
// Try and parse it as an SVGDocument
@@ -1057,9 +1057,9 @@ public class ScriptingEnvironment extend
/**
* Implements {@link
- * org.apache.batik.script.Window#getURL(String,org.apache.batik.script.Window.URLResponseHandler)}.
+ * org.apache.batik.bridge.Window#getURL(String,org.apache.batik.bridge.Window.URLResponseHandler)}.
*/
- 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, null);
}
@@ -1068,10 +1068,10 @@ public class ScriptingEnvironment extend
static final String UTF_8 ="UTF-8";
/**
* Implements {@link
- * org.apache.batik.script.Window#getURL(String,org.apache.batik.script.Window.URLResponseHandler,String)}.
+ * org.apache.batik.bridge.Window#getURL(String,org.apache.batik.bridge.Window.URLResponseHandler,String)}.
*/
public void getURL(final String uri,
- final org.apache.batik.script.Window.URLResponseHandler h,
+ final org.apache.batik.bridge.Window.URLResponseHandler h,
final String enc) {
Thread t = new Thread() {
public void run() {
@@ -1145,19 +1145,19 @@ public class ScriptingEnvironment extend
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(final String uri,
final String content,
- final org.apache.batik.script.Window.URLResponseHandler h,
+ final org.apache.batik.bridge.Window.URLResponseHandler h,
final String mimeType,
final String fEnc) {
Thread t = new Thread() {
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/TextUtilities.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/TextUtilities.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/TextUtilities.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/TextUtilities.java Thu Mar 5 11:45:15 2015
@@ -24,7 +24,6 @@ import java.util.StringTokenizer;
import org.apache.batik.css.engine.SVGCSSEngine;
import org.apache.batik.css.engine.value.Value;
-import org.apache.batik.gvt.TextNode;
import org.apache.batik.util.CSSConstants;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/URIResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/URIResolver.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/URIResolver.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/URIResolver.java Thu Mar 5 11:45:15 2015
@@ -21,8 +21,8 @@ package org.apache.batik.bridge;
import java.io.IOException;
import java.net.MalformedURLException;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.dom.AbstractNode;
-import org.apache.batik.dom.svg.SVGOMDocument;
import org.apache.batik.util.ParsedURL;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/UpdateManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/UpdateManager.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/UpdateManager.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/UpdateManager.java Thu Mar 5 11:45:15 2015
@@ -29,11 +29,11 @@ import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.bridge.svg12.DefaultXBLManager;
import org.apache.batik.bridge.svg12.SVG12BridgeContext;
import org.apache.batik.bridge.svg12.SVG12ScriptingEnvironment;
import org.apache.batik.dom.events.AbstractEvent;
-import org.apache.batik.dom.svg.SVGOMDocument;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.gvt.RootGraphicsNode;
import org.apache.batik.gvt.UpdateTracker;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/UserAgent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/UserAgent.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/UserAgent.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/UserAgent.java Thu Mar 5 11:45:15 2015
@@ -24,8 +24,6 @@ import java.awt.geom.AffineTransform;
import java.awt.geom.Dimension2D;
import org.apache.batik.gvt.event.EventDispatcher;
-import org.apache.batik.gvt.font.FontFamilyResolver;
-import org.apache.batik.gvt.text.Mark;
import org.apache.batik.util.ParsedURL;
import org.w3c.dom.Element;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/UserAgentAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/UserAgentAdapter.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/UserAgentAdapter.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/UserAgentAdapter.java Thu Mar 5 11:45:15 2015
@@ -28,9 +28,6 @@ import java.util.Iterator;
import java.util.Set;
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.text.Mark;
import org.apache.batik.util.ParsedURL;
import org.apache.batik.util.SVGFeatureStrings;
import org.apache.batik.util.XMLResourceDescriptor;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/ViewBox.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/ViewBox.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/ViewBox.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/ViewBox.java Thu Mar 5 11:45:15 2015
@@ -21,8 +21,8 @@ package org.apache.batik.bridge;
import java.awt.geom.AffineTransform;
import java.util.StringTokenizer;
+import org.apache.batik.anim.dom.SVGOMAnimatedRect;
import org.apache.batik.dom.svg.LiveAttributeException;
-import org.apache.batik.dom.svg.SVGOMAnimatedRect;
import org.apache.batik.parser.AWTTransformProducer;
import org.apache.batik.parser.FragmentIdentifierHandler;
import org.apache.batik.parser.FragmentIdentifierParser;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/AbstractContentSelector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/AbstractContentSelector.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/AbstractContentSelector.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/AbstractContentSelector.java Thu Mar 5 11:45:15 2015
@@ -20,7 +20,7 @@ package org.apache.batik.bridge.svg12;
import java.util.HashMap;
-import org.apache.batik.dom.svg12.XBLOMContentElement;
+import org.apache.batik.anim.dom.XBLOMContentElement;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/BindableElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/BindableElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/BindableElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/BindableElementBridge.java Thu Mar 5 11:45:15 2015
@@ -18,6 +18,7 @@
*/
package org.apache.batik.bridge.svg12;
+import org.apache.batik.anim.dom.BindableElement;
import org.apache.batik.bridge.AbstractGraphicsNodeBridge;
import org.apache.batik.bridge.Bridge;
import org.apache.batik.bridge.BridgeContext;
@@ -25,7 +26,6 @@ import org.apache.batik.bridge.GVTBuilde
import org.apache.batik.bridge.SVGUtilities;
import org.apache.batik.bridge.ScriptingEnvironment;
import org.apache.batik.bridge.UpdateManager;
-import org.apache.batik.dom.svg12.BindableElement;
import org.apache.batik.gvt.CompositeGraphicsNode;
import org.apache.batik.gvt.GraphicsNode;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/ContentManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/ContentManager.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/ContentManager.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/ContentManager.java Thu Mar 5 11:45:15 2015
@@ -25,12 +25,12 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
+import org.apache.batik.anim.dom.XBLEventSupport;
+import org.apache.batik.anim.dom.XBLOMContentElement;
+import org.apache.batik.anim.dom.XBLOMShadowTreeElement;
import org.apache.batik.dom.AbstractNode;
import org.apache.batik.dom.events.NodeEventTarget;
import org.apache.batik.dom.xbl.XBLManager;
-import org.apache.batik.dom.svg12.XBLEventSupport;
-import org.apache.batik.dom.svg12.XBLOMContentElement;
-import org.apache.batik.dom.svg12.XBLOMShadowTreeElement;
import org.apache.batik.util.XBLConstants;
import org.apache.batik.util.XMLConstants;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/ContentSelectionChangedEvent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/ContentSelectionChangedEvent.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/ContentSelectionChangedEvent.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/ContentSelectionChangedEvent.java Thu Mar 5 11:45:15 2015
@@ -20,7 +20,7 @@ package org.apache.batik.bridge.svg12;
import java.util.EventObject;
-import org.apache.batik.dom.svg12.XBLOMContentElement;
+import org.apache.batik.anim.dom.XBLOMContentElement;
/**
* An event to signify a change to the list of selected nodes for an
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/DefaultContentSelector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/DefaultContentSelector.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/DefaultContentSelector.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/DefaultContentSelector.java Thu Mar 5 11:45:15 2015
@@ -20,7 +20,7 @@ package org.apache.batik.bridge.svg12;
import java.util.ArrayList;
-import org.apache.batik.dom.svg12.XBLOMContentElement;
+import org.apache.batik.anim.dom.XBLOMContentElement;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/DefaultXBLManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/DefaultXBLManager.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/DefaultXBLManager.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/DefaultXBLManager.java Thu Mar 5 11:45:15 2015
@@ -29,6 +29,13 @@ import java.util.Map;
import javax.swing.event.EventListenerList;
+import org.apache.batik.anim.dom.BindableElement;
+import org.apache.batik.anim.dom.XBLEventSupport;
+import org.apache.batik.anim.dom.XBLOMContentElement;
+import org.apache.batik.anim.dom.XBLOMDefinitionElement;
+import org.apache.batik.anim.dom.XBLOMImportElement;
+import org.apache.batik.anim.dom.XBLOMShadowTreeElement;
+import org.apache.batik.anim.dom.XBLOMTemplateElement;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.BridgeException;
import org.apache.batik.bridge.ErrorConstants;
@@ -36,13 +43,6 @@ import org.apache.batik.dom.AbstractAttr
import org.apache.batik.dom.AbstractDocument;
import org.apache.batik.dom.AbstractNode;
import org.apache.batik.dom.events.NodeEventTarget;
-import org.apache.batik.dom.svg12.BindableElement;
-import org.apache.batik.dom.svg12.XBLEventSupport;
-import org.apache.batik.dom.svg12.XBLOMContentElement;
-import org.apache.batik.dom.svg12.XBLOMDefinitionElement;
-import org.apache.batik.dom.svg12.XBLOMImportElement;
-import org.apache.batik.dom.svg12.XBLOMShadowTreeElement;
-import org.apache.batik.dom.svg12.XBLOMTemplateElement;
import org.apache.batik.dom.xbl.NodeXBL;
import org.apache.batik.dom.xbl.ShadowTreeEvent;
import org.apache.batik.dom.xbl.XBLManager;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12BridgeContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12BridgeContext.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12BridgeContext.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12BridgeContext.java Thu Mar 5 11:45:15 2015
@@ -20,6 +20,9 @@ package org.apache.batik.bridge.svg12;
import java.util.Iterator;
+import org.apache.batik.anim.dom.SVGOMDocument;
+import org.apache.batik.anim.dom.XBLEventSupport;
+import org.apache.batik.anim.dom.XBLOMShadowTreeElement;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.BridgeUpdateHandler;
import org.apache.batik.bridge.DocumentLoader;
@@ -31,9 +34,6 @@ import org.apache.batik.dom.AbstractDocu
import org.apache.batik.dom.AbstractNode;
import org.apache.batik.dom.events.EventSupport;
import org.apache.batik.dom.events.NodeEventTarget;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.dom.svg12.XBLEventSupport;
-import org.apache.batik.dom.svg12.XBLOMShadowTreeElement;
import org.apache.batik.dom.xbl.NodeXBL;
import org.apache.batik.dom.xbl.XBLManager;
import org.apache.batik.script.Interpreter;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12FocusManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12FocusManager.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12FocusManager.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12FocusManager.java Thu Mar 5 11:45:15 2015
@@ -18,12 +18,12 @@
*/
package org.apache.batik.bridge.svg12;
+import org.apache.batik.anim.dom.XBLEventSupport;
import org.apache.batik.bridge.FocusManager;
import org.apache.batik.dom.AbstractNode;
import org.apache.batik.dom.events.AbstractEvent;
import org.apache.batik.dom.events.DOMUIEvent;
import org.apache.batik.dom.events.EventSupport;
-import org.apache.batik.dom.svg12.XBLEventSupport;
import org.apache.batik.util.XMLConstants;
import org.w3c.dom.Document;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12ScriptingEnvironment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12ScriptingEnvironment.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12ScriptingEnvironment.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12ScriptingEnvironment.java Thu Mar 5 11:45:15 2015
@@ -18,6 +18,7 @@
*/
package org.apache.batik.bridge.svg12;
+import org.apache.batik.anim.dom.XBLEventSupport;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.DocumentLoader;
import org.apache.batik.bridge.Messages;
@@ -27,7 +28,6 @@ import org.apache.batik.dom.AbstractDocu
import org.apache.batik.dom.AbstractElement;
import org.apache.batik.dom.events.EventSupport;
import org.apache.batik.dom.svg12.SVGGlobal;
-import org.apache.batik.dom.svg12.XBLEventSupport;
import org.apache.batik.dom.util.DOMUtilities;
import org.apache.batik.dom.util.TriplyIndexedTable;
import org.apache.batik.script.Interpreter;
@@ -290,7 +290,7 @@ public class SVG12ScriptingEnvironment e
/**
* Creates a new Window object.
*/
- public org.apache.batik.script.Window createWindow(Interpreter interp,
+ public org.apache.batik.bridge.Window createWindow(Interpreter interp,
String lang) {
return new Global(interp, lang);
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12TextElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12TextElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12TextElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12TextElementBridge.java Thu Mar 5 11:45:15 2015
@@ -18,11 +18,11 @@
*/
package org.apache.batik.bridge.svg12;
+import org.apache.batik.anim.dom.XBLEventSupport;
import org.apache.batik.bridge.Bridge;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.SVGTextElementBridge;
import org.apache.batik.dom.AbstractNode;
-import org.apache.batik.dom.svg12.XBLEventSupport;
import org.apache.batik.dom.events.EventSupport;
import org.apache.batik.dom.events.NodeEventTarget;
import org.apache.batik.dom.xbl.NodeXBL;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVGFlowRootElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVGFlowRootElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVGFlowRootElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVGFlowRootElementBridge.java Thu Mar 5 11:45:15 2015
@@ -37,13 +37,18 @@ import java.util.Map;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.apache.batik.anim.dom.SVGOMElement;
+import org.apache.batik.anim.dom.SVGOMFlowRegionElement;
+import org.apache.batik.anim.dom.XBLEventSupport;
import org.apache.batik.bridge.Bridge;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.CSSUtilities;
import org.apache.batik.bridge.CursorManager;
+import org.apache.batik.bridge.FlowTextNode;
import org.apache.batik.bridge.GVTBuilder;
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.UserAgent;
import org.apache.batik.bridge.SVGAElementBridge;
@@ -56,16 +61,11 @@ import org.apache.batik.css.engine.value
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.dom.AbstractNode;
import org.apache.batik.dom.events.NodeEventTarget;
-import org.apache.batik.dom.svg.SVGOMElement;
-import org.apache.batik.dom.svg12.SVGOMFlowRegionElement;
-import org.apache.batik.dom.svg12.XBLEventSupport;
import org.apache.batik.dom.util.XMLSupport;
import org.apache.batik.dom.util.XLinkSupport;
import org.apache.batik.gvt.CompositeGraphicsNode;
import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
import org.apache.batik.gvt.flow.BlockInfo;
-import org.apache.batik.gvt.flow.FlowTextNode;
import org.apache.batik.gvt.flow.RegionInfo;
import org.apache.batik.gvt.flow.TextLineBreaks;
import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVGMultiImageElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVGMultiImageElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVGMultiImageElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVGMultiImageElementBridge.java Thu Mar 5 11:45:15 2015
@@ -33,6 +33,7 @@ import org.apache.batik.bridge.Bridge;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.BridgeException;
import org.apache.batik.bridge.CSSUtilities;
+import org.apache.batik.bridge.MultiResGraphicsNode;
import org.apache.batik.bridge.SVGImageElementBridge;
import org.apache.batik.bridge.SVGUtilities;
import org.apache.batik.bridge.UnitProcessor;
@@ -41,7 +42,6 @@ import org.apache.batik.dom.AbstractNode
import org.apache.batik.dom.util.XLinkSupport;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.gvt.ImageNode;
-import org.apache.batik.gvt.svg12.MultiResGraphicsNode;
import org.apache.batik.util.ParsedURL;
import org.apache.batik.util.SVG12Constants;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVGSolidColorElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVGSolidColorElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVGSolidColorElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVGSolidColorElementBridge.java Thu Mar 5 11:45:15 2015
@@ -23,6 +23,7 @@ import java.awt.Paint;
import java.util.HashMap;
import java.util.Map;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.bridge.AnimatableGenericSVGBridge;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.BridgeException;
@@ -34,7 +35,6 @@ import org.apache.batik.css.engine.CSSEn
import org.apache.batik.css.engine.CSSStylableElement;
import org.apache.batik.css.engine.StyleMap;
import org.apache.batik.css.engine.value.Value;
-import org.apache.batik.dom.svg.SVGOMDocument;
import org.apache.batik.dom.util.XLinkSupport;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.util.SVG12Constants;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/XBLContentElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/XBLContentElementBridge.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/XBLContentElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/XBLContentElementBridge.java Thu Mar 5 11:45:15 2015
@@ -18,12 +18,12 @@
*/
package org.apache.batik.bridge.svg12;
+import org.apache.batik.anim.dom.XBLOMContentElement;
import org.apache.batik.bridge.AbstractGraphicsNodeBridge;
import org.apache.batik.bridge.Bridge;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.GVTBuilder;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg12.XBLOMContentElement;
import org.apache.batik.gvt.CompositeGraphicsNode;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.util.XBLConstants;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/XPathPatternContentSelector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/XPathPatternContentSelector.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/XPathPatternContentSelector.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/XPathPatternContentSelector.java Thu Mar 5 11:45:15 2015
@@ -24,8 +24,8 @@ import org.apache.xml.utils.PrefixResolv
import org.apache.xpath.XPath;
import org.apache.xpath.XPathContext;
+import org.apache.batik.anim.dom.XBLOMContentElement;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg12.XBLOMContentElement;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/XPathSubsetContentSelector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/XPathSubsetContentSelector.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/XPathSubsetContentSelector.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/XPathSubsetContentSelector.java Thu Mar 5 11:45:15 2015
@@ -21,7 +21,7 @@ package org.apache.batik.bridge.svg12;
import java.io.IOException;
import java.util.ArrayList;
-import org.apache.batik.dom.svg12.XBLOMContentElement;
+import org.apache.batik.anim.dom.XBLOMContentElement;
import org.apache.batik.parser.AbstractScanner;
import org.apache.batik.parser.ParseException;
import org.apache.batik.xml.XMLUtilities;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGList.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGList.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGList.java Thu Mar 5 11:45:15 2015
@@ -399,7 +399,7 @@ public abstract class AbstractSVGList {
}
try {
- ListBuilder builder = new ListBuilder();
+ ListBuilder builder = new ListBuilder(this);
doParse(getValueAsString(), builder);
@@ -498,43 +498,4 @@ public abstract class AbstractSVGList {
}
list.clear();
}
-
- /**
- * A class for receiving notification of parsed list items.
- */
- protected class ListBuilder implements ListHandler {
-
- /**
- * The list being built.
- */
- protected List list;
-
- /**
- * Returns the newly created list.
- */
- public List getList() {
- return list;
- }
-
- /**
- * Begins the construction of the list.
- */
- public void startList(){
- list = new ArrayList();
- }
-
- /**
- * Adds an item to the list.
- */
- public void item(SVGItem item) {
- item.setParent(AbstractSVGList.this);
- list.add(item);
- }
-
- /**
- * Ends the construction of the list.
- */
- public void endList() {
- }
- }
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGNormPathSegList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGNormPathSegList.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGNormPathSegList.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGNormPathSegList.java Thu Mar 5 11:45:15 2015
@@ -326,71 +326,30 @@ public abstract class AbstractSVGNormPat
public SVGPathSegGenericItem(short type, String letter,
float x1, float y1, float x2, float y2, float x, float y){
super(type,letter);
- this.x1 = x2;
- this.y1 = y2;
- this.x2 = x2;
- this.y2 = y2;
- this.x = x;
- this.y = y;
+ this.setX1(x2);
+ this.setY1(y2);
+ this.setX2(x2);
+ this.setY2(y2);
+ this.setX(x);
+ this.setY(y);
}
public void setValue(float x1, float y1, float x2, float y2, float x, float y) {
- this.x1 = x2;
- this.y1 = y2;
- this.x2 = x2;
- this.y2 = y2;
- this.x = x;
- this.y = y;
+ this.setX1(x2);
+ this.setY1(y2);
+ this.setX2(x2);
+ this.setY2(y2);
+ this.setX(x);
+ this.setY(y);
}
public void setValue(float x, float y) {
- this.x = x;
- this.y = y;
+ this.setX(x);
+ this.setY(y);
}
public void setPathSegType(short type) {
this.type = type;
}
-
- public float getX(){
- return x;
- }
- public float getY(){
- return y;
- }
-
- public void setX(float x){
- this.x = x;
- }
- public void setY(float y){
- this.y = y;
- }
-
- public float getX1(){
- return x1;
- }
- public float getY1(){
- return y1;
- }
-
- public void setX1(float x){
- this.x1 = x;
- }
- public void setY1(float y){
- this.y1 = y;
- }
- public float getX2(){
- return x2;
- }
- public float getY2(){
- return y2;
- }
-
- public void setX2(float x){
- this.x2 = x;
- }
- public void setY2(float y){
- this.y2 = y;
- }
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGNumberList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGNumberList.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGNumberList.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGNumberList.java Thu Mar 5 11:45:15 2015
@@ -157,55 +157,6 @@ public abstract class AbstractSVGNumberL
}
/**
- * Representation of the item SVGNumber.
- */
- protected class SVGNumberItem extends AbstractSVGNumber implements SVGItem {
-
- /**
- * The {@link SVGNumberList} this item belongs to.
- */
- protected AbstractSVGList parentList;
-
- /**
- * Creates a new SVGNumberItem.
- */
- public SVGNumberItem(float value) {
- this.value = value;
- }
-
- /**
- * Returns a String representation of the number.
- */
- public String getValueAsString() {
- return Float.toString(value);
- }
-
- /**
- * Associates this item to the given {@link SVGNumberList}.
- */
- public void setParent(AbstractSVGList list) {
- parentList = list;
- }
-
- /**
- * Returns the list the item belongs to.
- */
- public AbstractSVGList getParent() {
- return parentList;
- }
-
- /**
- * Notifies the parent {@link SVGNumberList} that this item's value
- * has changed.
- */
- protected void reset() {
- if (parentList != null) {
- parentList.itemChanged();
- }
- }
- }
-
- /**
* Helper class to interface the {@link NumberListParser} and the
* {@link NumberListHandler}.
*/
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGPathSegList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGPathSegList.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGPathSegList.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGPathSegList.java Thu Mar 5 11:45:15 2015
@@ -26,7 +26,6 @@ import org.w3c.dom.svg.SVGException;
import org.w3c.dom.svg.SVGPathSeg;
import org.w3c.dom.svg.SVGPathSegArcAbs;
import org.w3c.dom.svg.SVGPathSegArcRel;
-import org.w3c.dom.svg.SVGPathSegClosePath;
import org.w3c.dom.svg.SVGPathSegCurvetoCubicAbs;
import org.w3c.dom.svg.SVGPathSegCurvetoCubicRel;
import org.w3c.dom.svg.SVGPathSegCurvetoCubicSmoothAbs;
@@ -225,60 +224,6 @@ public abstract class AbstractSVGPathSeg
return pathSegItem;
}
- /**
- * Internal representation of the item SVGPathSeg.
- */
- protected class SVGPathSegItem extends AbstractSVGItem
- implements SVGPathSeg,
- SVGPathSegClosePath {
-
- protected short type;
-
- protected String letter;
-
- protected float x;
- protected float y;
- protected float x1;
- protected float y1;
- protected float x2;
- protected float y2;
- protected float r1;
- protected float r2;
- protected float angle;
- protected boolean largeArcFlag;
- protected boolean sweepFlag;
-
- protected SVGPathSegItem(){}
-
- public SVGPathSegItem(short type,String letter){
- this.type = type;
- this.letter = letter;
- }
-
- public SVGPathSegItem(SVGPathSeg pathSeg){
- type = pathSeg.getPathSegType();
- switch(type){
- case SVGPathSeg.PATHSEG_CLOSEPATH:
- letter = PATHSEG_CLOSEPATH_LETTER;
- break;
- default:
- }
- }
- protected String getStringValue(){
- return letter;
- }
-
- public short getPathSegType() {
- return type;
- }
-
-
- public String getPathSegTypeAsLetter(){
- return letter;
- }
-
- }
-
public class SVGPathSegMovetoLinetoItem extends SVGPathSegItem
implements SVGPathSegMovetoAbs,
SVGPathSegMovetoRel,
@@ -288,8 +233,8 @@ public abstract class AbstractSVGPathSeg
public SVGPathSegMovetoLinetoItem(short type, String letter,
float x, float y){
super(type,letter);
- this.x = x;
- this.y = y;
+ this.setX(x);
+ this.setY(y);
}
public SVGPathSegMovetoLinetoItem(SVGPathSeg pathSeg){
@@ -297,50 +242,43 @@ public abstract class AbstractSVGPathSeg
switch(type){
case SVGPathSeg.PATHSEG_LINETO_REL:
letter = PATHSEG_LINETO_REL_LETTER;
- x = ((SVGPathSegLinetoRel)pathSeg).getX();
- y = ((SVGPathSegLinetoRel)pathSeg).getY();
+ setX(((SVGPathSegLinetoRel)pathSeg).getX());
+ setY(((SVGPathSegLinetoRel)pathSeg).getY());
break;
case SVGPathSeg.PATHSEG_LINETO_ABS:
letter = PATHSEG_LINETO_ABS_LETTER;
- x = ((SVGPathSegLinetoAbs)pathSeg).getX();
- y = ((SVGPathSegLinetoAbs)pathSeg).getY();
+ setX(((SVGPathSegLinetoAbs)pathSeg).getX());
+ setY(((SVGPathSegLinetoAbs)pathSeg).getY());
break;
case SVGPathSeg.PATHSEG_MOVETO_REL:
letter = PATHSEG_MOVETO_REL_LETTER;
- x = ((SVGPathSegMovetoRel)pathSeg).getX();
- y = ((SVGPathSegMovetoRel)pathSeg).getY();
+ setX(((SVGPathSegMovetoRel)pathSeg).getX());
+ setY(((SVGPathSegMovetoRel)pathSeg).getY());
break;
case SVGPathSeg.PATHSEG_MOVETO_ABS:
letter = PATHSEG_MOVETO_ABS_LETTER;
- x = ((SVGPathSegMovetoAbs)pathSeg).getX();
- y = ((SVGPathSegMovetoAbs)pathSeg).getY();
+ setX(((SVGPathSegMovetoAbs)pathSeg).getX());
+ setY(((SVGPathSegMovetoAbs)pathSeg).getY());
break;
default:
}
}
- public float getX(){
- return x;
- }
- public float getY(){
- return y;
- }
-
public void setX(float x){
- this.x = x;
+ super.setX(x);
resetAttribute();
}
public void setY(float y){
- this.y = y;
+ super.setY(y);
resetAttribute();
}
protected String getStringValue(){
return letter
+ ' '
- + Float.toString(x)
+ + Float.toString(getX())
+ ' '
- + Float.toString(y);
+ + Float.toString(getY());
}
}
@@ -352,12 +290,12 @@ public abstract class AbstractSVGPathSeg
float x1,float y1,float x2, float y2,
float x, float y){
super(type,letter);
- this.x = x;
- this.y = y;
- this.x1 = x1;
- this.y1 = y1;
- this.x2 = x2;
- this.y2 = y2;
+ this.setX(x);
+ this.setY(y);
+ this.setX1(x1);
+ this.setY1(y1);
+ this.setX2(x2);
+ this.setY2(y2);
}
public SVGPathSegCurvetoCubicItem(SVGPathSeg pathSeg){
@@ -365,88 +303,67 @@ public abstract class AbstractSVGPathSeg
switch(type){
case SVGPathSeg.PATHSEG_CURVETO_CUBIC_ABS:
letter = PATHSEG_CURVETO_CUBIC_ABS_LETTER;
- x = ((SVGPathSegCurvetoCubicAbs)pathSeg).getX();
- y = ((SVGPathSegCurvetoCubicAbs)pathSeg).getY();
- x1 = ((SVGPathSegCurvetoCubicAbs)pathSeg).getX1();
- y1 = ((SVGPathSegCurvetoCubicAbs)pathSeg).getY1();
- x2 = ((SVGPathSegCurvetoCubicAbs)pathSeg).getX2();
- y2 = ((SVGPathSegCurvetoCubicAbs)pathSeg).getY2();
+ setX(((SVGPathSegCurvetoCubicAbs)pathSeg).getX());
+ setY(((SVGPathSegCurvetoCubicAbs)pathSeg).getY());
+ setX1(((SVGPathSegCurvetoCubicAbs)pathSeg).getX1());
+ setY1(((SVGPathSegCurvetoCubicAbs)pathSeg).getY1());
+ setX2(((SVGPathSegCurvetoCubicAbs)pathSeg).getX2());
+ setY2(((SVGPathSegCurvetoCubicAbs)pathSeg).getY2());
break;
case SVGPathSeg.PATHSEG_CURVETO_CUBIC_REL:
letter = PATHSEG_CURVETO_CUBIC_REL_LETTER;
- x = ((SVGPathSegCurvetoCubicRel)pathSeg).getX();
- y = ((SVGPathSegCurvetoCubicRel)pathSeg).getY();
- x1 = ((SVGPathSegCurvetoCubicRel)pathSeg).getX1();
- y1 = ((SVGPathSegCurvetoCubicRel)pathSeg).getY1();
- x2 = ((SVGPathSegCurvetoCubicRel)pathSeg).getX2();
- y2 = ((SVGPathSegCurvetoCubicRel)pathSeg).getY2();
+ setX(((SVGPathSegCurvetoCubicRel)pathSeg).getX());
+ setY(((SVGPathSegCurvetoCubicRel)pathSeg).getY());
+ setX1(((SVGPathSegCurvetoCubicRel)pathSeg).getX1());
+ setY1(((SVGPathSegCurvetoCubicRel)pathSeg).getY1());
+ setX2(((SVGPathSegCurvetoCubicRel)pathSeg).getX2());
+ setY2(((SVGPathSegCurvetoCubicRel)pathSeg).getY2());
break;
default:
}
}
- public float getX(){
- return x;
- }
- public float getY(){
- return y;
- }
-
public void setX(float x){
- this.x = x;
+ super.setX(x);
resetAttribute();
}
public void setY(float y){
- this.y = y;
+ super.setY(y);
resetAttribute();
}
- public float getX1(){
- return x1;
- }
- public float getY1(){
- return y1;
- }
-
public void setX1(float x1){
- this.x1 = x1;
+ super.setX1(x1);
resetAttribute();
}
public void setY1(float y1){
- this.y1 = y1;
+ super.setY1(y1);
resetAttribute();
}
- public float getX2(){
- return x2;
- }
- public float getY2(){
- return y2;
- }
-
public void setX2(float x2){
- this.x2 = x2;
+ super.setX2(x2);
resetAttribute();
}
public void setY2(float y2){
- this.y2 = y2;
+ super.setY2(y2);
resetAttribute();
}
protected String getStringValue(){
return letter
+ ' '
- + Float.toString(x1)
+ + Float.toString(getX1())
+ ' '
- + Float.toString(y1)
+ + Float.toString(getY1())
+ ' '
- + Float.toString(x2)
+ + Float.toString(getX2())
+ ' '
- + Float.toString(y2)
+ + Float.toString(getY2())
+ ' '
- + Float.toString(x)
+ + Float.toString(getX())
+ ' '
- + Float.toString(y);
+ + Float.toString(getY());
}
}
@@ -457,10 +374,10 @@ public abstract class AbstractSVGPathSeg
public SVGPathSegCurvetoQuadraticItem(short type,String letter,
float x1,float y1,float x, float y ){
super(type,letter);
- this.x = x;
- this.y = y;
- this.x1 = x1;
- this.y1 = y1;
+ this.setX(x);
+ this.setY(y);
+ this.setX1(x1);
+ this.setY1(y1);
}
public SVGPathSegCurvetoQuadraticItem(SVGPathSeg pathSeg){
@@ -468,52 +385,38 @@ public abstract class AbstractSVGPathSeg
switch(type){
case SVGPathSeg.PATHSEG_CURVETO_QUADRATIC_ABS:
letter = PATHSEG_CURVETO_QUADRATIC_ABS_LETTER;
- x = ((SVGPathSegCurvetoQuadraticAbs)pathSeg).getX();
- y = ((SVGPathSegCurvetoQuadraticAbs)pathSeg).getY();
- x1 = ((SVGPathSegCurvetoQuadraticAbs)pathSeg).getX1();
- y1= ((SVGPathSegCurvetoQuadraticAbs)pathSeg).getY1();
+ setX(((SVGPathSegCurvetoQuadraticAbs)pathSeg).getX());
+ setY(((SVGPathSegCurvetoQuadraticAbs)pathSeg).getY());
+ setX1(((SVGPathSegCurvetoQuadraticAbs)pathSeg).getX1());
+ setY1(((SVGPathSegCurvetoQuadraticAbs)pathSeg).getY1());
break;
case SVGPathSeg.PATHSEG_CURVETO_QUADRATIC_REL:
letter = PATHSEG_CURVETO_QUADRATIC_REL_LETTER;
- x = ((SVGPathSegCurvetoQuadraticRel)pathSeg).getX();
- y = ((SVGPathSegCurvetoQuadraticRel)pathSeg).getY();
- x1 = ((SVGPathSegCurvetoQuadraticRel)pathSeg).getX1();
- y1= ((SVGPathSegCurvetoQuadraticRel)pathSeg).getY1();
+ setX(((SVGPathSegCurvetoQuadraticRel)pathSeg).getX());
+ setY(((SVGPathSegCurvetoQuadraticRel)pathSeg).getY());
+ setX1(((SVGPathSegCurvetoQuadraticRel)pathSeg).getX1());
+ setY1(((SVGPathSegCurvetoQuadraticRel)pathSeg).getY1());
break;
default:
}
}
- public float getX(){
- return x;
- }
- public float getY(){
- return y;
- }
-
public void setX(float x){
- this.x = x;
+ super.setX(x);
resetAttribute();
}
public void setY(float y){
- this.y = y;
+ super.setY(y);
resetAttribute();
}
- public float getX1(){
- return x1;
- }
- public float getY1(){
- return y1;
- }
-
public void setX1(float x1){
- this.x1 = x1;
+ super.setX1(x1);
resetAttribute();
}
public void setY1(float y1){
- this.y1 = y1;
+ super.setY1(y1);
resetAttribute();
}
@@ -521,13 +424,13 @@ public abstract class AbstractSVGPathSeg
return letter
+ ' '
- + Float.toString(x1)
+ + Float.toString(getX1())
+ ' '
- + Float.toString(y1)
+ + Float.toString(getY1())
+ ' '
- + Float.toString(x)
+ + Float.toString(getX())
+ ' '
- + Float.toString(y);
+ + Float.toString(getY());
}
}
@@ -540,13 +443,13 @@ public abstract class AbstractSVGPathSeg
boolean largeArcFlag, boolean sweepFlag,
float x, float y ){
super(type,letter);
- this.x = x;
- this.y = y;
- this.r1 = r1;
- this.r2 = r2;
- this.angle = angle;
- this.largeArcFlag = largeArcFlag;
- this.sweepFlag = sweepFlag;
+ this.setX(x);
+ this.setY(y);
+ this.setR1(r1);
+ this.setR2(r2);
+ this.setAngle(angle);
+ this.setLargeArcFlag(largeArcFlag);
+ this.setSweepFlag(sweepFlag);
}
public SVGPathSegArcItem(SVGPathSeg pathSeg){
@@ -554,103 +457,85 @@ public abstract class AbstractSVGPathSeg
switch(type){
case SVGPathSeg.PATHSEG_ARC_ABS:
letter = PATHSEG_ARC_ABS_LETTER;
- x = ((SVGPathSegArcAbs)pathSeg).getX();
- y = ((SVGPathSegArcAbs)pathSeg).getY();
- r1 = ((SVGPathSegArcAbs)pathSeg).getR1();
- r2 = ((SVGPathSegArcAbs)pathSeg).getR2();
- angle = ((SVGPathSegArcAbs)pathSeg).getAngle();
- largeArcFlag = ((SVGPathSegArcAbs)pathSeg).getLargeArcFlag();
- sweepFlag = ((SVGPathSegArcAbs)pathSeg).getSweepFlag();
+ setX(((SVGPathSegArcAbs)pathSeg).getX());
+ setY(((SVGPathSegArcAbs)pathSeg).getY());
+ setR1(((SVGPathSegArcAbs)pathSeg).getR1());
+ setR2(((SVGPathSegArcAbs)pathSeg).getR2());
+ setAngle(((SVGPathSegArcAbs)pathSeg).getAngle());
+ setLargeArcFlag(((SVGPathSegArcAbs)pathSeg).getLargeArcFlag());
+ setSweepFlag(((SVGPathSegArcAbs)pathSeg).getSweepFlag());
break;
case SVGPathSeg.PATHSEG_ARC_REL:
letter = PATHSEG_ARC_REL_LETTER;
- x = ((SVGPathSegArcRel)pathSeg).getX();
- y = ((SVGPathSegArcRel)pathSeg).getY();
- r1 = ((SVGPathSegArcRel)pathSeg).getR1();
- r2 = ((SVGPathSegArcRel)pathSeg).getR2();
- angle = ((SVGPathSegArcRel)pathSeg).getAngle();
- largeArcFlag = ((SVGPathSegArcRel)pathSeg).getLargeArcFlag();
- sweepFlag = ((SVGPathSegArcRel)pathSeg).getSweepFlag();
+ setX(((SVGPathSegArcRel)pathSeg).getX());
+ setY(((SVGPathSegArcRel)pathSeg).getY());
+ setR1(((SVGPathSegArcRel)pathSeg).getR1());
+ setR2(((SVGPathSegArcRel)pathSeg).getR2());
+ setAngle(((SVGPathSegArcRel)pathSeg).getAngle());
+ setLargeArcFlag(((SVGPathSegArcRel)pathSeg).getLargeArcFlag());
+ setSweepFlag(((SVGPathSegArcRel)pathSeg).getSweepFlag());
break;
default:
}
}
- public float getX(){
- return x;
- }
- public float getY(){
- return y;
- }
-
public void setX(float x){
- this.x = x;
+ super.setX(x);
resetAttribute();
}
public void setY(float y){
- this.y = y;
+ super.setY(y);
resetAttribute();
}
- public float getR1(){
- return r1;
- }
- public float getR2(){
- return r2;
- }
-
public void setR1(float r1){
- this.r1 = r1;
+ super.setR1(r1);
resetAttribute();
}
public void setR2(float r2){
- this.r2 = r2;
+ super.setR2(r2);
resetAttribute();
}
- public float getAngle(){
- return angle;
- }
-
public void setAngle(float angle){
- this.angle = angle;
+ super.setAngle(angle);
resetAttribute();
}
public boolean getSweepFlag(){
- return sweepFlag;
+ return isSweepFlag();
}
public void setSweepFlag(boolean sweepFlag){
- this.sweepFlag = sweepFlag;
+ super.setSweepFlag(sweepFlag);
resetAttribute();
}
public boolean getLargeArcFlag(){
- return largeArcFlag;
+ return isLargeArcFlag();
}
public void setLargeArcFlag(boolean largeArcFlag){
- this.largeArcFlag = largeArcFlag;
+ super.setLargeArcFlag(largeArcFlag);
resetAttribute();
}
protected String getStringValue(){
return letter
+ ' '
- + Float.toString(r1)
+ + Float.toString(getR1())
+ ' '
- + Float.toString(r2)
+ + Float.toString(getR2())
+ ' '
- + Float.toString(angle)
+ + Float.toString(getAngle())
+ ' '
- + ((largeArcFlag?"1":"0"))
+ + ((isLargeArcFlag()?"1":"0"))
+ ' '
- + ((sweepFlag?"1":"0"))
+ + ((isSweepFlag()?"1":"0"))
+ (' ')
- + Float.toString(x)
+ + Float.toString(getX())
+ ' '
- + Float.toString(y);
+ + Float.toString(getY());
}
}
@@ -662,36 +547,32 @@ public abstract class AbstractSVGPathSeg
public SVGPathSegLinetoHorizontalItem(short type, String letter,
float value){
super(type,letter);
- this.x = value;
+ this.setX(value);
}
public SVGPathSegLinetoHorizontalItem(SVGPathSeg pathSeg){
this.type = pathSeg.getPathSegType();
switch(type){
case SVGPathSeg.PATHSEG_LINETO_HORIZONTAL_ABS:
letter = PATHSEG_LINETO_HORIZONTAL_ABS_LETTER;
- x = ((SVGPathSegLinetoHorizontalAbs)pathSeg).getX();
+ setX(((SVGPathSegLinetoHorizontalAbs)pathSeg).getX());
break;
case SVGPathSeg.PATHSEG_LINETO_HORIZONTAL_REL:
letter = PATHSEG_LINETO_HORIZONTAL_REL_LETTER;
- x = ((SVGPathSegLinetoHorizontalRel)pathSeg).getX();
+ setX(((SVGPathSegLinetoHorizontalRel)pathSeg).getX());
break;
default:
}
}
- public float getX(){
- return x;
- }
-
public void setX(float x){
- this.x = x;
+ super.setX(x);
resetAttribute();
}
protected String getStringValue(){
return letter
+ ' '
- + Float.toString(x);
+ + Float.toString(getX());
}
}
@@ -703,7 +584,7 @@ public abstract class AbstractSVGPathSeg
public SVGPathSegLinetoVerticalItem(short type, String letter,
float value){
super(type,letter);
- this.y = value;
+ this.setY(value);
}
public SVGPathSegLinetoVerticalItem(SVGPathSeg pathSeg){
@@ -711,29 +592,25 @@ public abstract class AbstractSVGPathSeg
switch(type){
case SVGPathSeg.PATHSEG_LINETO_VERTICAL_ABS:
letter = PATHSEG_LINETO_VERTICAL_ABS_LETTER;
- y = ((SVGPathSegLinetoVerticalAbs)pathSeg).getY();
+ setY(((SVGPathSegLinetoVerticalAbs)pathSeg).getY());
break;
case SVGPathSeg.PATHSEG_LINETO_VERTICAL_REL:
letter = PATHSEG_LINETO_VERTICAL_REL_LETTER;
- y = ((SVGPathSegLinetoVerticalRel)pathSeg).getY();
+ setY(((SVGPathSegLinetoVerticalRel)pathSeg).getY());
break;
default:
}
}
- public float getY(){
- return y;
- }
-
public void setY(float y){
- this.y = y;
+ super.setY(y);
resetAttribute();
}
protected String getStringValue(){
return letter
+ ' '
- + Float.toString(y);
+ + Float.toString(getY());
}
}
@@ -744,10 +621,10 @@ public abstract class AbstractSVGPathSeg
public SVGPathSegCurvetoCubicSmoothItem(short type,String letter,
float x2,float y2,float x, float y ){
super(type,letter);
- this.x = x;
- this.y = y;
- this.x2 = x2;
- this.y2 = y2;
+ this.setX(x);
+ this.setY(y);
+ this.setX2(x2);
+ this.setY2(y2);
}
public SVGPathSegCurvetoCubicSmoothItem(SVGPathSeg pathSeg){
@@ -755,64 +632,50 @@ public abstract class AbstractSVGPathSeg
switch(type){
case SVGPathSeg.PATHSEG_CURVETO_CUBIC_SMOOTH_ABS:
letter = PATHSEG_CURVETO_CUBIC_SMOOTH_ABS_LETTER;
- x = ((SVGPathSegCurvetoCubicSmoothAbs)pathSeg).getX();
- y = ((SVGPathSegCurvetoCubicSmoothAbs)pathSeg).getY();
- x2 = ((SVGPathSegCurvetoCubicSmoothAbs)pathSeg).getX2();
- y2 = ((SVGPathSegCurvetoCubicSmoothAbs)pathSeg).getY2();
+ setX(((SVGPathSegCurvetoCubicSmoothAbs)pathSeg).getX());
+ setY(((SVGPathSegCurvetoCubicSmoothAbs)pathSeg).getY());
+ setX2(((SVGPathSegCurvetoCubicSmoothAbs)pathSeg).getX2());
+ setY2(((SVGPathSegCurvetoCubicSmoothAbs)pathSeg).getY2());
break;
case SVGPathSeg.PATHSEG_CURVETO_CUBIC_SMOOTH_REL:
letter = PATHSEG_CURVETO_CUBIC_SMOOTH_REL_LETTER;
- x = ((SVGPathSegCurvetoCubicSmoothRel)pathSeg).getX();
- y = ((SVGPathSegCurvetoCubicSmoothRel)pathSeg).getY();
- x2 = ((SVGPathSegCurvetoCubicSmoothRel)pathSeg).getX2();
- y2 = ((SVGPathSegCurvetoCubicSmoothRel)pathSeg).getY2();
+ setX(((SVGPathSegCurvetoCubicSmoothRel)pathSeg).getX());
+ setY(((SVGPathSegCurvetoCubicSmoothRel)pathSeg).getY());
+ setX2(((SVGPathSegCurvetoCubicSmoothRel)pathSeg).getX2());
+ setY2(((SVGPathSegCurvetoCubicSmoothRel)pathSeg).getY2());
break;
default:
}
}
- public float getX(){
- return x;
- }
- public float getY(){
- return y;
- }
-
public void setX(float x){
- this.x = x;
+ super.setX(x);
resetAttribute();
}
public void setY(float y){
- this.y = y;
+ super.setY(y);
resetAttribute();
}
- public float getX2(){
- return x2;
- }
- public float getY2(){
- return y2;
- }
-
public void setX2(float x2){
- this.x2 = x2;
+ super.setX2(x2);
resetAttribute();
}
public void setY2(float y2){
- this.y2 = y2;
+ super.setY2(y2);
resetAttribute();
}
protected String getStringValue(){
return letter
+ ' '
- + Float.toString(x2)
+ + Float.toString(getX2())
+ ' '
- + Float.toString(y2)
+ + Float.toString(getY2())
+ ' '
- + Float.toString(x)
+ + Float.toString(getX())
+ ' '
- + Float.toString(y);
+ + Float.toString(getY());
}
}
@@ -823,8 +686,8 @@ public abstract class AbstractSVGPathSeg
public SVGPathSegCurvetoQuadraticSmoothItem(short type, String letter,
float x, float y){
super(type,letter);
- this.x = x;
- this.y = y;
+ this.setX(x);
+ this.setY(y);
}
public SVGPathSegCurvetoQuadraticSmoothItem(SVGPathSeg pathSeg){
@@ -832,40 +695,33 @@ public abstract class AbstractSVGPathSeg
switch(type){
case SVGPathSeg.PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS:
letter = PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS_LETTER;
- x = ((SVGPathSegCurvetoQuadraticSmoothAbs)pathSeg).getX();
- y = ((SVGPathSegCurvetoQuadraticSmoothAbs)pathSeg).getY();
+ setX(((SVGPathSegCurvetoQuadraticSmoothAbs)pathSeg).getX());
+ setY(((SVGPathSegCurvetoQuadraticSmoothAbs)pathSeg).getY());
break;
case SVGPathSeg.PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL:
letter = PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL_LETTER;
- x = ((SVGPathSegCurvetoQuadraticSmoothRel)pathSeg).getX();
- y = ((SVGPathSegCurvetoQuadraticSmoothRel)pathSeg).getY();
+ setX(((SVGPathSegCurvetoQuadraticSmoothRel)pathSeg).getX());
+ setY(((SVGPathSegCurvetoQuadraticSmoothRel)pathSeg).getY());
break;
default:
}
}
- public float getX(){
- return x;
- }
- public float getY(){
- return y;
- }
-
public void setX(float x){
- this.x = x;
+ super.setX(x);
resetAttribute();
}
public void setY(float y){
- this.y = y;
+ super.setY(y);
resetAttribute();
}
protected String getStringValue(){
return letter
+ ' '
- + Float.toString(x)
+ + Float.toString(getX())
+ ' '
- + Float.toString(y);
+ + Float.toString(getY());
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGPointList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGPointList.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGPointList.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGPointList.java Thu Mar 5 11:45:15 2015
@@ -23,7 +23,6 @@ import org.apache.batik.parser.PointsHan
import org.apache.batik.parser.PointsParser;
import org.w3c.dom.DOMException;
import org.w3c.dom.svg.SVGException;
-import org.w3c.dom.svg.SVGMatrix;
import org.w3c.dom.svg.SVGPoint;
import org.w3c.dom.svg.SVGPointList;
@@ -138,76 +137,6 @@ public abstract class AbstractSVGPointLi
}
}
- /**
- * An {@link SVGPoint} in the list.
- */
- protected class SVGPointItem extends AbstractSVGItem implements SVGPoint {
-
- /**
- * The x value.
- */
- protected float x;
-
- /**
- * The y value.
- */
- protected float y;
-
- /**
- * Creates a new SVGPointItem.
- */
- public SVGPointItem(float x, float y) {
- this.x = x;
- this.y = y;
- }
-
- /**
- * Return a String representation of this SVGPoint.
- */
- protected String getStringValue() {
- return Float.toString( x )
- + ','
- + Float.toString( y );
- }
-
- /**
- * <b>DOM</b>: Implements {@link SVGPoint#getX()}.
- */
- public float getX() {
- return x;
- }
-
- /**
- * <b>DOM</b>: Implements {@link SVGPoint#getY()}.
- */
- public float getY() {
- return y;
- }
-
- /**
- * <b>DOM</b>: Implements {@link SVGPoint#setX(float)}.
- */
- public void setX(float x) {
- this.x = x;
- resetAttribute();
- }
-
- /**
- * <b>DOM</b>: Implements {@link SVGPoint#setY(float)}.
- */
- public void setY(float y) {
- this.y = y;
- resetAttribute();
- }
-
- /**
- * <b>DOM</b>: Implements {@link SVGPoint#matrixTransform(SVGMatrix)}.
- */
- public SVGPoint matrixTransform(SVGMatrix matrix) {
- return SVGOMPoint.matrixTransform(this, matrix);
- }
- }
-
/**
* Helper class to interface the {@link PointsParser} and the
* {@link PointsHandler}.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGPreserveAspectRatio.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGPreserveAspectRatio.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGPreserveAspectRatio.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGPreserveAspectRatio.java Thu Mar 5 11:45:15 2015
@@ -152,7 +152,7 @@ public abstract class AbstractSVGPreserv
/**
* Returns the string representation of the preserve aspect ratio value.
*/
- protected String getValueAsString() {
+ public String getValueAsString() {
if (align < 1 || align > 10) {
throw createDOMException
(DOMException.INVALID_MODIFICATION_ERR,
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGTransform.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGTransform.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGTransform.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGTransform.java Thu Mar 5 11:45:15 2015
@@ -71,7 +71,7 @@ public abstract class AbstractSVGTransfo
/**
* Sets the type of transformation.
*/
- protected void setType(short type) {
+ public void setType(short type) {
this.type = type;
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGTransformList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGTransformList.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGTransformList.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/AbstractSVGTransformList.java Thu Mar 5 11:45:15 2015
@@ -192,7 +192,7 @@ public abstract class AbstractSVGTransfo
/**
* An {@link SVGTransform} in the list.
*/
- protected class SVGTransformItem
+ public class SVGTransformItem
extends AbstractSVGTransform
implements SVGItem {
@@ -222,13 +222,13 @@ public abstract class AbstractSVGTransfo
/**
* Creates a new, uninitialized SVGTransformItem.
*/
- protected SVGTransformItem() {
+ public SVGTransformItem() {
}
/**
* Creates a new SVGTransformItem from the given {@link SVGTransform}.
*/
- protected SVGTransformItem(SVGTransform transform) {
+ public SVGTransformItem(SVGTransform transform) {
assign(transform);
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMAngle.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMAngle.java?rev=1664314&r1=1664313&r2=1664314&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMAngle.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMAngle.java Thu Mar 5 11:45:15 2015
@@ -36,7 +36,7 @@ public class SVGOMAngle implements SVGAn
/**
* The type of this angle.
*/
- protected short unitType;
+ private short unitType;
/**
* The value of this angle.
@@ -63,7 +63,7 @@ public class SVGOMAngle implements SVGAn
*/
public float getValue() {
revalidate();
- return toUnit(unitType, value, SVG_ANGLETYPE_DEG);
+ return toUnit(getUnitType(), value, SVG_ANGLETYPE_DEG);
}
/**
@@ -71,7 +71,7 @@ public class SVGOMAngle implements SVGAn
*/
public void setValue(float value) throws DOMException {
revalidate();
- this.unitType = SVG_ANGLETYPE_DEG;
+ this.setUnitType(SVG_ANGLETYPE_DEG);
this.value = value;
reset();
}
@@ -99,7 +99,7 @@ public class SVGOMAngle implements SVGAn
*/
public String getValueAsString() {
revalidate();
- return Float.toString(value) + UNITS[unitType];
+ return Float.toString(value) + UNITS[getUnitType()];
}
/**
@@ -115,7 +115,7 @@ public class SVGOMAngle implements SVGAn
* SVGAngle#newValueSpecifiedUnits(short,float)}.
*/
public void newValueSpecifiedUnits(short unit, float value) {
- unitType = unit;
+ setUnitType(unit);
this.value = value;
reset();
}
@@ -125,8 +125,8 @@ public class SVGOMAngle implements SVGAn
* SVGAngle#convertToSpecifiedUnits(short)}.
*/
public void convertToSpecifiedUnits(short unit) {
- value = toUnit(unitType, value, unit);
- unitType = unit;
+ value = toUnit(getUnitType(), value, unit);
+ setUnitType(unit);
}
/**
@@ -156,19 +156,19 @@ public class SVGOMAngle implements SVGAn
value = v;
}
public void deg() throws ParseException {
- unitType = SVG_ANGLETYPE_DEG;
+ setUnitType(SVG_ANGLETYPE_DEG);
}
public void rad() throws ParseException {
- unitType = SVG_ANGLETYPE_RAD;
+ setUnitType(SVG_ANGLETYPE_RAD);
}
public void grad() throws ParseException {
- unitType = SVG_ANGLETYPE_GRAD;
+ setUnitType(SVG_ANGLETYPE_GRAD);
}
});
- unitType = SVG_ANGLETYPE_UNSPECIFIED;
+ setUnitType(SVG_ANGLETYPE_UNSPECIFIED);
angleParser.parse(s);
} catch (ParseException e) {
- unitType = SVG_ANGLETYPE_UNKNOWN;
+ setUnitType(SVG_ANGLETYPE_UNKNOWN);
value = 0;
}
}
@@ -194,4 +194,8 @@ public class SVGOMAngle implements SVGAn
}
return (float) (K[fromUnit - 2][toUnit - 2] * value);
}
+
+ public void setUnitType(short unitType) {
+ this.unitType = unitType;
+ }
}