You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-dev@xmlgraphics.apache.org by tk...@apache.org on 2001/02/01 14:45:51 UTC
cvs commit: xml-batik/sources/org/apache/batik/util UnitProcessor.java
tkormann 01/02/01 05:45:51
Modified: sources/org/apache/batik/bridge BridgeContext.java
CSSUtilities.java ConcreteBridgeContext.java
ConcreteGVTBuilder.java DefaultBridgeContext.java
DefaultUnitProcessorContext.java
SVGAElementBridge.java
SVGClipPathElementBridge.java
SVGGElementBridge.java SVGImageElementBridge.java
SVGLinearGradientBridge.java
SVGMaskElementBridge.java SVGPathElementBridge.java
SVGPatternElementBridge.java
SVGPolygonElementBridge.java
SVGPolylineElementBridge.java
SVGRadialGradientBridge.java
SVGSVGElementBridge.java SVGShapeElementBridge.java
SVGSwitchElementBridge.java
SVGTextElementBridge.java SVGUseElementBridge.java
SVGUtilities.java SVGViewport.java
sources/org/apache/batik/dom/svg DefaultSVGContext.java
DefaultUnitProcessorContext.java SVGContext.java
sources/org/apache/batik/experiment
TextPathElementBridge.java
sources/org/apache/batik/ext/awt/image/rendered
ColorMatrixRed.java
sources/org/apache/batik/parser AWTPathProducer.java
AWTPolygonProducer.java AWTPolylineProducer.java
AWTTransformProducer.java
sources/org/apache/batik/swing JSVGCanvas.java
sources/org/apache/batik/util UnitProcessor.java
Removed: sources/org/apache/batik/gvt GVTFactory.java
sources/org/apache/batik/parser ParserFactory.java
Log:
remove GVTFactory and ParserFactory and all the dependencies.
Revision Changes Path
1.7 +1 -27 xml-batik/sources/org/apache/batik/bridge/BridgeContext.java
Index: BridgeContext.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/BridgeContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BridgeContext.java 2000/12/17 23:20:46 1.6
+++ BridgeContext.java 2001/02/01 13:45:45 1.7
@@ -8,11 +8,9 @@
package org.apache.batik.bridge;
-import org.apache.batik.gvt.GVTFactory;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.gvt.GraphicsNodeRenderContext;
import org.apache.batik.gvt.filter.GraphicsNodeRableFactory;
-import org.apache.batik.parser.ParserFactory;
import org.apache.batik.script.InterpreterPool;
import org.w3c.dom.Element;
@@ -26,7 +24,7 @@
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
* @author <a href="mailto:etissandier@ilog.fr">Emmanuel Tissandier</a>
- * @version $Id: BridgeContext.java,v 1.6 2000/12/17 23:20:46 billh Exp $
+ * @version $Id: BridgeContext.java,v 1.7 2001/02/01 13:45:45 tkormann Exp $
*/
public interface BridgeContext {
@@ -141,30 +139,6 @@
* @param localName the local name
*/
void removeBridge(String namespaceURI, String localName);
-
- /**
- * Returns the GVT Factory that can be used to create <tt>GraphicsNode</tt>
- * objects.
- */
- GVTFactory getGVTFactory();
-
- /**
- * Sets the GVT factory to use to create <tt>GraphicsNode</tt>
- * @param gvtFactory the new gvt factory to use
- */
- void setGVTFactory(GVTFactory gvtFactory);
-
- /**
- * Returns the Parser factory that can be used to parse the
- * attributes of an <tt>Element</tt>.
- */
- ParserFactory getParserFactory();
-
- /**
- * Sets the Parser factory to use to parse XML attributes.
- * @param parserFactory the new parser factory to use
- */
- void setParserFactory(ParserFactory parserFactory);
/**
* Returns a GraphicsNodeRable factory
1.3 +4 -10 xml-batik/sources/org/apache/batik/bridge/CSSUtilities.java
Index: CSSUtilities.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/CSSUtilities.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CSSUtilities.java 2001/01/24 05:39:09 1.2
+++ CSSUtilities.java 2001/02/01 13:45:45 1.3
@@ -29,7 +29,6 @@
import org.apache.batik.gvt.CompositeGraphicsNode;
import org.apache.batik.gvt.CompositeShapePainter;
import org.apache.batik.gvt.FillShapePainter;
-import org.apache.batik.gvt.GVTFactory;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.gvt.GraphicsNodeRenderContext;
import org.apache.batik.gvt.ShapePainter;
@@ -60,7 +59,7 @@
* A collection of utility methods involving CSS.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: CSSUtilities.java,v 1.2 2001/01/24 05:39:09 vhardy Exp $
+ * @version $Id: CSSUtilities.java,v 1.3 2001/02/01 13:45:45 tkormann Exp $
*/
public class CSSUtilities implements SVGConstants {
@@ -326,7 +325,6 @@
CSSStyleDeclaration decl,
UnitProcessor.Context uctx){
- GVTFactory f = ctx.getGVTFactory();
// resolve fill
ShapePainter fillPainter = convertFill(svgElement, node, ctx,
decl, uctx);
@@ -335,7 +333,7 @@
decl, uctx);
ShapePainter painter = null;
if (fillPainter != null && strokePainter != null) {
- CompositeShapePainter comp = f.createCompositeShapePainter();
+ CompositeShapePainter comp = new CompositeShapePainter();
comp.addShapePainter(fillPainter);
comp.addShapePainter(strokePainter);
painter = comp;
@@ -364,8 +362,7 @@
Stroke stroke = convertStrokeToBasicStroke(svgElement, ctx, decl, uctx);
Paint paint = convertStrokeToPaint(svgElement, node, ctx, decl, uctx);
- StrokeShapePainter painter =
- ctx.getGVTFactory().createStrokeShapePainter();
+ StrokeShapePainter painter = new StrokeShapePainter();
painter.setStroke(stroke);
painter.setPaint(paint);
return painter;
@@ -409,8 +406,6 @@
BridgeContext ctx,
CSSStyleDeclaration decl,
UnitProcessor.Context uctx) {
- GVTFactory f = ctx.getGVTFactory();
-
// resolve the java.awt.Stroke of the StrokeShapePainter
CSSPrimitiveValue v =
(CSSPrimitiveValue)decl.getPropertyCSSValue(CSS_STROKE_WIDTH_PROPERTY);
@@ -517,7 +512,6 @@
CSSStyleDeclaration decl,
UnitProcessor.Context uctx) {
- GVTFactory f = ctx.getGVTFactory();
FillShapePainter painter = null;
Paint fillPaint = convertFillToPaint(svgElement,
node,
@@ -525,7 +519,7 @@
decl,
uctx);
if(fillPaint != null){
- painter = f.createFillShapePainter();
+ painter = new FillShapePainter();
painter.setPaint(fillPaint);
}
1.2 +1 -29 xml-batik/sources/org/apache/batik/bridge/ConcreteBridgeContext.java
Index: ConcreteBridgeContext.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/ConcreteBridgeContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConcreteBridgeContext.java 2001/01/23 17:06:22 1.1
+++ ConcreteBridgeContext.java 2001/02/01 13:45:45 1.2
@@ -8,11 +8,9 @@
package org.apache.batik.bridge;
-import org.apache.batik.gvt.GVTFactory;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.gvt.GraphicsNodeRenderContext;
import org.apache.batik.gvt.filter.GraphicsNodeRableFactory;
-import org.apache.batik.parser.ParserFactory;
import org.apache.batik.bridge.DocumentLoader;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.StyleReference;
@@ -43,7 +41,7 @@
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @author <a href="mailto:etissandier@ilog.fr">Emmanuel Tissandier</a>
* @author <a href="mailto:cjolif@ilog.fr">Christophe Jolif</a>
- * @version $Id: ConcreteBridgeContext.java,v 1.1 2001/01/23 17:06:22 tkormann Exp $
+ * @version $Id: ConcreteBridgeContext.java,v 1.2 2001/02/01 13:45:45 tkormann Exp $
*/
public class ConcreteBridgeContext implements BridgeContext {
@@ -79,16 +77,6 @@
private HashMap nodeStyleMap;
/**
- * The factory that creates GVT objects.
- */
- private GVTFactory gvtFactory;
-
- /**
- * The factory that creates parsers.
- */
- private ParserFactory parserFactory;
-
- /**
* The pool that contains all bridges.
*/
private BridgePool bridgePool = new BridgePool();
@@ -319,22 +307,6 @@
else
return Collections.EMPTY_LIST;
}
- }
-
- public GVTFactory getGVTFactory(){
- return gvtFactory;
- }
-
- public void setGVTFactory(GVTFactory gvtFactory){
- this.gvtFactory = gvtFactory;
- }
-
- public void setParserFactory(ParserFactory parserFactory){
- this.parserFactory = parserFactory;
- }
-
- public ParserFactory getParserFactory(){
- return parserFactory;
}
public GraphicsNodeRableFactory getGraphicsNodeRableFactory(){
1.2 +2 -2 xml-batik/sources/org/apache/batik/bridge/ConcreteGVTBuilder.java
Index: ConcreteGVTBuilder.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/ConcreteGVTBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConcreteGVTBuilder.java 2001/01/23 17:06:22 1.1
+++ ConcreteGVTBuilder.java 2001/02/01 13:45:46 1.2
@@ -60,7 +60,7 @@
* @author <a href="mailto:etissandier@ilog.fr">Emmanuel Tissandier</a>
* @author <a href="mailto:cjolif@ilog.fr">Christophe Jolif</a>
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: ConcreteGVTBuilder.java,v 1.1 2001/01/23 17:06:22 tkormann Exp $
+ * @version $Id: ConcreteGVTBuilder.java,v 1.2 2001/02/01 13:45:46 tkormann Exp $
*/
public class ConcreteGVTBuilder implements GVTBuilder, SVGConstants {
/**
@@ -69,7 +69,7 @@
* @param svgDocument the DOM tree that represents an SVG document
*/
public GraphicsNode build(BridgeContext ctx, Document svgDocument){
- RootGraphicsNode root = ctx.getGVTFactory().createRootGraphicsNode();
+ RootGraphicsNode root = new RootGraphicsNode();
Element svgRoot = svgDocument.getDocumentElement();
// Now, build corresponding canvas
1.3 +1 -7 xml-batik/sources/org/apache/batik/bridge/DefaultBridgeContext.java
Index: DefaultBridgeContext.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/DefaultBridgeContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultBridgeContext.java 2001/01/24 16:03:12 1.2
+++ DefaultBridgeContext.java 2001/02/01 13:45:46 1.3
@@ -8,8 +8,6 @@
package org.apache.batik.bridge;
-import org.apache.batik.gvt.GVTFactory;
-import org.apache.batik.parser.ParserFactory;
import org.apache.batik.dom.svg.SVGDocumentLoader;
import org.apache.batik.bridge.BufferedDocumentLoader;
import org.apache.batik.bridge.BufferedDocumentLoader;
@@ -29,15 +27,13 @@
* A default bridge context.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
- * @version $Id: DefaultBridgeContext.java,v 1.2 2001/01/24 16:03:12 tkormann Exp $
+ * @version $Id: DefaultBridgeContext.java,v 1.3 2001/02/01 13:45:46 tkormann Exp $
*/
public class DefaultBridgeContext extends SVGBridgeContext {
public DefaultBridgeContext(UserAgent userAgent, SVGDocument svgDocument) {
setDocumentLoader(new BufferedDocumentLoader
(new SVGDocumentLoader(userAgent.getXMLParserClassName())));
- setGVTFactory(GVTFactory.getGVTFactoryImplementation());
- setParserFactory(new ParserFactory());
setGraphicsNodeRableFactory(new ConcreteGraphicsNodeRableFactory());
setUserAgent(userAgent);
setGVTBuilder(new ConcreteGVTBuilder());
@@ -51,8 +47,6 @@
// <!> deprecated
setDocumentLoader(new BufferedDocumentLoader
(new SVGDocumentLoader(parser)));
- setGVTFactory(GVTFactory.getGVTFactoryImplementation());
- setParserFactory(new ParserFactory());
setGraphicsNodeRableFactory(new ConcreteGraphicsNodeRableFactory());
setGVTBuilder(new ConcreteGVTBuilder());
setUserAgent(new DefaultUserAgent(parser));
1.2 +1 -9 xml-batik/sources/org/apache/batik/bridge/DefaultUnitProcessorContext.java
Index: DefaultUnitProcessorContext.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/DefaultUnitProcessorContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultUnitProcessorContext.java 2001/01/23 17:06:23 1.1
+++ DefaultUnitProcessorContext.java 2001/02/01 13:45:46 1.2
@@ -9,7 +9,6 @@
package org.apache.batik.bridge;
import org.apache.batik.bridge.BridgeContext;
-import org.apache.batik.parser.ParserFactory;
import org.apache.batik.util.UnitProcessor;
import org.apache.batik.bridge.Viewport;
@@ -22,7 +21,7 @@
* The default unit processor context.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
- * @version $Id: DefaultUnitProcessorContext.java,v 1.1 2001/01/23 17:06:23 tkormann Exp $
+ * @version $Id: DefaultUnitProcessorContext.java,v 1.2 2001/02/01 13:45:46 tkormann Exp $
*/
public class DefaultUnitProcessorContext implements UnitProcessor.Context {
@@ -40,13 +39,6 @@
*/
public float getPixelToMM() {
return ctx.getUserAgent().getPixelToMM();
- }
-
- /**
- * Returns the parser factory.
- */
- public ParserFactory getParserFactory() {
- return ctx.getParserFactory();
}
/**
1.3 +5 -8 xml-batik/sources/org/apache/batik/bridge/SVGAElementBridge.java
Index: SVGAElementBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGAElementBridge.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGAElementBridge.java 2001/01/24 05:39:10 1.2
+++ SVGAElementBridge.java 2001/02/01 13:45:46 1.3
@@ -49,21 +49,18 @@
* A factory for the <a> SVG element.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: SVGAElementBridge.java,v 1.2 2001/01/24 05:39:10 vhardy Exp $
+ * @version $Id: SVGAElementBridge.java,v 1.3 2001/02/01 13:45:46 tkormann Exp $
*/
public class SVGAElementBridge implements GraphicsNodeBridge, SVGConstants {
- public GraphicsNode createGraphicsNode(BridgeContext ctx, Element element){
+ public GraphicsNode createGraphicsNode(BridgeContext ctx, Element element) {
CompositeGraphicsNode gn;
- gn = ctx.getGVTFactory().createCompositeGraphicsNode();
+ gn = new CompositeGraphicsNode();
// Initialize the transform
AffineTransform at =
- SVGUtilities.convertAffineTransform(element,
- ATTR_TRANSFORM,
- ctx.getParserFactory());
-
+ SVGUtilities.convertAffineTransform(element, ATTR_TRANSFORM);
gn.setTransform(at);
CSSStyleDeclaration decl;
@@ -81,7 +78,7 @@
return gn;
}
- public void buildGraphicsNode(GraphicsNode gn,
+ public void buildGraphicsNode(GraphicsNode gn,
BridgeContext ctx,
Element element) {
CSSStyleDeclaration decl;
1.3 +4 -7 xml-batik/sources/org/apache/batik/bridge/SVGClipPathElementBridge.java
Index: SVGClipPathElementBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGClipPathElementBridge.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGClipPathElementBridge.java 2001/01/24 05:39:10 1.2
+++ SVGClipPathElementBridge.java 2001/02/01 13:45:46 1.3
@@ -21,7 +21,6 @@
import org.apache.batik.bridge.IllegalAttributeValueException;
import org.apache.batik.bridge.ObjectBoundingBoxViewport;
import org.apache.batik.bridge.Viewport;
-import org.apache.batik.gvt.GVTFactory;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.gvt.GraphicsNodeRenderContext;
import org.apache.batik.gvt.ShapeNode;
@@ -43,7 +42,7 @@
* A factory for the <clipPath> SVG element.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
- * @version $Id: SVGClipPathElementBridge.java,v 1.2 2001/01/24 05:39:10 vhardy Exp $
+ * @version $Id: SVGClipPathElementBridge.java,v 1.3 2001/02/01 13:45:46 tkormann Exp $
*/
public class SVGClipPathElementBridge implements ClipBridge, SVGConstants {
@@ -71,13 +70,11 @@
GraphicsNodeRenderContext rc = ctx.getGraphicsNodeRenderContext();
Area clipPath = new Area();
GVTBuilder builder = ctx.getGVTBuilder();
- GVTFactory gvtFactory = ctx.getGVTFactory();
// parse the transform attribute
AffineTransform Tx =
SVGUtilities.convertAffineTransform(clipElement,
- ATTR_TRANSFORM,
- ctx.getParserFactory());
+ ATTR_TRANSFORM);
// parse the clipPathUnits attribute
Viewport oldViewport = ctx.getCurrentViewport();
@@ -133,7 +130,7 @@
Shape outline = Tx.createTransformedShape(path);
// apply the clip-path of the current Element
- ShapeNode outlineNode = gvtFactory.createShapeNode();
+ ShapeNode outlineNode = new ShapeNode();
outlineNode.setShape(outline);
Clip clip = CSSUtilities.convertClipPath(child,
outlineNode,
@@ -152,7 +149,7 @@
}
// apply the clip-path of this clipPath Element (already in user space)
- ShapeNode clipPathNode = gvtFactory.createShapeNode();
+ ShapeNode clipPathNode = new ShapeNode();
clipPathNode.setShape(clipPath);
Clip clipElementClipPath =
CSSUtilities.convertClipPath(clipElement, clipPathNode, ctx);
1.3 +7 -8 xml-batik/sources/org/apache/batik/bridge/SVGGElementBridge.java
Index: SVGGElementBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGGElementBridge.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGGElementBridge.java 2001/01/24 05:39:15 1.2
+++ SVGGElementBridge.java 2001/02/01 13:45:46 1.3
@@ -42,20 +42,18 @@
* A factory for the <g> SVG element.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: SVGGElementBridge.java,v 1.2 2001/01/24 05:39:15 vhardy Exp $
+ * @version $Id: SVGGElementBridge.java,v 1.3 2001/02/01 13:45:46 tkormann Exp $
*/
public class SVGGElementBridge implements GraphicsNodeBridge, SVGConstants {
public GraphicsNode createGraphicsNode(BridgeContext ctx, Element element) {
CompositeGraphicsNode gn;
- gn = ctx.getGVTFactory().createCompositeGraphicsNode();
+ gn = new CompositeGraphicsNode();
// Initialize the transform
AffineTransform at =
- SVGUtilities.convertAffineTransform(element,
- ATTR_TRANSFORM,
- ctx.getParserFactory());
+ SVGUtilities.convertAffineTransform(element, ATTR_TRANSFORM);
gn.setTransform(at);
CSSStyleDeclaration decl;
@@ -63,9 +61,10 @@
UnitProcessor.Context uctx
= new DefaultUnitProcessorContext(ctx, decl);
- Rectangle2D rect = CSSUtilities.convertEnableBackground((SVGElement)element,
- decl,
- uctx);
+ Rectangle2D rect =
+ CSSUtilities.convertEnableBackground((SVGElement)element,
+ decl,
+ uctx);
if (rect != null) {
gn.setBackgroundEnable(rect);
}
1.3 +6 -9 xml-batik/sources/org/apache/batik/bridge/SVGImageElementBridge.java
Index: SVGImageElementBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGImageElementBridge.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGImageElementBridge.java 2001/01/24 05:39:15 1.2
+++ SVGImageElementBridge.java 2001/02/01 13:45:46 1.3
@@ -61,7 +61,7 @@
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @author <a href="mailto:Thomas.DeWeeese@Kodak.com">Thomas DeWeese</a>
- * @version $Id: SVGImageElementBridge.java,v 1.2 2001/01/24 05:39:15 vhardy Exp $
+ * @version $Id: SVGImageElementBridge.java,v 1.3 2001/02/01 13:45:46 tkormann Exp $
*/
public class SVGImageElementBridge implements GraphicsNodeBridge,
SVGConstants {
@@ -118,13 +118,11 @@
throw new IllegalAttributeValueException(
Messages.formatMessage("image.xlinkHref.badImageType", null));
}
- ImageNode imgNode = ctx.getGVTFactory().createImageNode();
+ ImageNode imgNode = new ImageNode();
imgNode.setImage(node);
// initialize the transform
AffineTransform at =
- SVGUtilities.convertAffineTransform(element,
- ATTR_TRANSFORM,
- ctx.getParserFactory());
+ SVGUtilities.convertAffineTransform(element, ATTR_TRANSFORM);
imgNode.setTransform(at);
// bind it as soon as it's available...
ctx.bind(element, imgNode);
@@ -163,7 +161,7 @@
protected GraphicsNode createBase64ImageNode(BridgeContext ctx,
SVGElement svgElement,
String uriStr) {
- RasterImageNode node = ctx.getGVTFactory().createRasterImageNode();
+ RasterImageNode node = new RasterImageNode();
// create the image
Rectangle2D bounds = getImageBounds(ctx, svgElement);
node.setImage(RasterRable.create(uriStr, bounds));
@@ -174,7 +172,7 @@
protected GraphicsNode createRasterImageNode(BridgeContext ctx,
SVGElement svgElement,
URL url) {
- RasterImageNode node = ctx.getGVTFactory().createRasterImageNode();
+ RasterImageNode node = new RasterImageNode();
// create the image
Rectangle2D bounds = getImageBounds(ctx, svgElement);
node.setImage(RasterRable.create(url, bounds));
@@ -193,8 +191,7 @@
ctx.setViewCSS((ViewCSS)((SVGOMDocument)imgDocument).getDefaultView());
SVGSVGElement svgElement = imgDocument.getRootElement();
- CompositeGraphicsNode result =
- ctx.getGVTFactory().createCompositeGraphicsNode();
+ CompositeGraphicsNode result = new CompositeGraphicsNode();
CSSStyleDeclaration decl;
decl = ctx.getViewCSS().getComputedStyle(element, null);
1.2 +2 -3 xml-batik/sources/org/apache/batik/bridge/SVGLinearGradientBridge.java
Index: SVGLinearGradientBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGLinearGradientBridge.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGLinearGradientBridge.java 2001/01/23 17:06:36 1.1
+++ SVGLinearGradientBridge.java 2001/02/01 13:45:46 1.2
@@ -36,7 +36,7 @@
* a <tt>LinearGradientPaint</tt>
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGLinearGradientBridge.java,v 1.1 2001/01/23 17:06:36 tkormann Exp $
+ * @version $Id: SVGLinearGradientBridge.java,v 1.2 2001/02/01 13:45:46 tkormann Exp $
*/
public class SVGLinearGradientBridge extends SVGGradientBridge
implements PaintBridge {
@@ -152,8 +152,7 @@
// Extract gradient transform
AffineTransform at =
SVGUtilities.convertAffineTransform(paintElement,
- ATTR_GRADIENT_TRANSFORM,
- ctx.getParserFactory());
+ ATTR_GRADIENT_TRANSFORM);
at = SVGUtilities.convertAffineTransform(at, paintedNode,
rc, unitsType);
1.3 +6 -11 xml-batik/sources/org/apache/batik/bridge/SVGMaskElementBridge.java
Index: SVGMaskElementBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGMaskElementBridge.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGMaskElementBridge.java 2001/01/24 05:39:16 1.2
+++ SVGMaskElementBridge.java 2001/02/01 13:45:46 1.3
@@ -46,7 +46,7 @@
*
* @author <a href="mailto:Thomas.DeWeeese@Kodak.com">Thomas DeWeese</a>
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
- * @version $Id: SVGMaskElementBridge.java,v 1.2 2001/01/24 05:39:16 vhardy Exp $
+ * @version $Id: SVGMaskElementBridge.java,v 1.3 2001/02/01 13:45:46 tkormann Exp $
*/
public class SVGMaskElementBridge implements MaskBridge, SVGConstants {
@@ -59,7 +59,7 @@
Element maskElement,
Element maskedElement) {
- GraphicsNodeRenderContext rc =
+ GraphicsNodeRenderContext rc =
bridgeContext.getGraphicsNodeRenderContext();
//
@@ -75,7 +75,7 @@
= SVGUtilities.convertMaskRegion(maskElement,
maskedElement,
maskedNode,
- rc,
+ rc,
uctx);
//
@@ -103,10 +103,8 @@
}
GVTBuilder builder = bridgeContext.getGVTBuilder();
- CompositeGraphicsNode maskNode
- = bridgeContext.getGVTFactory().createCompositeGraphicsNode();
- CompositeGraphicsNode maskNodeContent
- = bridgeContext.getGVTFactory().createCompositeGraphicsNode();
+ CompositeGraphicsNode maskNode = new CompositeGraphicsNode();
+ CompositeGraphicsNode maskNodeContent = new CompositeGraphicsNode();
maskNode.getChildren().add(maskNodeContent);
boolean hasChildren = false;
for(Node node=maskElement.getFirstChild();
@@ -138,10 +136,7 @@
// Get the mask transform
AffineTransform at =
- SVGUtilities.convertAffineTransform(maskElement,
- ATTR_TRANSFORM,
- bridgeContext.getParserFactory());
-
+ SVGUtilities.convertAffineTransform(maskElement, ATTR_TRANSFORM);
at = SVGUtilities.convertAffineTransform(at,
maskedNode,
1.2 +2 -2 xml-batik/sources/org/apache/batik/bridge/SVGPathElementBridge.java
Index: SVGPathElementBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGPathElementBridge.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGPathElementBridge.java 2001/01/23 17:06:37 1.1
+++ SVGPathElementBridge.java 2001/02/01 13:45:46 1.2
@@ -31,7 +31,7 @@
* A factory for the <path> element.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: SVGPathElementBridge.java,v 1.1 2001/01/23 17:06:37 tkormann Exp $
+ * @version $Id: SVGPathElementBridge.java,v 1.2 2001/02/01 13:45:46 tkormann Exp $
*/
public class SVGPathElementBridge extends SVGShapeElementBridge {
@@ -57,7 +57,7 @@
throw new MissingAttributeException(
Messages.formatMessage("path.d.required", null));
}
- PathParser p = ctx.getParserFactory().createPathParser();
+ PathParser p = new PathParser();
AWTPathProducer ph = new AWTPathProducer();
ph.setWindingRule(wr);
p.setPathHandler(ph);
1.4 +4 -9 xml-batik/sources/org/apache/batik/bridge/SVGPatternElementBridge.java
Index: SVGPatternElementBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGPatternElementBridge.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SVGPatternElementBridge.java 2001/01/24 16:03:12 1.3
+++ SVGPatternElementBridge.java 2001/02/01 13:45:46 1.4
@@ -21,12 +21,10 @@
import org.apache.batik.bridge.PaintBridge;
import org.apache.batik.bridge.Viewport;
import org.apache.batik.gvt.CompositeGraphicsNode;
-import org.apache.batik.gvt.GVTFactory;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.gvt.GraphicsNodeRenderContext;
import org.apache.batik.ext.awt.image.renderable.Filter;
import org.apache.batik.gvt.filter.GraphicsNodeRableFactory;
-import org.apache.batik.parser.ParserFactory;
import org.apache.batik.bridge.resources.Messages;
import org.apache.batik.gvt.PatternPaint;
import org.apache.batik.ext.awt.image.renderable.ClipRable8Bit;
@@ -44,7 +42,7 @@
* a <tt>PatternPaint</tt>
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGPatternElementBridge.java,v 1.3 2001/01/24 16:03:12 tkormann Exp $
+ * @version $Id: SVGPatternElementBridge.java,v 1.4 2001/02/01 13:45:46 tkormann Exp $
*/
public class SVGPatternElementBridge implements PaintBridge, SVGConstants {
@@ -112,8 +110,7 @@
// Build pattern content
GVTBuilder builder = ctx.getGVTBuilder();
- CompositeGraphicsNode patternContentNode
- = ctx.getGVTFactory().createCompositeGraphicsNode();
+ CompositeGraphicsNode patternContentNode = new CompositeGraphicsNode();
// build the GVT tree that represents the pattern
boolean hasChildren = false;
@@ -148,8 +145,7 @@
// Get the patternTransfrom
AffineTransform patternTransform =
SVGUtilities.convertAffineTransform(paintElement,
- ATTR_PATTERN_TRANSFORM,
- ctx.getParserFactory());
+ ATTR_PATTERN_TRANSFORM);
// Get the overflow property on the pattern element
CSSStyleDeclaration cssDecl
@@ -220,14 +216,13 @@
// depending on overflow)
// + one for the viewBox to patternRegion transform
//
- GVTFactory gvtFactory = ctx.getGVTFactory();
AffineTransform nodeTransform = null;
if(hasViewBox){
nodeTransform = preserveAspectRatioTransform;
if(!overflow){
// Need to do clipping
CompositeGraphicsNode newPatternContentNode
- = gvtFactory.createCompositeGraphicsNode();
+ = new CompositeGraphicsNode();
newPatternContentNode.getChildren().add(patternContentNode);
1.2 +2 -2 xml-batik/sources/org/apache/batik/bridge/SVGPolygonElementBridge.java
Index: SVGPolygonElementBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGPolygonElementBridge.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGPolygonElementBridge.java 2001/01/23 17:06:37 1.1
+++ SVGPolygonElementBridge.java 2001/02/01 13:45:46 1.2
@@ -31,7 +31,7 @@
* A factory for the <polygon> element.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: SVGPolygonElementBridge.java,v 1.1 2001/01/23 17:06:37 tkormann Exp $
+ * @version $Id: SVGPolygonElementBridge.java,v 1.2 2001/02/01 13:45:46 tkormann Exp $
*/
public class SVGPolygonElementBridge extends SVGShapeElementBridge {
@@ -57,7 +57,7 @@
throw new MissingAttributeException(
Messages.formatMessage("polygon.points.required", null));
}
- PointsParser p = ctx.getParserFactory().createPointsParser();
+ PointsParser p = new PointsParser();
AWTPolygonProducer ph = new AWTPolygonProducer();
ph.setWindingRule(wr);
p.setPointsHandler(ph);
1.2 +2 -2 xml-batik/sources/org/apache/batik/bridge/SVGPolylineElementBridge.java
Index: SVGPolylineElementBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGPolylineElementBridge.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGPolylineElementBridge.java 2001/01/23 17:06:38 1.1
+++ SVGPolylineElementBridge.java 2001/02/01 13:45:46 1.2
@@ -31,7 +31,7 @@
* A factory for the <polyline> element.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: SVGPolylineElementBridge.java,v 1.1 2001/01/23 17:06:38 tkormann Exp $
+ * @version $Id: SVGPolylineElementBridge.java,v 1.2 2001/02/01 13:45:46 tkormann Exp $
*/
public class SVGPolylineElementBridge extends SVGShapeElementBridge {
@@ -57,7 +57,7 @@
throw new MissingAttributeException(
Messages.formatMessage("polyline.points.required", null));
}
- PointsParser p = ctx.getParserFactory().createPointsParser();
+ PointsParser p = new PointsParser();
AWTPolylineProducer ph = new AWTPolylineProducer();
ph.setWindingRule(wr);
p.setPointsHandler(ph);
1.2 +2 -3 xml-batik/sources/org/apache/batik/bridge/SVGRadialGradientBridge.java
Index: SVGRadialGradientBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGRadialGradientBridge.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGRadialGradientBridge.java 2001/01/23 17:06:38 1.1
+++ SVGRadialGradientBridge.java 2001/02/01 13:45:46 1.2
@@ -37,7 +37,7 @@
* a <tt>RadialGradientPaint</tt>
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGRadialGradientBridge.java,v 1.1 2001/01/23 17:06:38 tkormann Exp $
+ * @version $Id: SVGRadialGradientBridge.java,v 1.2 2001/02/01 13:45:46 tkormann Exp $
*/
public class SVGRadialGradientBridge extends SVGGradientBridge
implements PaintBridge {
@@ -163,8 +163,7 @@
// Extract gradient transform
AffineTransform at =
SVGUtilities.convertAffineTransform(paintElement,
- ATTR_GRADIENT_TRANSFORM,
- ctx.getParserFactory());
+ ATTR_GRADIENT_TRANSFORM);
at = SVGUtilities.convertAffineTransform(at, paintedNode, rc,
unitsType);
1.3 +2 -3 xml-batik/sources/org/apache/batik/bridge/SVGSVGElementBridge.java
Index: SVGSVGElementBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGSVGElementBridge.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGSVGElementBridge.java 2001/01/24 05:39:16 1.2
+++ SVGSVGElementBridge.java 2001/02/01 13:45:46 1.3
@@ -37,7 +37,7 @@
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: SVGSVGElementBridge.java,v 1.2 2001/01/24 05:39:16 vhardy Exp $
+ * @version $Id: SVGSVGElementBridge.java,v 1.3 2001/02/01 13:45:46 tkormann Exp $
*/
public class SVGSVGElementBridge implements GraphicsNodeBridge, SVGConstants {
@@ -49,8 +49,7 @@
UnitProcessor.Context uctx
= new DefaultUnitProcessorContext(ctx,
cssDecl);
- CanvasGraphicsNode node
- = ctx.getGVTFactory().createCanvasGraphicsNode();
+ CanvasGraphicsNode node = new CanvasGraphicsNode();
float x;
float y;
float w;
1.3 +4 -6 xml-batik/sources/org/apache/batik/bridge/SVGShapeElementBridge.java
Index: SVGShapeElementBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGShapeElementBridge.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGShapeElementBridge.java 2001/01/24 05:39:16 1.2
+++ SVGShapeElementBridge.java 2001/02/01 13:45:46 1.3
@@ -41,7 +41,7 @@
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @author <a href="mailto:cjolif@ilog.fr">Christophe Jolif</a>
- * @version $Id: SVGShapeElementBridge.java,v 1.2 2001/01/24 05:39:16 vhardy Exp $
+ * @version $Id: SVGShapeElementBridge.java,v 1.3 2001/02/01 13:45:46 tkormann Exp $
*/
public abstract class SVGShapeElementBridge implements GraphicsNodeBridge,
SVGConstants {
@@ -53,12 +53,10 @@
UnitProcessor.Context uctx
= new DefaultUnitProcessorContext(ctx,
cssDecl);
- ShapeNode node = ctx.getGVTFactory().createShapeNode();
+ ShapeNode node = new ShapeNode();
// Initialize the transform
AffineTransform at =
- SVGUtilities.convertAffineTransform(element,
- ATTR_TRANSFORM,
- ctx.getParserFactory());
+ SVGUtilities.convertAffineTransform(element, ATTR_TRANSFORM);
node.setTransform(at);
// Initialize the shape of the ShapeNode
buildShape(ctx, svgElement, node, cssDecl, uctx);
@@ -66,7 +64,7 @@
return node;
}
- public void buildGraphicsNode(GraphicsNode gn,
+ public void buildGraphicsNode(GraphicsNode gn,
BridgeContext ctx,
Element element) {
ShapeNode node = (ShapeNode)gn;
1.3 +4 -6 xml-batik/sources/org/apache/batik/bridge/SVGSwitchElementBridge.java
Index: SVGSwitchElementBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGSwitchElementBridge.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGSwitchElementBridge.java 2001/01/24 05:39:17 1.2
+++ SVGSwitchElementBridge.java 2001/02/01 13:45:46 1.3
@@ -41,7 +41,7 @@
* A factory for the <switch> SVG element.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: SVGSwitchElementBridge.java,v 1.2 2001/01/24 05:39:17 vhardy Exp $
+ * @version $Id: SVGSwitchElementBridge.java,v 1.3 2001/02/01 13:45:46 tkormann Exp $
*/
public class SVGSwitchElementBridge
implements GraphicsNodeBridge,
@@ -50,11 +50,9 @@
public GraphicsNode createGraphicsNode(BridgeContext ctx,
Element element){
CompositeGraphicsNode gn;
- gn = ctx.getGVTFactory().createCompositeGraphicsNode();
+ gn = new CompositeGraphicsNode();
AffineTransform at =
- SVGUtilities.convertAffineTransform(element,
- ATTR_TRANSFORM,
- ctx.getParserFactory());
+ SVGUtilities.convertAffineTransform(element, ATTR_TRANSFORM);
gn.setTransform(at);
@@ -73,7 +71,7 @@
return gn;
}
- public void buildGraphicsNode(GraphicsNode gn,
+ public void buildGraphicsNode(GraphicsNode gn,
BridgeContext ctx,
Element element) {
1.6 +3 -5 xml-batik/sources/org/apache/batik/bridge/SVGTextElementBridge.java
Index: SVGTextElementBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGTextElementBridge.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SVGTextElementBridge.java 2001/01/31 17:54:14 1.5
+++ SVGTextElementBridge.java 2001/02/01 13:45:46 1.6
@@ -66,7 +66,7 @@
* A factory for the <text> SVG element.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: SVGTextElementBridge.java,v 1.5 2001/01/31 17:54:14 billh Exp $
+ * @version $Id: SVGTextElementBridge.java,v 1.6 2001/02/01 13:45:46 tkormann Exp $
*/
public class SVGTextElementBridge implements GraphicsNodeBridge, SVGConstants {
protected final static Map fonts = new HashMap(11);
@@ -108,7 +108,7 @@
public GraphicsNode createGraphicsNode(BridgeContext ctx,
Element element){
- TextNode result = ctx.getGVTFactory().createTextNode();
+ TextNode result = new TextNode();
result.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
@@ -120,9 +120,7 @@
// Transform
AffineTransform at =
- SVGUtilities.convertAffineTransform(element,
- ATTR_TRANSFORM,
- ctx.getParserFactory());
+ SVGUtilities.convertAffineTransform(element, ATTR_TRANSFORM);
result.setTransform(at);
// parse the x attribute, (default is 0)
1.3 +8 -10 xml-batik/sources/org/apache/batik/bridge/SVGUseElementBridge.java
Index: SVGUseElementBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGUseElementBridge.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGUseElementBridge.java 2001/01/24 05:39:17 1.2
+++ SVGUseElementBridge.java 2001/02/01 13:45:46 1.3
@@ -42,7 +42,7 @@
* A factory for the <use> SVG element.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: SVGUseElementBridge.java,v 1.2 2001/01/24 05:39:17 vhardy Exp $
+ * @version $Id: SVGUseElementBridge.java,v 1.3 2001/02/01 13:45:46 tkormann Exp $
*/
public class SVGUseElementBridge
implements GraphicsNodeBridge,
@@ -51,8 +51,7 @@
public GraphicsNode createGraphicsNode(BridgeContext ctx,
Element element){
- CompositeGraphicsNode gn;
- gn = ctx.getGVTFactory().createCompositeGraphicsNode();
+ CompositeGraphicsNode gn = new CompositeGraphicsNode();
CSSStyleDeclaration decl
= ctx.getViewCSS().getComputedStyle(element, null);
@@ -83,15 +82,14 @@
AffineTransform at = AffineTransform.getTranslateInstance(x, y);
at.preConcatenate(
- SVGUtilities.convertAffineTransform(element,
- ATTR_TRANSFORM,
- ctx.getParserFactory()));
+ SVGUtilities.convertAffineTransform(element, ATTR_TRANSFORM));
gn.setTransform(at);
- Rectangle2D rect = CSSUtilities.convertEnableBackground((SVGElement)element,
- decl,
- uctx);
+ Rectangle2D rect =
+ CSSUtilities.convertEnableBackground((SVGElement)element,
+ decl,
+ uctx);
if (rect != null) {
gn.setBackgroundEnable(rect);
}
@@ -99,7 +97,7 @@
return gn;
}
- public void buildGraphicsNode(GraphicsNode gn,
+ public void buildGraphicsNode(GraphicsNode gn,
BridgeContext ctx,
Element element) {
CSSStyleDeclaration decl
1.2 +6 -8 xml-batik/sources/org/apache/batik/bridge/SVGUtilities.java
Index: SVGUtilities.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGUtilities.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGUtilities.java 2001/01/23 17:06:42 1.1
+++ SVGUtilities.java 2001/02/01 13:45:47 1.2
@@ -26,7 +26,6 @@
import org.apache.batik.parser.LengthHandler;
import org.apache.batik.parser.LengthParser;
import org.apache.batik.parser.ParseException;
-import org.apache.batik.parser.ParserFactory;
import org.apache.batik.parser.PreserveAspectRatioHandler;
import org.apache.batik.parser.PreserveAspectRatioParser;
import org.apache.batik.parser.PreserveAspectRatioParser;
@@ -46,7 +45,7 @@
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
- * @version $Id: SVGUtilities.java,v 1.1 2001/01/23 17:06:42 tkormann Exp $
+ * @version $Id: SVGUtilities.java,v 1.2 2001/02/01 13:45:47 tkormann Exp $
*/
public class SVGUtilities implements SVGConstants {
/**
@@ -1061,11 +1060,10 @@
* @param pf the parser factory to use
*/
public static AffineTransform convertAffineTransform(Element e,
- String attrName,
- ParserFactory pf) {
+ String attrName) {
try {
StringReader r = new StringReader(e.getAttributeNS(null, attrName));
- return AWTTransformProducer.createAffineTransform(r, pf);
+ return AWTTransformProducer.createAffineTransform(r);
} catch (ParseException ex) {
throw new IllegalAttributeValueException(
Messages.formatMessage("transform.invalid",
@@ -1162,7 +1160,7 @@
throw new Error("The value is null or empty");
}
- LengthParser p = uctx.getParserFactory().createLengthParser();
+ LengthParser p = new LengthParser();
UnitProcessor.UnitResolver ur = new UnitProcessor.UnitResolver();
p.setLengthHandler(ur);
try {
@@ -1200,7 +1198,7 @@
throw new Error("The value is null or empty");
}
- LengthParser p = uctx.getParserFactory().createLengthParser();
+ LengthParser p = new LengthParser();
UnitProcessor.UnitResolver ur = new UnitProcessor.UnitResolver();
p.setLengthHandler(ur);
ArrayList values = new ArrayList();
@@ -1261,7 +1259,7 @@
//
// b. Otherwise, the value is used as is
//
- LengthParser p = uctx.getParserFactory().createLengthParser();
+ LengthParser p = new LengthParser();
UnitProcessor.UnitResolver ur = new UnitProcessor.UnitResolver();
p.setLengthHandler(ur);
try {
1.3 +3 -4 xml-batik/sources/org/apache/batik/bridge/SVGViewport.java
Index: SVGViewport.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGViewport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGViewport.java 2000/12/28 09:37:15 1.2
+++ SVGViewport.java 2001/02/01 13:45:47 1.3
@@ -10,7 +10,6 @@
import java.io.StringReader;
import org.apache.batik.parser.LengthParser;
-import org.apache.batik.parser.ParserFactory;
import org.apache.batik.util.SVGConstants;
import org.apache.batik.util.UnitProcessor;
import org.w3c.dom.svg.SVGSVGElement;
@@ -19,7 +18,7 @@
* Defines a viewport using an <tt>SVGSVGElement</tt>.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
- * @version $Id: SVGViewport.java,v 1.2 2000/12/28 09:37:15 hillion Exp $
+ * @version $Id: SVGViewport.java,v 1.3 2001/02/01 13:45:47 tkormann Exp $
*/
public class SVGViewport implements Viewport, SVGConstants {
@@ -42,7 +41,7 @@
*/
public float getWidth() {
String s = svgSvgElement.getAttributeNS(null, SVG_WIDTH_ATTRIBUTE);
- LengthParser p = uctx.getParserFactory().createLengthParser();
+ LengthParser p = new LengthParser();
UnitProcessor.UnitResolver ur = new UnitProcessor.UnitResolver();
p.setLengthHandler(ur);
p.parse(new StringReader(s));
@@ -58,7 +57,7 @@
*/
public float getHeight() {
String s = svgSvgElement.getAttributeNS(null, SVG_HEIGHT_ATTRIBUTE);
- LengthParser p = uctx.getParserFactory().createLengthParser();
+ LengthParser p = new LengthParser();
UnitProcessor.UnitResolver ur = new UnitProcessor.UnitResolver();
p.setLengthHandler(ur);
p.parse(new StringReader(s));
1.4 +1 -21 xml-batik/sources/org/apache/batik/dom/svg/DefaultSVGContext.java
Index: DefaultSVGContext.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/DefaultSVGContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultSVGContext.java 2000/12/28 09:37:18 1.3
+++ DefaultSVGContext.java 2001/02/01 13:45:48 1.4
@@ -11,42 +11,22 @@
import org.apache.batik.bridge.UserAgent;
import org.apache.batik.css.svg.DefaultSVGCSSContext;
import org.apache.batik.css.svg.SVGCSSContext;
-import org.apache.batik.parser.ParserFactory;
/**
* This class is the placeholder for SVG application informations.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: DefaultSVGContext.java,v 1.3 2000/12/28 09:37:18 hillion Exp $
+ * @version $Id: DefaultSVGContext.java,v 1.4 2001/02/01 13:45:48 tkormann Exp $
*/
public class DefaultSVGContext
extends DefaultSVGCSSContext
implements SVGContext {
/**
- * The parser factory.
- */
- protected ParserFactory parserFactory;
-
- /**
* The pixel to mm conversion factor.
*/
protected float pixelToMM;
-
- /**
- * Returns the parser factory.
- */
- public ParserFactory getParserFactory() {
- return parserFactory;
- }
-
- /**
- * Sets the parser factory.
- */
- public void setParserFactory(ParserFactory pf) {
- parserFactory = pf;
- }
/**
* Return the pixel to millimeters factor.
1.7 +3 -11 xml-batik/sources/org/apache/batik/dom/svg/DefaultUnitProcessorContext.java
Index: DefaultUnitProcessorContext.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/DefaultUnitProcessorContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultUnitProcessorContext.java 2001/01/19 02:12:39 1.6
+++ DefaultUnitProcessorContext.java 2001/02/01 13:45:48 1.7
@@ -12,7 +12,6 @@
import org.apache.batik.css.HiddenChildElementSupport;
import org.apache.batik.parser.LengthParser;
-import org.apache.batik.parser.ParserFactory;
import org.apache.batik.util.UnitProcessor;
import org.apache.batik.util.SVGConstants;
@@ -25,7 +24,7 @@
* The default unit processor context.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: DefaultUnitProcessorContext.java,v 1.6 2001/01/19 02:12:39 vhardy Exp $
+ * @version $Id: DefaultUnitProcessorContext.java,v 1.7 2001/02/01 13:45:48 tkormann Exp $
*/
public class DefaultUnitProcessorContext
implements UnitProcessor.Context,
@@ -47,13 +46,6 @@
}
/**
- * Returns the parser factory.
- */
- public ParserFactory getParserFactory() {
- return context.getParserFactory();
- }
-
- /**
* Returns the font-size medium value in pt.
*/
public float getMediumFontSize() {
@@ -84,7 +76,7 @@
return (float)context.getViewportWidth();
}
String s = svg.getAttributeNS(null, SVG_WIDTH_ATTRIBUTE);
- LengthParser p = getParserFactory().createLengthParser();
+ LengthParser p = new LengthParser();
UnitProcessor.UnitResolver ur = new UnitProcessor.UnitResolver();
p.setLengthHandler(ur);
p.parse(new StringReader(s));
@@ -104,7 +96,7 @@
return (float)context.getViewportHeight();
}
String s = svg.getAttributeNS(null, SVG_HEIGHT_ATTRIBUTE);
- LengthParser p = getParserFactory().createLengthParser();
+ LengthParser p = new LengthParser();
UnitProcessor.UnitResolver ur = new UnitProcessor.UnitResolver();
p.setLengthHandler(ur);
p.parse(new StringReader(s));
1.3 +1 -6 xml-batik/sources/org/apache/batik/dom/svg/SVGContext.java
Index: SVGContext.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGContext.java 2000/12/06 21:22:27 1.2
+++ SVGContext.java 2001/02/01 13:45:49 1.3
@@ -9,19 +9,14 @@
package org.apache.batik.dom.svg;
import org.apache.batik.css.svg.SVGCSSContext;
-import org.apache.batik.parser.ParserFactory;
/**
* This interface is the placeholder for SVG application informations.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: SVGContext.java,v 1.2 2000/12/06 21:22:27 hillion Exp $
+ * @version $Id: SVGContext.java,v 1.3 2001/02/01 13:45:49 tkormann Exp $
*/
public interface SVGContext extends SVGCSSContext {
- /**
- * Returns the parser factory.
- */
- ParserFactory getParserFactory();
/**
* Return the pixel to millimeters factor.
1.6 +6 -8 xml-batik/sources/org/apache/batik/experiment/TextPathElementBridge.java
Index: TextPathElementBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/experiment/TextPathElementBridge.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TextPathElementBridge.java 2001/01/24 05:39:26 1.5
+++ TextPathElementBridge.java 2001/02/01 13:45:49 1.6
@@ -69,7 +69,7 @@
* A factory for the <textPath> SVG element.
*
* @author <a href="mailto:dean@w3.org">Dean Jackson</a>
- * @version $Id: TextPathElementBridge.java,v 1.5 2001/01/24 05:39:26 vhardy Exp $
+ * @version $Id: TextPathElementBridge.java,v 1.6 2001/02/01 13:45:49 tkormann Exp $
*/
public class TextPathElementBridge implements GraphicsNodeBridge, SVGConstants {
protected final static Map fonts = new HashMap(11);
@@ -101,13 +101,11 @@
= new DefaultUnitProcessorContext(ctx,
cssDecl);
- ShapeNode node = ctx.getGVTFactory().createShapeNode();
+ ShapeNode node = new ShapeNode();
// Transform
AffineTransform at =
- SVGUtilities.convertAffineTransform(element,
- ATTR_TRANSFORM,
- ctx.getParserFactory());
+ SVGUtilities.convertAffineTransform(element, ATTR_TRANSFORM);
node.setTransform(at);
// <!> TODO only when binding is enabled
@@ -373,9 +371,9 @@
// add the transform for the path as well
- path = AWTPathProducer.createShape(new StringReader(d),
- PathIterator.WIND_NON_ZERO,
- ctx.getParserFactory());
+ path =
+ AWTPathProducer.createShape(new StringReader(d),
+ PathIterator.WIND_NON_ZERO);
} catch (IOException e) {
throw new RuntimeException(e.getMessage());
}
1.2 +11 -11 xml-batik/sources/org/apache/batik/ext/awt/image/rendered/ColorMatrixRed.java
Index: ColorMatrixRed.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/ext/awt/image/rendered/ColorMatrixRed.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ColorMatrixRed.java 2001/01/24 21:06:03 1.1
+++ ColorMatrixRed.java 2001/02/01 13:45:49 1.2
@@ -20,9 +20,9 @@
import org.apache.batik.ext.awt.image.GraphicsUtil;
/**
- *
+ *
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: ColorMatrixRed.java,v 1.1 2001/01/24 21:06:03 vhardy Exp $
+ * @version $Id: ColorMatrixRed.java,v 1.2 2001/02/01 13:45:49 tkormann Exp $
*/
public class ColorMatrixRed extends AbstractRed{
/**
@@ -75,17 +75,17 @@
ColorModel cm = GraphicsUtil.Linear_sRGB_Unpre;
- SampleModel sm =
+ SampleModel sm =
cm.createCompatibleSampleModel(src.getWidth(),
src.getHeight());
-
+
init(src, src.getBounds(), cm, sm,
src.getTileGridXOffset(), src.getTileGridYOffset(), null);
}
public WritableRaster copyData(WritableRaster wr){
- System.out.println("Getting data for : " + wr.getWidth() + "/" + wr.getHeight() + "/" + wr.getMinX() + "/" + wr.getMinY());
+ //System.out.println("Getting data for : " + wr.getWidth() + "/" + wr.getHeight() + "/" + wr.getMinX() + "/" + wr.getMinY());
//
// First, get source data
@@ -96,7 +96,7 @@
// System.out.println("this : " + this);
wr = src.copyData(wr);
// System.out.println("Hi");
- System.out.println("Source was : " + wr.getWidth() + "/" + wr.getHeight()+ "/" + wr.getMinX() + "/" + wr.getMinY());
+ //System.out.println("Source was : " + wr.getWidth() + "/" + wr.getHeight()+ "/" + wr.getMinX() + "/" + wr.getMinY());
// Unpremultiply data if required
ColorModel cm = src.getColorModel();
@@ -115,14 +115,14 @@
SinglePixelPackedSampleModel sppsm;
sppsm = (SinglePixelPackedSampleModel)wr.getSampleModel();
- final int offset =
+ final int offset =
(dbf.getOffset() +
- sppsm.getOffset(minX-wr.getSampleModelTranslateX(),
+ sppsm.getOffset(minX-wr.getSampleModelTranslateX(),
minY-wr.getSampleModelTranslateY()));
// final int offset = dbf.getOffset();
- final int scanStride =
+ final int scanStride =
((SinglePixelPackedSampleModel)wr.getSampleModel())
.getScanlineStride();
final int adjust = scanStride - w;
@@ -179,8 +179,8 @@
}
p += adjust;
}
-
- System.out.println("Result is : " + wr.getWidth() + "/" + wr.getHeight()+ "/" + wr.getMinX() + "/" + wr.getMinY());
+
+ //System.out.println("Result is : " + wr.getWidth() + "/" + wr.getHeight()+ "/" + wr.getMinX() + "/" + wr.getMinY());
return wr;
}
1.4 +3 -4 xml-batik/sources/org/apache/batik/parser/AWTPathProducer.java
Index: AWTPathProducer.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/parser/AWTPathProducer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AWTPathProducer.java 2001/01/23 17:08:14 1.3
+++ AWTPathProducer.java 2001/02/01 13:45:49 1.4
@@ -19,7 +19,7 @@
* a Shape from the value of a path's 'd' attribute.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: AWTPathProducer.java,v 1.3 2001/01/23 17:08:14 tkormann Exp $
+ * @version $Id: AWTPathProducer.java,v 1.4 2001/02/01 13:45:49 tkormann Exp $
*/
public class AWTPathProducer implements PathHandler, ShapeProducer {
/**
@@ -56,12 +56,11 @@
* Utility method for creating an ExtendedGeneralPath.
* @param r The reader used to read the path specification.
* @param wr The winding rule to use for creating the path.
- * @param pf The parser factory to use.
*/
- public static Shape createShape(Reader r, int wr, ParserFactory pf)
+ public static Shape createShape(Reader r, int wr)
throws IOException,
ParseException {
- PathParser p = pf.createPathParser();
+ PathParser p = new PathParser();
AWTPathProducer ph = new AWTPathProducer();
ph.setWindingRule(wr);
1.2 +3 -4 xml-batik/sources/org/apache/batik/parser/AWTPolygonProducer.java
Index: AWTPolygonProducer.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/parser/AWTPolygonProducer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AWTPolygonProducer.java 2000/10/10 18:40:21 1.1
+++ AWTPolygonProducer.java 2001/02/01 13:45:49 1.2
@@ -17,19 +17,18 @@
* This class produces a polygon shape from a reader.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: AWTPolygonProducer.java,v 1.1 2000/10/10 18:40:21 hillion Exp $
+ * @version $Id: AWTPolygonProducer.java,v 1.2 2001/02/01 13:45:49 tkormann Exp $
*/
public class AWTPolygonProducer extends AWTPolylineProducer {
/**
* Utility method for creating an ExtendedGeneralPath.
* @param r The reader used to read the path specification.
* @param wr The winding rule to use for creating the path.
- * @param pf The parser factory to use.
*/
- public static Shape createShape(Reader r, int wr, ParserFactory pf)
+ public static Shape createShape(Reader r, int wr)
throws IOException,
ParseException {
- PointsParser p = pf.createPointsParser();
+ PointsParser p = new PointsParser();
AWTPolygonProducer ph = new AWTPolygonProducer();
ph.setWindingRule(wr);
1.2 +3 -4 xml-batik/sources/org/apache/batik/parser/AWTPolylineProducer.java
Index: AWTPolylineProducer.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/parser/AWTPolylineProducer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AWTPolylineProducer.java 2000/10/10 18:40:22 1.1
+++ AWTPolylineProducer.java 2001/02/01 13:45:49 1.2
@@ -17,7 +17,7 @@
* This class produces a polyline shape from a reader.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: AWTPolylineProducer.java,v 1.1 2000/10/10 18:40:22 hillion Exp $
+ * @version $Id: AWTPolylineProducer.java,v 1.2 2001/02/01 13:45:49 tkormann Exp $
*/
public class AWTPolylineProducer implements PointsHandler, ShapeProducer {
/**
@@ -39,12 +39,11 @@
* Utility method for creating an ExtendedGeneralPath.
* @param r The reader used to read the path specification.
* @param wr The winding rule to use for creating the path.
- * @param pf The parser factory to use.
*/
- public static Shape createShape(Reader r, int wr, ParserFactory pf)
+ public static Shape createShape(Reader r, int wr)
throws IOException,
ParseException {
- PointsParser p = pf.createPointsParser();
+ PointsParser p = new PointsParser();
AWTPolylineProducer ph = new AWTPolylineProducer();
ph.setWindingRule(wr);
1.3 +6 -8 xml-batik/sources/org/apache/batik/parser/AWTTransformProducer.java
Index: AWTTransformProducer.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/parser/AWTTransformProducer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AWTTransformProducer.java 2000/10/11 12:02:44 1.2
+++ AWTTransformProducer.java 2001/02/01 13:45:50 1.3
@@ -17,7 +17,7 @@
* an AffineTransform from the value of a 'transform' attribute.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: AWTTransformProducer.java,v 1.2 2000/10/11 12:02:44 hillion Exp $
+ * @version $Id: AWTTransformProducer.java,v 1.3 2001/02/01 13:45:50 tkormann Exp $
*/
public class AWTTransformProducer implements TransformListHandler {
/**
@@ -28,14 +28,12 @@
/**
* Utility method for creating an AffineTransform.
* @param r The reader used to read the transform specification.
- * @param pf The parser factory to use.
*/
- public static AffineTransform createAffineTransform(Reader r,
- ParserFactory pf)
+ public static AffineTransform createAffineTransform(Reader r)
throws ParseException {
- TransformListParser p = pf.createTransformListParser();
+ TransformListParser p = new TransformListParser();
AWTTransformProducer th = new AWTTransformProducer();
-
+
p.setTransformListHandler(th);
p.parse(r);
@@ -63,7 +61,7 @@
* TransformListHandler#matrix(float,float,float,float,float,float)}.
*/
public void matrix(float a, float b, float c, float d, float e, float f)
- throws ParseException {
+ throws ParseException {
affineTransform.concatenate(new AffineTransform(a, b, c, d, e, f));
}
@@ -79,7 +77,7 @@
* Implements {@link TransformListHandler#rotate(float,float,float)}.
*/
public void rotate(float theta, float cx, float cy) throws ParseException {
- AffineTransform at
+ AffineTransform at
= AffineTransform.getRotateInstance(Math.PI * theta / 180, cx, cy);
affineTransform.concatenate(at);
}
1.6 +1 -12 xml-batik/sources/org/apache/batik/swing/JSVGCanvas.java
Index: JSVGCanvas.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/swing/JSVGCanvas.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JSVGCanvas.java 2001/01/29 12:52:34 1.5
+++ JSVGCanvas.java 2001/02/01 13:45:50 1.6
@@ -83,16 +83,12 @@
import org.apache.batik.bridge.SVGBridgeContext;
import org.apache.batik.bridge.SVGUtilities;
-import org.apache.batik.gvt.GVTFactory;
-
import org.apache.batik.gvt.text.ConcreteTextSelector;
import org.apache.batik.gvt.filter.ConcreteGraphicsNodeRableFactory;
import org.apache.batik.gvt.renderer.DynamicRenderer;
import org.apache.batik.gvt.renderer.DynamicRendererFactory;
-import org.apache.batik.parser.ParserFactory;
-
import org.apache.batik.script.ConcreteInterpreterPool;
import org.apache.batik.util.gui.resource.ActionMap;
@@ -114,7 +110,7 @@
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
* @author <a href="mailto:cjolif@ilog.fr">Christophe Jolif</a>
- * @version $Id: JSVGCanvas.java,v 1.5 2001/01/29 12:52:34 tkormann Exp $
+ * @version $Id: JSVGCanvas.java,v 1.6 2001/02/01 13:45:50 tkormann Exp $
*/
public class JSVGCanvas
extends JComponent
@@ -279,11 +275,6 @@
protected ThumbnailCanvas thumbnailCanvas = null;
/**
- * The parser factory.
- */
- protected ParserFactory parserFactory = new ParserFactory();
-
- /**
* The text selector.
*/
protected Selector textSelector;
@@ -683,8 +674,6 @@
result.setDocumentLoader
(new BufferedDocumentLoader
(new SVGDocumentLoader(userAgent.getXMLParserClassName())));
- result.setGVTFactory(GVTFactory.getGVTFactoryImplementation());
- result.setParserFactory(parserFactory);
result.setUserAgent(userAgent);
result.setGraphicsNodeRableFactory
(new ConcreteGraphicsNodeRableFactory());
1.14 +2 -8 xml-batik/sources/org/apache/batik/util/UnitProcessor.java
Index: UnitProcessor.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/util/UnitProcessor.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- UnitProcessor.java 2001/01/19 02:13:02 1.13
+++ UnitProcessor.java 2001/02/01 13:45:51 1.14
@@ -19,7 +19,6 @@
import org.apache.batik.parser.LengthHandler;
import org.apache.batik.parser.LengthParser;
import org.apache.batik.parser.ParseException;
-import org.apache.batik.parser.ParserFactory;
import org.apache.batik.util.resources.Messages;
import org.w3c.dom.Element;
@@ -36,7 +35,7 @@
* units.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: UnitProcessor.java,v 1.13 2001/01/19 02:13:02 vhardy Exp $
+ * @version $Id: UnitProcessor.java,v 1.14 2001/02/01 13:45:51 tkormann Exp $
*/
public abstract class UnitProcessor {
/**
@@ -492,7 +491,7 @@
if (value.length() == 0) {
return 0;
}
- LengthParser p = c.getParserFactory().createLengthParser();
+ LengthParser p = new LengthParser();
UnitResolver ur = new UnitResolver();
p.setLengthHandler(ur);
p.parse(new StringReader(value));
@@ -601,11 +600,6 @@
* Returns the pixel to mm factor.
*/
float getPixelToMM();
-
- /**
- * Returns the parser factory.
- */
- ParserFactory getParserFactory();
/**
* Returns the font-size medium value in pt.