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 ga...@apache.org on 2015/04/01 16:35:46 UTC
svn commit: r1670661 [4/5] - in /xmlgraphics/batik/branches/text-background:
./ lib/ resources/META-INF/services/ resources/org/apache/batik/anim/dom/
resources/org/apache/batik/apps/rasterizer/resources/
resources/org/apache/batik/apps/svgbrowser/reso...
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGDocumentBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGDocumentBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGDocumentBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGDocumentBridge.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/SVGEllipseElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGEllipseElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGEllipseElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGEllipseElementBridge.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/SVGFilterElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGFilterElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGFilterElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGFilterElementBridge.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/SVGFontUtilities.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGFontUtilities.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGFontUtilities.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGFontUtilities.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/SVGImageElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGImageElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGImageElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGImageElementBridge.java Wed Apr 1 14:35:42 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;
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGLineElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGLineElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGLineElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGLineElementBridge.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/SVGPathElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGPathElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGPathElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGPathElementBridge.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/SVGPatternElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGPatternElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGPatternElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGPatternElementBridge.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/SVGPolygonElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGPolygonElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGPolygonElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGPolygonElementBridge.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/SVGPolylineElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGPolylineElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGPolylineElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGPolylineElementBridge.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/SVGRectElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGRectElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGRectElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGRectElementBridge.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/SVGSVGElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGSVGElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGSVGElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGSVGElementBridge.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/SVGSetElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGSetElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGSetElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGSetElementBridge.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/SVGTextElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGTextElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGTextElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGTextElementBridge.java Wed Apr 1 14:35:42 2015
@@ -41,6 +41,14 @@ 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.bridge.TextNode.BackgroundMode;
import org.apache.batik.css.engine.CSSEngine;
import org.apache.batik.css.engine.CSSEngineEvent;
import org.apache.batik.css.engine.CSSStylableElement;
@@ -49,33 +57,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.TextNode.BackgroundMode;
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.SVG12CSSConstants;
import org.apache.batik.util.XMLConstants;
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGUseElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGUseElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGUseElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGUseElementBridge.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/ScriptingEnvironment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/ScriptingEnvironment.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/ScriptingEnvironment.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/ScriptingEnvironment.java Wed Apr 1 14:35:42 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() {
Copied: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/StrokingTextPainter.java (from r1670565, xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/StrokingTextPainter.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/StrokingTextPainter.java?p2=xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/StrokingTextPainter.java&p1=xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/StrokingTextPainter.java&r1=1670565&r2=1670661&rev=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/StrokingTextPainter.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/StrokingTextPainter.java Wed Apr 1 14:35:42 2015
@@ -19,6 +19,7 @@
package org.apache.batik.bridge;
+import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Paint;
import java.awt.RenderingHints;
@@ -29,6 +30,7 @@ import java.awt.font.TextAttribute;
import java.awt.geom.GeneralPath;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
+import java.lang.ref.SoftReference;
import java.text.AttributedCharacterIterator;
import java.text.AttributedString;
import java.text.CharacterIterator;
@@ -36,12 +38,15 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.apache.batik.bridge.BasicTextPainter.BasicMark;
+import org.apache.batik.bridge.TextNode.BackgroundMode;
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.GVTLineMetrics;
import org.apache.batik.gvt.text.AttributedCharacterSpanIterator;
import org.apache.batik.gvt.text.BidiAttributedCharacterIterator;
@@ -49,7 +54,6 @@ import org.apache.batik.gvt.text.GVTAttr
import org.apache.batik.gvt.text.TextPaintInfo;
import org.apache.batik.gvt.text.TextPath;
-
/**
* More sophisticated implementation of TextPainter which
* renders the attributed character iterator of a <code>TextNode</code>.
@@ -125,13 +129,20 @@ public class StrokingTextPainter extends
public static final GVTAttributedCharacterIterator.TextAttribute ALT_GLYPH_HANDLER =
GVTAttributedCharacterIterator.TextAttribute.ALT_GLYPH_HANDLER;
+ public static final
+ AttributedCharacterIterator.Attribute LINE_HEIGHT
+ = GVTAttributedCharacterIterator.TextAttribute.LINE_HEIGHT;
+
+ public static final
+ AttributedCharacterIterator.Attribute BACKGROUND_OUTLINE
+ = GVTAttributedCharacterIterator.TextAttribute.BACKGROUND_OUTLINE;
+
static Set extendedAtts = new HashSet();
static {
extendedAtts.add(FLOW_PARAGRAPH);
extendedAtts.add(TEXT_COMPOUND_ID);
extendedAtts.add(GVT_FONT);
- // extendedAtts.add(BIDI_LEVEL);
}
/**
@@ -160,13 +171,17 @@ public class StrokingTextPainter extends
List textRuns = getTextRuns(node, aci);
- // draw the underline and overline first, then the actual text
- // and finally the strikethrough
+ // 1. draw text node background
+ paintBackground(node, textRuns, g2d);
+ // 2. draw text run backgrounds
+ paintBackgrounds(node, textRuns, g2d);
+ // 3. draw text run underline and overline
paintDecorations(textRuns, g2d, TextSpanLayout.DECORATION_UNDERLINE);
paintDecorations(textRuns, g2d, TextSpanLayout.DECORATION_OVERLINE);
+ // 4. draw text run glyphs
paintTextRuns(textRuns, g2d);
- paintDecorations
- (textRuns, g2d, TextSpanLayout.DECORATION_STRIKETHROUGH);
+ // 5. draw text run strike through
+ paintDecorations(textRuns, g2d, TextSpanLayout.DECORATION_STRIKETHROUGH);
}
protected void printAttrs(AttributedCharacterIterator aci) {
@@ -852,6 +867,158 @@ public class StrokingTextPainter extends
}
/**
+ * Paint text node background.
+ */
+ protected void paintBackground(TextNode node, List textRuns, Graphics2D g2d) {
+ Map textAttributes = node.getTextAttributes();
+ if (textAttributes != null) {
+ TextPaintInfo tpi = (TextPaintInfo) textAttributes.get(PAINT_INFO);
+ if (tpi != null) {
+ if (tpi.visible) {
+ Paint paint = tpi.backgroundPaint;
+ BackgroundMode mode = tpi.backgroundMode;
+ if (paint != null) {
+ if ((paint instanceof Color) && (((Color)paint).getAlpha() != 0)) {
+ Rectangle2D bounds = computeBackgroundBounds(node, textRuns, mode);
+ if (!bounds.isEmpty()) {
+ g2d.setPaint(paint);
+ adjustForOutline(bounds, (float[]) textAttributes.get(BACKGROUND_OUTLINE));
+ g2d.fill(bounds);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private Rectangle2D computeBackgroundBounds(TextNode node, List textRuns, BackgroundMode mode) {
+ if (mode == BackgroundMode.BBOX) {
+ return computeBBoxBounds(node.getPrimitiveBounds());
+ } else if (mode == BackgroundMode.LINE_HEIGHT) {
+ TextRun run = (TextRun) textRuns.get(0);
+ TextSpanLayout layout = run.getLayout();
+ GVTLineMetrics lineMetrics = layout.getLineMetrics();
+ double ascent = lineMetrics.getAscent();
+ double descent = lineMetrics.getDescent();
+ double emHeight = ascent + descent;
+ GVTGlyphVector gv = layout.getGlyphVector();
+ Point2D firstPosition = gv.getGlyphPosition(0);
+ Map textAttributes = node.getTextAttributes();
+ double fontSize = (textAttributes != null) ? ((Float) textAttributes.get(TextAttribute.SIZE)).doubleValue() : 0d;
+ double lineHeight = (textAttributes != null) ? ((Float) textAttributes.get(LINE_HEIGHT)).doubleValue() : fontSize * 1.1f;
+ return computeLineHeightBounds(firstPosition, ascent, emHeight, lineHeight, node.getPrimitiveBounds().getWidth());
+ } else {
+ return new Rectangle2D.Double();
+ }
+ }
+
+ /**
+ * Paint text run backgrounds.
+ */
+ protected void paintBackgrounds(TextNode node, List textRuns, Graphics2D g2d) {
+ Map textAttributes = node.getTextAttributes();
+ if (textAttributes != null) {
+ TextPaintInfo tpiText = (TextPaintInfo) textAttributes.get(PAINT_INFO);
+ if (tpiText != null) {
+ if (tpiText.visible) {
+ int numRuns = textRuns.size();
+ List elements = new java.util.ArrayList(numRuns);
+ for (int i = 0; i < numRuns; i++) {
+ TextRun textRun = (TextRun)textRuns.get(i);
+ AttributedCharacterIterator runaci = textRun.getACI();
+ runaci.first();
+ elements.add(((SoftReference) runaci.getAttribute(TEXT_COMPOUND_ID)).get());
+ }
+ Set eDrawn = new HashSet();
+ for (int i = 0; i < numRuns; i++) {
+ TextRun textRun = (TextRun)textRuns.get(i);
+ AttributedCharacterIterator runaci = textRun.getACI();
+ runaci.first();
+ TextPaintInfo tpi = (TextPaintInfo)runaci.getAttribute(PAINT_INFO);
+ if (tpi != null) {
+ Object e = elements.get(i);
+ if ((tpi == tpiText) || eDrawn.contains(e))
+ continue;
+ else if (tpi.visible) {
+ Paint paint = tpi.backgroundPaint;
+ BackgroundMode mode = tpi.backgroundMode;
+ if (paint != null) {
+ if ((paint instanceof Color) && (((Color)paint).getAlpha() != 0)) {
+ GeneralPath p = new GeneralPath();
+ for (int j = i; j < numRuns; j++) {
+ Object eRun = elements.get(j);
+ if (eRun == e) {
+ Rectangle2D bRun = computeBackgroundBounds((TextRun) textRuns.get(j), mode);
+ p.append(bRun, false);
+ }
+ }
+ Rectangle2D bounds = p.getBounds2D();
+ if (!bounds.isEmpty()) {
+ g2d.setPaint(paint);
+ adjustForOutline(bounds, (float[]) runaci.getAttribute(BACKGROUND_OUTLINE));
+ g2d.fill(bounds);
+ }
+ }
+ }
+ eDrawn.add(e);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private Rectangle2D computeBackgroundBounds(TextRun run, BackgroundMode mode) {
+ if (mode == BackgroundMode.BBOX) {
+ return computeBBoxBounds(run.getLayout().getBounds2D());
+ } else if (mode == BackgroundMode.LINE_HEIGHT) {
+ TextSpanLayout layout = run.getLayout();
+ GVTLineMetrics lineMetrics = layout.getLineMetrics();
+ double ascent = lineMetrics.getAscent();
+ double descent = lineMetrics.getDescent();
+ double emHeight = ascent + descent;
+ GVTGlyphVector gv = layout.getGlyphVector();
+ Rectangle2D bbox = layout.getBounds2D();
+ Point2D firstPosition = new Point2D.Double(bbox.getX(), gv.getGlyphPosition(0).getY());
+ AttributedCharacterIterator aci = run.getACI();
+ double fontSize = (aci != null) ? ((Float) aci.getAttribute(TextAttribute.SIZE)).doubleValue() : 0d;
+ double lineHeight = (aci != null) ? ((Float) aci.getAttribute(LINE_HEIGHT)).doubleValue() : fontSize * 1.1f;
+ return computeLineHeightBounds(firstPosition, ascent, emHeight, lineHeight, bbox.getWidth());
+ } else {
+ return new Rectangle2D.Double();
+ }
+ }
+
+ private Rectangle2D computeBBoxBounds(Rectangle2D bbox) {
+ return bbox;
+ }
+
+ private Rectangle2D computeLineHeightBounds(
+ Point2D position, double ascent, double emHeight, double lineHeight, double width) {
+ double x = position.getX();
+ double y = position.getY() - (ascent / emHeight) * lineHeight;
+ double w = width;
+ double h = lineHeight;
+ return new Rectangle2D.Double(x, y, w, h);
+ }
+
+ private void adjustForOutline(Rectangle2D b, float[] outline) {
+ if (outline != null) {
+ double x = b.getX();
+ double y = b.getY();
+ double w = b.getWidth();
+ double h = b.getHeight();
+ x -= outline[3];
+ y -= outline[0];
+ w += outline[1] + outline[3];
+ h += outline[0] + outline[2];
+ b.setFrame(x, y, w, h);
+ }
+ }
+
+ /**
* Paints decorations of the specified type.
*/
protected void paintDecorations(List textRuns,
Copied: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/TextNode.java (from r1670565, xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/TextNode.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/TextNode.java?p2=xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/TextNode.java&p1=xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/TextNode.java&r1=1670565&r2=1670661&rev=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/TextNode.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/TextNode.java Wed Apr 1 14:35:42 2015
@@ -27,6 +27,7 @@ import java.awt.geom.Rectangle2D;
import java.text.AttributedCharacterIterator;
import java.text.CharacterIterator;
import java.util.List;
+import java.util.Map;
import org.apache.batik.gvt.AbstractGraphicsNode;
import org.apache.batik.gvt.Selectable;
@@ -63,6 +64,11 @@ public class TextNode extends AbstractGr
protected String text;
/**
+ * Attibutes that apply to text node as a whole (not to individual text runs).
+ */
+ protected Map textAttributes;
+
+ /**
* The begin mark.
*/
protected Mark beginMark = null;
@@ -165,6 +171,13 @@ public class TextNode extends AbstractGr
}
/**
+ * Returns the top level text attributes of text node.
+ */
+ public Map getTextAttributes() {
+ return textAttributes;
+ }
+
+ /**
* Sets the location of this text node.
*
* @param newLocation the new location of this text node
@@ -193,19 +206,25 @@ public class TextNode extends AbstractGr
fireGraphicsNodeChangeCompleted();
}
-
/**
* Sets the attributed character iterator of this text node.
*
* @param newAci the new attributed character iterator
+ * @param textAttributes top-level text node attributes map
*/
public void setAttributedCharacterIterator
(AttributedCharacterIterator newAci) {
+ this.setAttributedCharacterIterator(newAci, null);
+ }
+
+ public void setAttributedCharacterIterator
+ (AttributedCharacterIterator newAci, Map textAttributes) {
fireGraphicsNodeChangeStarted();
invalidateGeometryCache();
this.aci = newAci;
- text = null;
- textRuns = null;
+ this.text = null;
+ this.textAttributes = textAttributes;
+ this.textRuns = null;
fireGraphicsNodeChangeCompleted();
}
@@ -538,6 +557,11 @@ public class TextNode extends AbstractGr
}
}
}
+
+ public enum BackgroundMode {
+ BBOX,
+ LINE_HEIGHT;
+ };
}
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/TextUtilities.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/TextUtilities.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/TextUtilities.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/TextUtilities.java Wed Apr 1 14:35:42 2015
@@ -28,7 +28,6 @@ import org.apache.batik.css.engine.value
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.css.engine.value.svg12.LineHeightValue;
import org.apache.batik.css.engine.value.svg12.SVG12ValueConstants;
-import org.apache.batik.gvt.TextNode;
import org.apache.batik.util.CSSConstants;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -169,6 +168,8 @@ public abstract class TextUtilities impl
} else if (v.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT) {
if (v.getStringValue().equals(CSS_NORMAL_VALUE))
lineHeight = fontSize * 1.1f;
+ } else if (v.getPrimitiveType() == CSSPrimitiveValue.CSS_NUMBER) {
+ lineHeight = v.getFloatValue();
}
return Float.valueOf(lineHeight);
}
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/URIResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/URIResolver.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/URIResolver.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/URIResolver.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/UpdateManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/UpdateManager.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/UpdateManager.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/UpdateManager.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/UserAgent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/UserAgent.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/UserAgent.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/UserAgent.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/UserAgentAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/UserAgentAdapter.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/UserAgentAdapter.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/UserAgentAdapter.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/ViewBox.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/ViewBox.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/ViewBox.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/ViewBox.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/svg12/AbstractContentSelector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/AbstractContentSelector.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/AbstractContentSelector.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/AbstractContentSelector.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/svg12/BindableElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/BindableElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/BindableElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/BindableElementBridge.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/svg12/ContentManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/ContentManager.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/ContentManager.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/ContentManager.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/svg12/ContentSelectionChangedEvent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/ContentSelectionChangedEvent.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/ContentSelectionChangedEvent.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/ContentSelectionChangedEvent.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/svg12/DefaultContentSelector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/DefaultContentSelector.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/DefaultContentSelector.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/DefaultContentSelector.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/svg12/DefaultXBLManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/DefaultXBLManager.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/DefaultXBLManager.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/DefaultXBLManager.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/svg12/SVG12BridgeContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVG12BridgeContext.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVG12BridgeContext.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVG12BridgeContext.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/svg12/SVG12FocusManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVG12FocusManager.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVG12FocusManager.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVG12FocusManager.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/svg12/SVG12ScriptingEnvironment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVG12ScriptingEnvironment.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVG12ScriptingEnvironment.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVG12ScriptingEnvironment.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/svg12/SVG12TextElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVG12TextElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVG12TextElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVG12TextElementBridge.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/svg12/SVGFlowRootElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVGFlowRootElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVGFlowRootElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVGFlowRootElementBridge.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/svg12/SVGMultiImageElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVGMultiImageElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVGMultiImageElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVGMultiImageElementBridge.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/svg12/SVGSolidColorElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVGSolidColorElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVGSolidColorElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/SVGSolidColorElementBridge.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/svg12/XBLContentElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/XBLContentElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/XBLContentElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/XBLContentElementBridge.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/svg12/XPathPatternContentSelector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/XPathPatternContentSelector.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/XPathPatternContentSelector.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/XPathPatternContentSelector.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/bridge/svg12/XPathSubsetContentSelector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/XPathSubsetContentSelector.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/XPathSubsetContentSelector.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/svg12/XPathSubsetContentSelector.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/css/engine/SVG12CSSEngine.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/SVG12CSSEngine.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/SVG12CSSEngine.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/SVG12CSSEngine.java Wed Apr 1 14:35:42 2015
@@ -83,6 +83,7 @@ public class SVG12CSSEngine extends SVGC
*/
public static final ValueManager[] SVG_VALUE_MANAGERS = {
new MarginLengthManager(SVG12CSSConstants.CSS_INDENT_PROPERTY),
+ new LineHeightManager(),
new MarginLengthManager(SVG12CSSConstants.CSS_MARGIN_BOTTOM_PROPERTY),
new MarginLengthManager(SVG12CSSConstants.CSS_MARGIN_LEFT_PROPERTY),
new MarginLengthManager(SVG12CSSConstants.CSS_MARGIN_RIGHT_PROPERTY),
@@ -104,7 +105,8 @@ public class SVG12CSSEngine extends SVGC
// The property indexes.
//
public static final int INDENT_INDEX = SVGCSSEngine.FINAL_INDEX+1;
- public static final int MARGIN_BOTTOM_INDEX = INDENT_INDEX+1;
+ public static final int LINE_HEIGHT_INDEX = INDENT_INDEX + 1;
+ public static final int MARGIN_BOTTOM_INDEX = LINE_HEIGHT_INDEX+1;
public static final int MARGIN_LEFT_INDEX = MARGIN_BOTTOM_INDEX+1;
public static final int MARGIN_RIGHT_INDEX = MARGIN_LEFT_INDEX+1;
public static final int MARGIN_TOP_INDEX = MARGIN_RIGHT_INDEX+1;
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/svg12/LineHeightManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/svg12/LineHeightManager.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/svg12/LineHeightManager.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/svg12/LineHeightManager.java Wed Apr 1 14:35:42 2015
@@ -26,4 +26,7 @@ package org.apache.batik.css.engine.valu
* @version $Id$
*/
public class LineHeightManager extends org.apache.batik.css.engine.value.css2.LineHeightManager {
+ public LineHeightManager() {
+ super();
+ }
}
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGList.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGList.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGList.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGNormPathSegList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGNormPathSegList.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGNormPathSegList.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGNormPathSegList.java Wed Apr 1 14:35:42 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/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGNumberList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGNumberList.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGNumberList.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGNumberList.java Wed Apr 1 14:35:42 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}.
*/