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 cj...@apache.org on 2001/04/20 17:52:23 UTC
cvs commit: xml-batik/sources/org/apache/batik/svggen DOMTreeManager.java SVGGraphics2D.java
cjolif 01/04/20 08:52:22
Modified: sources/org/apache/batik/svggen DOMTreeManager.java
SVGGraphics2D.java
Log:
style on the main SVG element now also passes throught the style handler.
Revision Changes Path
1.13 +7 -8 xml-batik/sources/org/apache/batik/svggen/DOMTreeManager.java
Index: DOMTreeManager.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/DOMTreeManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DOMTreeManager.java 2001/04/19 15:59:00 1.12
+++ DOMTreeManager.java 2001/04/20 15:52:15 1.13
@@ -45,7 +45,7 @@
*
* @author <a href="mailto:cjolif">Christophe Jolif</a>
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: DOMTreeManager.java,v 1.12 2001/04/19 15:59:00 cjolif Exp $
+ * @version $Id: DOMTreeManager.java,v 1.13 2001/04/20 15:52:15 cjolif Exp $
*/
public class DOMTreeManager implements SVGSyntax, ErrorConstants {
/**
@@ -233,18 +233,17 @@
}
// Set default rendering context attributes in node
- Map groupDefaults = defaultGC.getGroupContext();
- Iterator iter = groupDefaults.keySet().iterator();
- while(iter.hasNext()){
- String attrName = (String)iter.next();
- svg.setAttributeNS(null, attrName,
- (String)groupDefaults.get(attrName));
- }
+ applyDefaultRenderingStyle(svg);
svg.appendChild(getGenericDefinitions());
svg.appendChild(getTopLevelGroup());
return svg;
+ }
+
+ public void applyDefaultRenderingStyle(Element element) {
+ Map groupDefaults = defaultGC.getGroupContext();
+ generatorContext.styleHandler.setStyle(element, groupDefaults, generatorContext);
}
/**
1.17 +4 -4 xml-batik/sources/org/apache/batik/svggen/SVGGraphics2D.java
Index: SVGGraphics2D.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGGraphics2D.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- SVGGraphics2D.java 2001/04/18 12:18:18 1.16
+++ SVGGraphics2D.java 2001/04/20 15:52:17 1.17
@@ -44,7 +44,7 @@
*
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGGraphics2D.java,v 1.16 2001/04/18 12:18:18 cjolif Exp $
+ * @version $Id: SVGGraphics2D.java,v 1.17 2001/04/20 15:52:17 cjolif Exp $
* @see org.apache.batik.ext.awt.g2d.GraphicContext
* @see org.apache.batik.svggen.DOMTreeManager
* @see org.apache.batik.svggen.DOMGroupManager
@@ -401,7 +401,7 @@
*/
public Element getRoot(){
Element svgRoot = domTreeManager.getRoot();
- if(svgCanvasSize != null){
+ if (svgCanvasSize != null){
svgRoot.setAttributeNS(null, SVG_WIDTH_ATTRIBUTE,
"" + svgCanvasSize.width);
svgRoot.setAttributeNS(null, SVG_HEIGHT_ATTRIBUTE,
@@ -662,7 +662,7 @@
if (xform == null) {
retVal = drawImage(img, 0, 0, null);
- } else if(xform.getDeterminant() != 0){
+ } else if(xform.getDeterminant() != 0){
AffineTransform inverseTransform = null;
try{
inverseTransform = xform.createInverse();
@@ -840,7 +840,7 @@
Integer.toString(img.getWidth()));
image.setAttributeNS(null, SVG_HEIGHT_ATTRIBUTE,
Integer.toString(img.getHeight()));
-
+
if (xform == null) {
domGroupManager.addElement(image);
} else if(xform.getDeterminant() != 0){
---------------------------------------------------------------------
To unsubscribe, e-mail: batik-dev-unsubscribe@xml.apache.org
For additional commands, e-mail: batik-dev-help@xml.apache.org