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/18 14:18:20 UTC

cvs commit: xml-batik/sources/org/apache/batik/svggen DOMGroupManager.java DOMTreeManager.java SVGColor.java SVGGeneratorContext.java SVGGraphics2D.java

cjolif      01/04/18 05:18:20

  Modified:    sources/org/apache/batik/svggen DOMGroupManager.java
                        DOMTreeManager.java SVGColor.java
                        SVGGeneratorContext.java SVGGraphics2D.java
  Log:
  small improvments
  
  Revision  Changes    Path
  1.10      +2 -2      xml-batik/sources/org/apache/batik/svggen/DOMGroupManager.java
  
  Index: DOMGroupManager.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/DOMGroupManager.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DOMGroupManager.java	2001/04/02 13:36:03	1.9
  +++ DOMGroupManager.java	2001/04/18 12:18:17	1.10
  @@ -48,7 +48,7 @@
    *
    * @author <a href="mailto:cjolif@ilog.fr">Christophe Jolif</a>
    * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
  - * @version $Id: DOMGroupManager.java,v 1.9 2001/04/02 13:36:03 cjolif Exp $
  + * @version $Id: DOMGroupManager.java,v 1.10 2001/04/18 12:18:17 cjolif Exp $
    */
   public class DOMGroupManager implements SVGSyntax, ErrorConstants {
       public final static short DRAW = 0x01;
  @@ -114,8 +114,8 @@
        */
       public void addElement(Element element) {
           addElement(element, (short)(DRAW|FILL));
  +    }
   
  -}
       /**
        * Adds a node to the current group, if possible
        * @param element child Element to add to the group
  
  
  
  1.11      +9 -5      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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DOMTreeManager.java	2001/04/02 13:36:03	1.10
  +++ DOMTreeManager.java	2001/04/18 12:18:17	1.11
  @@ -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.10 2001/04/02 13:36:03 cjolif Exp $
  + * @version $Id: DOMTreeManager.java,v 1.11 2001/04/18 12:18:17 cjolif Exp $
    */
   public class DOMTreeManager implements SVGSyntax, ErrorConstants {
       /**
  @@ -226,9 +226,11 @@
               svg.setAttributeNS
                   (null, SVG_ENABLE_BACKGROUND_ATTRIBUTE, SVG_NEW_VALUE);
   
  -        Comment generatorComment = generatorContext.domFactory.
  -            createComment(generatorContext.generatorComment);
  -        svg.appendChild(generatorComment);
  +        if (generatorContext.generatorComment != null) {
  +            Comment generatorComment = generatorContext.domFactory.
  +                createComment(generatorContext.generatorComment);
  +            svg.appendChild(generatorComment);
  +        }
   
           // Set default rendering context attributes in node
           Map groupDefaults = defaultGC.getGroupContext();
  @@ -249,7 +251,9 @@
        * @return a defs element that contains all the generic
        *         definitions
        */
  -    public Element getGenericDefinitions(){
  +    public Element getGenericDefinitions() {
  +        // when called several times, this will create several generic definition
  +        // elements... not sure it is desired behavior...
           Element genericDefs =
               generatorContext.domFactory.createElementNS(SVG_NAMESPACE_URI,
                                                           SVG_DEFS_TAG);
  
  
  
  1.8       +2 -2      xml-batik/sources/org/apache/batik/svggen/SVGColor.java
  
  Index: SVGColor.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGColor.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SVGColor.java	2001/03/21 14:35:51	1.7
  +++ SVGColor.java	2001/04/18 12:18:17	1.8
  @@ -23,7 +23,7 @@
    * corresponding SVG attributes.
    *
    * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
  - * @version $Id: SVGColor.java,v 1.7 2001/03/21 14:35:51 cjolif Exp $
  + * @version $Id: SVGColor.java,v 1.8 2001/04/18 12:18:17 cjolif Exp $
    * @see                 org.apache.batik.svggen.DOMTreeManager
    */
   public class SVGColor extends AbstractSVGConverter{
  @@ -95,7 +95,7 @@
           // First, convert the color value
           //
           String cssColor = (String)colorMap.get(color);
  -        if(cssColor==null){
  +        if (cssColor==null) {
               // color is not one of the predefined colors
               StringBuffer cssColorBuffer = new StringBuffer(RGB_PREFIX);
               cssColorBuffer.append(color.getRed());
  
  
  
  1.6       +2 -1      xml-batik/sources/org/apache/batik/svggen/SVGGeneratorContext.java
  
  Index: SVGGeneratorContext.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGGeneratorContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SVGGeneratorContext.java	2001/04/02 13:36:06	1.5
  +++ SVGGeneratorContext.java	2001/04/18 12:18:18	1.6
  @@ -18,7 +18,7 @@
    *
    * @see org.apache.batik.svggen.SVGGraphics2D#SVGGraphics2D(SVGGeneratorContext,boolean)
    * @author <a href="mailto:cjolif@ilog.fr>Christophe Jolif</a>
  - * @version $Id: SVGGeneratorContext.java,v 1.5 2001/04/02 13:36:06 cjolif Exp $
  + * @version $Id: SVGGeneratorContext.java,v 1.6 2001/04/18 12:18:18 cjolif Exp $
    */
   public class SVGGeneratorContext implements ErrorConstants {
       // this fields are package access for read-only purpose
  @@ -92,6 +92,7 @@
           ctx.setImageHandler(new ImageHandlerBase64Encoder());
           ctx.setStyleHandler(new DefaultStyleHandler());
           ctx.setComment("Generated by the Batik Graphics2D SVG Generator");
  +        ctx.setErrorHandler(new DefaultErrorHandler());
           return ctx;
       }
   
  
  
  
  1.16      +3 -3      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- SVGGraphics2D.java	2001/04/11 01:26:41	1.15
  +++ SVGGraphics2D.java	2001/04/18 12:18:18	1.16
  @@ -44,7 +44,7 @@
    *
    *
    * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
  - * @version $Id: SVGGraphics2D.java,v 1.15 2001/04/11 01:26:41 vhardy Exp $
  + * @version $Id: SVGGraphics2D.java,v 1.16 2001/04/18 12:18:18 cjolif Exp $
    * @see                org.apache.batik.ext.awt.g2d.GraphicContext
    * @see                org.apache.batik.svggen.DOMTreeManager
    * @see                org.apache.batik.svggen.DOMGroupManager
  @@ -232,8 +232,8 @@
           this.domTreeManager = new DOMTreeManager(gc,
                                                    generatorCtx,
                                                    DEFAULT_MAX_GC_OVERRIDES);
  -        this.domGroupManager = new DOMGroupManager(this.gc, this.domTreeManager);
  -        this.domTreeManager.addGroupManager(this.domGroupManager);
  +        this.domGroupManager = new DOMGroupManager(gc, domTreeManager);
  +        this.domTreeManager.addGroupManager(domGroupManager);
   
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: batik-dev-unsubscribe@xml.apache.org
For additional commands, e-mail: batik-dev-help@xml.apache.org