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/26 16:18:09 UTC
cvs commit: xml-batik/sources/org/apache/batik/svggen AbstractSVGConverter.java AbstractSVGFilterConverter.java DOMTreeManager.java ErrorConstants.java NullOp.java SVGAlphaComposite.java SVGAttribute.java SVGAttributeMap.java SVGBufferedImageOp.java SVGClip.java SVGClipDescriptor.java SVGColor.java SVGComposite.java SVGCompositeDescriptor.java SVGConverter.java SVGConvolveOp.java SVGCustomBufferedImageOp.java SVGCustomComposite.java SVGCustomPaint.java SVGDescriptor.java SVGFilterConverter.java SVGFont.java SVGFontDescriptor.java SVGGeneratorContext.java SVGGraphicContextConverter.java SVGGraphicObjectConverter.java SVGGraphics2D.java SVGGraphics2DUnitTester.java SVGHintsDescriptor.java SVGIDGenerator.java SVGLinearGradient.java SVGLookupOp.java SVGPaint.java SVGPaintDescriptor.java SVGRenderingHints.java SVGRescaleOp.java SVGShape.java SVGStrokeDescriptor.java SVGTexturePaint.java SVGTransformDescriptor.java
cjolif 01/04/26 07:18:09
Modified: sources/org/apache/batik/svggen AbstractSVGConverter.java
AbstractSVGFilterConverter.java DOMTreeManager.java
ErrorConstants.java NullOp.java
SVGAlphaComposite.java SVGAttribute.java
SVGAttributeMap.java SVGBufferedImageOp.java
SVGClip.java SVGClipDescriptor.java SVGColor.java
SVGComposite.java SVGCompositeDescriptor.java
SVGConverter.java SVGConvolveOp.java
SVGCustomBufferedImageOp.java
SVGCustomComposite.java SVGCustomPaint.java
SVGDescriptor.java SVGFilterConverter.java
SVGFont.java SVGFontDescriptor.java
SVGGeneratorContext.java
SVGGraphicContextConverter.java
SVGGraphicObjectConverter.java SVGGraphics2D.java
SVGGraphics2DUnitTester.java
SVGHintsDescriptor.java SVGIDGenerator.java
SVGLinearGradient.java SVGLookupOp.java
SVGPaint.java SVGPaintDescriptor.java
SVGRenderingHints.java SVGRescaleOp.java
SVGShape.java SVGStrokeDescriptor.java
SVGTexturePaint.java SVGTransformDescriptor.java
Log:
mainly change Set (HashSet) to List (LinkedList) in several places.
warning: this changes the external API a little bit.
advantages: faster + give a deterministic result in the generated SVG.
several other little clean-ups.
Revision Changes Path
1.4 +5 -8 xml-batik/sources/org/apache/batik/svggen/AbstractSVGConverter.java
Index: AbstractSVGConverter.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/AbstractSVGConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractSVGConverter.java 2001/04/02 13:36:02 1.3
+++ AbstractSVGConverter.java 2001/04/26 14:16:59 1.4
@@ -8,10 +8,7 @@
package org.apache.batik.svggen;
-import java.util.Map;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
+import java.util.*;
import org.w3c.dom.Document;
@@ -24,7 +21,7 @@
* values.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: AbstractSVGConverter.java,v 1.3 2001/04/02 13:36:02 cjolif Exp $
+ * @version $Id: AbstractSVGConverter.java,v 1.4 2001/04/26 14:16:59 cjolif Exp $
*/
public abstract class AbstractSVGConverter implements SVGConverter, ErrorConstants {
@@ -37,13 +34,13 @@
* Map of descriptions already processed by this converter. The
* key type is left to the implementations
*/
- protected Map descMap = new Hashtable();
+ protected Map descMap = new HashMap();
/**
* Set of definitions to interpret the values of the attributes
* generated by this converter since its creation
*/
- protected Set defSet = new HashSet();
+ protected List defSet = new LinkedList();
/**
* @param genratorContext can be used by the SVGConverter extentions
@@ -68,7 +65,7 @@
* If no definition is needed, an empty set should be
* returned.
*/
- public Set getDefinitionSet() {
+ public List getDefinitionSet() {
return defSet;
}
1.4 +5 -8 xml-batik/sources/org/apache/batik/svggen/AbstractSVGFilterConverter.java
Index: AbstractSVGFilterConverter.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/AbstractSVGFilterConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractSVGFilterConverter.java 2001/04/02 13:36:02 1.3
+++ AbstractSVGFilterConverter.java 2001/04/26 14:17:00 1.4
@@ -8,10 +8,7 @@
package org.apache.batik.svggen;
-import java.util.Map;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
+import java.util.*;
import org.w3c.dom.Document;
@@ -24,7 +21,7 @@
* values.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: AbstractSVGFilterConverter.java,v 1.3 2001/04/02 13:36:02 cjolif Exp $
+ * @version $Id: AbstractSVGFilterConverter.java,v 1.4 2001/04/26 14:17:00 cjolif Exp $
*/
public abstract class AbstractSVGFilterConverter
implements SVGFilterConverter, ErrorConstants {
@@ -37,13 +34,13 @@
* Map of descriptions already processed by this converter. The
* key type is left to the implementations
*/
- protected Map descMap = new Hashtable();
+ protected Map descMap = new HashMap();
/**
* Set of definitions to interpret the values of the attributes
* generated by this converter since its creation
*/
- protected Set defSet = new HashSet();
+ protected List defSet = new LinkedList();
/**
* @param generatorContext an be used by the SVGConverter extentions
@@ -62,7 +59,7 @@
* If no definition is needed, an empty set should be
* returned.
*/
- public Set getDefinitionSet(){
+ public List getDefinitionSet(){
return defSet;
}
1.14 +5 -7 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DOMTreeManager.java 2001/04/20 15:52:15 1.13
+++ DOMTreeManager.java 2001/04/26 14:17:02 1.14
@@ -8,8 +8,6 @@
package org.apache.batik.svggen;
-import java.awt.*;
-import java.awt.geom.*;
import java.util.*;
import java.awt.font.*;
@@ -45,7 +43,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.13 2001/04/20 15:52:15 cjolif Exp $
+ * @version $Id: DOMTreeManager.java,v 1.14 2001/04/26 14:17:02 cjolif Exp $
*/
public class DOMTreeManager implements SVGSyntax, ErrorConstants {
/**
@@ -64,7 +62,7 @@
* Set of definitions that are to be placed at the top of the
* document tree
*/
- private Set genericDefSet = new HashSet();
+ private List genericDefSet = new LinkedList();
/**
* Default SVG GraphicContext state
@@ -286,12 +284,12 @@
* contain all the definitions referenced by the attributes generated by
* the various converters. This also resets the converters.
*/
- public Set getDefinitionSet(){
+ public List getDefinitionSet(){
//
// The definition set contains all the definitions minus
// any definition that has been placed in the generic definition set
//
- Set defSet = gcConverter.getDefinitionSet();
+ List defSet = gcConverter.getDefinitionSet();
defSet.removeAll(genericDefSet);
defSet.addAll(filterConverter.getDefinitionSet());
@@ -331,7 +329,7 @@
// Include definition set if requested
//
if(includeDefinitionSet){
- Set defSet = getDefinitionSet();
+ List defSet = getDefinitionSet();
if(defSet.size() > 0){
Element defElement = null;
1.2 +95 -95 xml-batik/sources/org/apache/batik/svggen/ErrorConstants.java
Index: ErrorConstants.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/ErrorConstants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ErrorConstants.java 2001/04/02 13:42:31 1.1
+++ ErrorConstants.java 2001/04/26 14:17:03 1.2
@@ -1,95 +1,95 @@
-/*****************************************************************************
- * Copyright (C) The Apache Software Foundation. All rights reserved. *
- * ------------------------------------------------------------------------- *
- * This software is published under the terms of the Apache Software License *
- * version 1.1, a copy of which has been included with this distribution in *
- * the LICENSE file. *
- *****************************************************************************/
-
-package org.apache.batik.svggen;
-
-public interface ErrorConstants {
- // general errors
-
- public static final String ERR_UNEXPECTED =
- "unexpected exception";
- public static final String ERR_CONTEXT_NULL =
- "generatorContext should not be null";
-
- /// image handling errors
-
- public static final String ERR_IMAGE_DIR_NULL =
- "imageDir should not be null";
- public static final String ERR_IMAGE_DIR_DOES_NOT_EXIST =
- "imageDir does not exist";
- public static final String ERR_CANNOT_USE_IMAGE_DIR =
- "cannot convert imageDir to a URL value : ";
- public static final String ERR_IMAGE_NULL =
- "image should not be null";
- public static final String ERR_WRITE =
- "could not write image File ";
-
- // SVGGraphics2D errors
-
- public static final String ERR_CANVAS_SIZE_NULL =
- "canvas size should not be null";
- public static final String ERR_XOR =
- "XOR Mode is not supported by Graphics2D SVG Generator";
- public static final String ERR_ACI =
- "AttributedCharacterIterator not supported yet";
-
- // XmlWriter
- public static final String ERR_PROXY =
- "proxy should not be null";
- public static final String INVALID_NODE =
- "Unable to write node of type ";
-
- // DOMGroup/TreeManager
-
- public static final String ERR_GC_NULL = "gc should not be null";
- public static final String ERR_DOMTREEMANAGER_NULL =
- "domTreeManager should not be null";
- public static final String ERR_MAXGCOVERRIDES_OUTOFRANGE =
- "maxGcOverrides should be greater than zero";
- public static final String ERR_TOP_LEVEL_GROUP_NULL =
- "topLevelGroup should not be null";
- public static final String ERR_TOP_LEVEL_GROUP_NOT_G =
- "topLevelGroup should be a group <g>";
-
- // SVGClip/Font/Hint/Stroke descriptor
- public static final String ERR_CLIP_NULL = "clipPathValue should not be null";
- public static final String ERR_FONT_NULL =
- "none of the font description parameters should be null";
- public static final String ERR_HINT_NULL =
- "none of the hints description parameters should be null";
- public static final String ERR_STROKE_NULL =
- "none of the stroke description parameters should be null";
-
- // context
- public static final String ERR_MAP_NULL = "context map(s) should not be null";
- public static final String ERR_TRANS_NULL =
- "transformer stack should not be null";
-
- // SVGLookUp/RescaleOp
- public static final String ERR_ILLEGAL_BUFFERED_IMAGE_LOOKUP_OP =
- "BufferedImage LookupOp should have 1, 3 or 4 lookup arrays";
- public static final String ERR_SCALE_FACTORS_AND_OFFSETS_MISMATCH =
- "RescapeOp offsets and scaleFactor array length do not match";
- public static final String ERR_ILLEGAL_BUFFERED_IMAGE_RESCALE_OP =
- "BufferedImage RescaleOp should have 1, 3 or 4 scale factors";
-
-
- // SVGGeneratorContext
- public static final String ERR_DOM_FACTORY_NULL =
- "domFactory should not be null";
- public static final String ERR_IMAGE_HANDLER_NULL =
- "imageHandler should not be null";
- public static final String ERR_EXTENSION_HANDLER_NULL =
- "extensionHandler should not be null";
- public static final String ERR_ID_GENERATOR_NULL =
- "idGenerator should not be null";
- public static final String ERR_STYLE_HANDLER_NULL =
- "styleHandler should not be null";
- public static final String ERR_ERROR_HANDLER_NULL =
- "errorHandler should not be null";
-}
+/*****************************************************************************
+ * Copyright (C) The Apache Software Foundation. All rights reserved. *
+ * ------------------------------------------------------------------------- *
+ * This software is published under the terms of the Apache Software License *
+ * version 1.1, a copy of which has been included with this distribution in *
+ * the LICENSE file. *
+ *****************************************************************************/
+
+package org.apache.batik.svggen;
+
+public interface ErrorConstants {
+ // general errors
+
+ public static final String ERR_UNEXPECTED =
+ "unexpected exception";
+ public static final String ERR_CONTEXT_NULL =
+ "generatorContext should not be null";
+
+ /// image handling errors
+
+ public static final String ERR_IMAGE_DIR_NULL =
+ "imageDir should not be null";
+ public static final String ERR_IMAGE_DIR_DOES_NOT_EXIST =
+ "imageDir does not exist";
+ public static final String ERR_CANNOT_USE_IMAGE_DIR =
+ "cannot convert imageDir to a URL value : ";
+ public static final String ERR_IMAGE_NULL =
+ "image should not be null";
+ public static final String ERR_WRITE =
+ "could not write image File ";
+
+ // SVGGraphics2D errors
+
+ public static final String ERR_CANVAS_SIZE_NULL =
+ "canvas size should not be null";
+ public static final String ERR_XOR =
+ "XOR Mode is not supported by Graphics2D SVG Generator";
+ public static final String ERR_ACI =
+ "AttributedCharacterIterator not supported yet";
+
+ // XmlWriter
+ public static final String ERR_PROXY =
+ "proxy should not be null";
+ public static final String INVALID_NODE =
+ "Unable to write node of type ";
+
+ // DOMGroup/TreeManager
+
+ public static final String ERR_GC_NULL = "gc should not be null";
+ public static final String ERR_DOMTREEMANAGER_NULL =
+ "domTreeManager should not be null";
+ public static final String ERR_MAXGCOVERRIDES_OUTOFRANGE =
+ "maxGcOverrides should be greater than zero";
+ public static final String ERR_TOP_LEVEL_GROUP_NULL =
+ "topLevelGroup should not be null";
+ public static final String ERR_TOP_LEVEL_GROUP_NOT_G =
+ "topLevelGroup should be a group <g>";
+
+ // SVGClip/Font/Hint/Stroke descriptor
+ public static final String ERR_CLIP_NULL = "clipPathValue should not be null";
+ public static final String ERR_FONT_NULL =
+ "none of the font description parameters should be null";
+ public static final String ERR_HINT_NULL =
+ "none of the hints description parameters should be null";
+ public static final String ERR_STROKE_NULL =
+ "none of the stroke description parameters should be null";
+
+ // context
+ public static final String ERR_MAP_NULL = "context map(s) should not be null";
+ public static final String ERR_TRANS_NULL =
+ "transformer stack should not be null";
+
+ // SVGLookUp/RescaleOp
+ public static final String ERR_ILLEGAL_BUFFERED_IMAGE_LOOKUP_OP =
+ "BufferedImage LookupOp should have 1, 3 or 4 lookup arrays";
+ public static final String ERR_SCALE_FACTORS_AND_OFFSETS_MISMATCH =
+ "RescapeOp offsets and scaleFactor array length do not match";
+ public static final String ERR_ILLEGAL_BUFFERED_IMAGE_RESCALE_OP =
+ "BufferedImage RescaleOp should have 1, 3 or 4 scale factors";
+
+
+ // SVGGeneratorContext
+ public static final String ERR_DOM_FACTORY_NULL =
+ "domFactory should not be null";
+ public static final String ERR_IMAGE_HANDLER_NULL =
+ "imageHandler should not be null";
+ public static final String ERR_EXTENSION_HANDLER_NULL =
+ "extensionHandler should not be null";
+ public static final String ERR_ID_GENERATOR_NULL =
+ "idGenerator should not be null";
+ public static final String ERR_STYLE_HANDLER_NULL =
+ "styleHandler should not be null";
+ public static final String ERR_ERROR_HANDLER_NULL =
+ "errorHandler should not be null";
+}
1.3 +0 -5 xml-batik/sources/org/apache/batik/svggen/NullOp.java
Index: NullOp.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/NullOp.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NullOp.java 2001/02/03 16:26:19 1.2
+++ NullOp.java 2001/04/26 14:17:03 1.3
@@ -11,11 +11,6 @@
import java.awt.image.*;
import java.awt.geom.*;
import java.awt.*;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
1.10 +6 -11 xml-batik/sources/org/apache/batik/svggen/SVGAlphaComposite.java
Index: SVGAlphaComposite.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGAlphaComposite.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SVGAlphaComposite.java 2001/03/26 12:37:33 1.9
+++ SVGAlphaComposite.java 2001/04/26 14:17:04 1.10
@@ -8,13 +8,8 @@
package org.apache.batik.svggen;
-import java.awt.geom.*;
-import java.awt.*;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
+import java.awt.AlphaComposite;
+import java.util.*;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -36,14 +31,14 @@
* opacity property on the nodes to be composited.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGAlphaComposite.java,v 1.9 2001/03/26 12:37:33 tkormann Exp $
+ * @version $Id: SVGAlphaComposite.java,v 1.10 2001/04/26 14:17:04 cjolif Exp $
* @see org.apache.batik.svggen.SVGAlphaComposite
*/
public class SVGAlphaComposite extends AbstractSVGConverter {
/**
* Map of all possible AlphaComposite filter equivalents
*/
- private Map compositeDefsMap = new Hashtable();
+ private Map compositeDefsMap = new HashMap();
/**
* By default, access to the background is not required.
@@ -78,8 +73,8 @@
/**
* @return set of all AlphaComposite filter definitions
*/
- public Set getAlphaCompositeFilterSet() {
- return new HashSet(compositeDefsMap.values());
+ public List getAlphaCompositeFilterSet() {
+ return new LinkedList(compositeDefsMap.values());
}
/**
1.2 +2 -2 xml-batik/sources/org/apache/batik/svggen/SVGAttribute.java
Index: SVGAttribute.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGAttribute.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGAttribute.java 2001/01/23 17:12:19 1.1
+++ SVGAttribute.java 2001/04/26 14:17:05 1.2
@@ -17,9 +17,9 @@
* to a given element type.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGAttribute.java,v 1.1 2001/01/23 17:12:19 tkormann Exp $
+ * @version $Id: SVGAttribute.java,v 1.2 2001/04/26 14:17:05 cjolif Exp $
*/
-public class SVGAttribute{
+public class SVGAttribute {
/**
* SVG syntax for the attribute
*/
1.2 +4 -30 xml-batik/sources/org/apache/batik/svggen/SVGAttributeMap.java
Index: SVGAttributeMap.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGAttributeMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGAttributeMap.java 2001/01/23 17:12:19 1.1
+++ SVGAttributeMap.java 2001/04/26 14:17:06 1.2
@@ -9,52 +9,26 @@
package org.apache.batik.svggen;
import java.util.Map;
-import java.util.Hashtable;
+import java.util.HashMap;
/**
* Repository of SVG attribute descriptions, accessible by
* name.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGAttributeMap.java,v 1.1 2001/01/23 17:12:19 tkormann Exp $
+ * @version $Id: SVGAttributeMap.java,v 1.2 2001/04/26 14:17:06 cjolif Exp $
*/
public class SVGAttributeMap{
/**
* Map of attribute name to SVGAttribute objects
*/
- private static Map attrMap = new Hashtable();
+ private static Map attrMap = new HashMap();
/**
* @param name SVG name of the requested attribute
* @return attribute with requested name
*/
- public static SVGAttribute get(String attrName){
+ public static SVGAttribute get(String attrName) {
return (SVGAttribute)attrMap.get(attrName);
}
-
- /**
- * Static initializer that populates the map
- */
- /*
- static {
- HashSet tagSet = new HashSet();
-
- tagSet.add(TAG_G);
- tagSet.add(TAG_DEFS);
- tagSet.add(TAG_TEXT);
- tagSet.add(TAG_TSPAN);
- tagSet.add(TAG_TREF);
- tagSet.add(TAG_TEXT_PATH);
- tagSet.add(TAG_USE);
- tagSet.add(TAG_IMAGE);
- tagSet.add(TAG_SYMBOL);
- tagSet.add(TAG_MARKER);
- tagSet.add(TAG_CLIPPATH);
- tagSet.add(TAG_MASK);
- tagSet.add(TAG_PATTERN);
- tagSet.add(TAG_A);
- tagSet.add(TAG_SWITCH);
- tagSet.add(TAG_FOREIGN_OBJECT);
- tagSet.add(TAG_FE_IMAGE);
- }*/
}
1.7 +5 -10 xml-batik/sources/org/apache/batik/svggen/SVGBufferedImageOp.java
Index: SVGBufferedImageOp.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGBufferedImageOp.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SVGBufferedImageOp.java 2001/03/21 14:35:48 1.6
+++ SVGBufferedImageOp.java 2001/04/26 14:17:06 1.7
@@ -8,14 +8,9 @@
package org.apache.batik.svggen;
-import java.awt.geom.*;
-import java.awt.*;
+import java.awt.Rectangle;
import java.awt.image.*;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
+import java.util.*;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -25,7 +20,7 @@
* an SVG filter.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGBufferedImageOp.java,v 1.6 2001/03/21 14:35:48 cjolif Exp $
+ * @version $Id: SVGBufferedImageOp.java,v 1.7 2001/04/26 14:17:06 cjolif Exp $
* @see org.apache.batik.svggen.SVGCustomBufferedImageOp
* @see org.apache.batik.svggen.SVGLookupOp
* @see org.apache.batik.svggen.SVGRescaleOp
@@ -71,8 +66,8 @@
* @return Set of filter Elements defining the BufferedImageOp this
* Converter has processed since it was created.
*/
- public Set getDefinitionSet(){
- Set filterSet = new HashSet(svgLookupOp.getDefinitionSet());
+ public List getDefinitionSet(){
+ List filterSet = new LinkedList(svgLookupOp.getDefinitionSet());
filterSet.addAll(svgRescaleOp.getDefinitionSet());
filterSet.addAll(svgConvolveOp.getDefinitionSet());
filterSet.addAll(svgCustomBufferedImageOp.getDefinitionSet());
1.8 +1 -6 xml-batik/sources/org/apache/batik/svggen/SVGClip.java
Index: SVGClip.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGClip.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SVGClip.java 2001/03/21 14:35:49 1.7
+++ SVGClip.java 2001/04/26 14:17:08 1.8
@@ -10,11 +10,6 @@
import java.awt.geom.*;
import java.awt.*;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Hashtable;
-import java.util.HashSet;
-import java.util.Set;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -25,7 +20,7 @@
* Utility class that converts a Path object into an SVG clip
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGClip.java,v 1.7 2001/03/21 14:35:49 cjolif Exp $
+ * @version $Id: SVGClip.java,v 1.8 2001/04/26 14:17:08 cjolif Exp $
*/
public class SVGClip extends AbstractSVGConverter {
/**
1.4 +9 -12 xml-batik/sources/org/apache/batik/svggen/SVGClipDescriptor.java
Index: SVGClipDescriptor.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGClipDescriptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SVGClipDescriptor.java 2001/04/02 13:36:05 1.3
+++ SVGClipDescriptor.java 2001/04/26 14:17:09 1.4
@@ -8,10 +8,7 @@
package org.apache.batik.svggen;
-import java.util.Map;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
+import java.util.*;
import org.w3c.dom.*;
@@ -19,7 +16,7 @@
* Describes an SVG clip
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGClipDescriptor.java,v 1.3 2001/04/02 13:36:05 cjolif Exp $
+ * @version $Id: SVGClipDescriptor.java,v 1.4 2001/04/26 14:17:09 cjolif Exp $
* @see org.apache.batik.ext.awt.g2d.GraphicContext
* @see org.apache.batik.svggen.SVGDescriptor
*/
@@ -47,9 +44,9 @@
* @return a map containing the SVG attributes needed by the
* descriptor.
*/
- public Map getAttributeMap(Map attrMap){
- if(attrMap == null)
- attrMap = new Hashtable();
+ public Map getAttributeMap(Map attrMap) {
+ if (attrMap == null)
+ attrMap = new HashMap();
attrMap.put(SVG_CLIP_PATH_ATTRIBUTE, clipPathValue);
@@ -66,11 +63,11 @@
* @return a set containing Elements that represent the definition
* of the descriptor's attribute values
*/
- public Set getDefinitionSet(Set defSet){
- if(defSet == null)
- defSet = new HashSet();
+ public List getDefinitionSet(List defSet) {
+ if (defSet == null)
+ defSet = new LinkedList();
- if(clipPathDef != null)
+ if (clipPathDef != null)
defSet.add(clipPathDef);
return defSet;
1.9 +3 -3 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SVGColor.java 2001/04/18 12:18:17 1.8
+++ SVGColor.java 2001/04/26 14:17:10 1.9
@@ -11,7 +11,7 @@
import java.awt.Color;
import java.awt.Paint;
import java.util.Map;
-import java.util.Hashtable;
+import java.util.HashMap;
import java.util.Iterator;
import org.w3c.dom.*;
@@ -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.8 2001/04/18 12:18:17 cjolif Exp $
+ * @version $Id: SVGColor.java,v 1.9 2001/04/26 14:17:10 cjolif Exp $
* @see org.apache.batik.svggen.DOMTreeManager
*/
public class SVGColor extends AbstractSVGConverter{
@@ -50,7 +50,7 @@
/**
* Color map maps Color values to HTML 4.0 color names
*/
- private static Hashtable colorMap = new Hashtable();
+ private static Map colorMap = new HashMap();
static {
colorMap.put(black, "black");
1.4 +6 -9 xml-batik/sources/org/apache/batik/svggen/SVGComposite.java
Index: SVGComposite.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGComposite.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SVGComposite.java 2001/03/21 14:35:52 1.3
+++ SVGComposite.java 2001/04/26 14:17:11 1.4
@@ -9,12 +9,9 @@
package org.apache.batik.svggen;
import java.awt.geom.*;
-import java.awt.*;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
+import java.awt.Composite;
+import java.awt.AlphaComposite;
+import java.util.*;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -33,7 +30,7 @@
* extension mechanism.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGComposite.java,v 1.3 2001/03/21 14:35:52 cjolif Exp $
+ * @version $Id: SVGComposite.java,v 1.4 2001/04/26 14:17:11 cjolif Exp $
* @see org.apache.batik.svggen.SVGAlphaComposite
*/
public class SVGComposite implements SVGConverter {
@@ -68,8 +65,8 @@
* @return Set of filter Elements defining the composites this
* Converter has processed since it was created.
*/
- public Set getDefinitionSet(){
- Set compositeDefs = new HashSet(svgAlphaComposite.getDefinitionSet());
+ public List getDefinitionSet() {
+ List compositeDefs = new LinkedList(svgAlphaComposite.getDefinitionSet());
compositeDefs.addAll(svgCustomComposite.getDefinitionSet());
return compositeDefs;
}
1.3 +8 -11 xml-batik/sources/org/apache/batik/svggen/SVGCompositeDescriptor.java
Index: SVGCompositeDescriptor.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGCompositeDescriptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGCompositeDescriptor.java 2001/03/26 09:45:13 1.2
+++ SVGCompositeDescriptor.java 2001/04/26 14:17:12 1.3
@@ -8,10 +8,7 @@
package org.apache.batik.svggen;
-import java.util.Map;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
+import java.util.*;
import org.w3c.dom.Element;
@@ -20,7 +17,7 @@
* to values: an SVG opacity and a filter
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGCompositeDescriptor.java,v 1.2 2001/03/26 09:45:13 tkormann Exp $
+ * @version $Id: SVGCompositeDescriptor.java,v 1.3 2001/04/26 14:17:12 cjolif Exp $
*/
public class SVGCompositeDescriptor implements SVGDescriptor, SVGSyntax{
private Element def;
@@ -52,9 +49,9 @@
return def;
}
- public Map getAttributeMap(Map attrMap){
+ public Map getAttributeMap(Map attrMap) {
if(attrMap == null)
- attrMap = new Hashtable();
+ attrMap = new HashMap();
attrMap.put(SVG_OPACITY_ATTRIBUTE, opacityValue);
attrMap.put(SVG_FILTER_ATTRIBUTE, filterValue);
@@ -62,11 +59,11 @@
return attrMap;
}
- public Set getDefinitionSet(Set defSet){
- if(defSet == null)
- defSet = new HashSet();
+ public List getDefinitionSet(List defSet) {
+ if (defSet == null)
+ defSet = new LinkedList();
- if(def != null)
+ if (def != null)
defSet.add(def);
return defSet;
1.4 +3 -3 xml-batik/sources/org/apache/batik/svggen/SVGConverter.java
Index: SVGConverter.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SVGConverter.java 2001/03/19 11:22:29 1.3
+++ SVGConverter.java 2001/04/26 14:17:13 1.4
@@ -8,7 +8,7 @@
package org.apache.batik.svggen;
-import java.util.Set;
+import java.util.List;
import org.apache.batik.ext.awt.g2d.GraphicContext;
@@ -17,7 +17,7 @@
* part or all of a GraphicContext.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGConverter.java,v 1.3 2001/03/19 11:22:29 cjolif Exp $
+ * @version $Id: SVGConverter.java,v 1.4 2001/04/26 14:17:13 cjolif Exp $
* @see org.apache.batik.ext.awt.g2d.GraphicContext
*/
public interface SVGConverter extends SVGSyntax{
@@ -40,5 +40,5 @@
* If no definition is needed, an empty set should be
* returned.
*/
- public Set getDefinitionSet();
+ public List getDefinitionSet();
}
1.7 +1 -6 xml-batik/sources/org/apache/batik/svggen/SVGConvolveOp.java
Index: SVGConvolveOp.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGConvolveOp.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SVGConvolveOp.java 2001/03/21 14:35:53 1.6
+++ SVGConvolveOp.java 2001/04/26 14:17:14 1.7
@@ -10,11 +10,6 @@
import java.awt.image.*;
import java.awt.*;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -24,7 +19,7 @@
* an SVG filter descriptor.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGConvolveOp.java,v 1.6 2001/03/21 14:35:53 cjolif Exp $
+ * @version $Id: SVGConvolveOp.java,v 1.7 2001/04/26 14:17:14 cjolif Exp $
* @see org.apache.batik.svggen.SVGBufferedImageOp
*/
public class SVGConvolveOp extends AbstractSVGFilterConverter {
1.4 +1 -6 xml-batik/sources/org/apache/batik/svggen/SVGCustomBufferedImageOp.java
Index: SVGCustomBufferedImageOp.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGCustomBufferedImageOp.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SVGCustomBufferedImageOp.java 2001/03/23 17:23:12 1.3
+++ SVGCustomBufferedImageOp.java 2001/04/26 14:17:15 1.4
@@ -11,11 +11,6 @@
import java.awt.image.*;
import java.awt.geom.*;
import java.awt.*;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -25,7 +20,7 @@
* an equivalent SVG filter.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGCustomBufferedImageOp.java,v 1.3 2001/03/23 17:23:12 cjolif Exp $
+ * @version $Id: SVGCustomBufferedImageOp.java,v 1.4 2001/04/26 14:17:15 cjolif Exp $
* @see org.apache.batik.svggen.SVGBufferedImageOp
*/
public class SVGCustomBufferedImageOp extends AbstractSVGFilterConverter {
1.5 +1 -6 xml-batik/sources/org/apache/batik/svggen/SVGCustomComposite.java
Index: SVGCustomComposite.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGCustomComposite.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SVGCustomComposite.java 2001/03/23 17:23:12 1.4
+++ SVGCustomComposite.java 2001/04/26 14:17:16 1.5
@@ -10,11 +10,6 @@
import java.awt.geom.*;
import java.awt.*;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -26,7 +21,7 @@
* a set of SVG properties and definitions.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGCustomComposite.java,v 1.4 2001/03/23 17:23:12 cjolif Exp $
+ * @version $Id: SVGCustomComposite.java,v 1.5 2001/04/26 14:17:16 cjolif Exp $
* @see org.apache.batik.svggen.SVGComposite
*/
public class SVGCustomComposite extends AbstractSVGConverter {
1.5 +1 -6 xml-batik/sources/org/apache/batik/svggen/SVGCustomPaint.java
Index: SVGCustomPaint.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGCustomPaint.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SVGCustomPaint.java 2001/03/23 17:23:13 1.4
+++ SVGCustomPaint.java 2001/04/26 14:17:17 1.5
@@ -10,11 +10,6 @@
import java.awt.geom.*;
import java.awt.*;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -26,7 +21,7 @@
* a set of SVG properties and definitions.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGCustomPaint.java,v 1.4 2001/03/23 17:23:13 cjolif Exp $
+ * @version $Id: SVGCustomPaint.java,v 1.5 2001/04/26 14:17:17 cjolif Exp $
* @see org.apache.batik.svggen.SVGPaint
*/
public class SVGCustomPaint extends AbstractSVGConverter {
1.3 +3 -3 xml-batik/sources/org/apache/batik/svggen/SVGDescriptor.java
Index: SVGDescriptor.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGDescriptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGDescriptor.java 2001/03/19 11:22:29 1.2
+++ SVGDescriptor.java 2001/04/26 14:17:17 1.3
@@ -9,14 +9,14 @@
package org.apache.batik.svggen;
import java.util.Map;
-import java.util.Set;
+import java.util.List;
/**
* Defines the interface for a set of SVG attributes and
* related definitions.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGDescriptor.java,v 1.2 2001/03/19 11:22:29 cjolif Exp $
+ * @version $Id: SVGDescriptor.java,v 1.3 2001/04/26 14:17:17 cjolif Exp $
* @see org.apache.batik.ext.awt.g2d.GraphicContext
*/
public interface SVGDescriptor{
@@ -39,5 +39,5 @@
* @return a set containing Elements that represent the definition
* of the descriptor's attribute values
*/
- public Set getDefinitionSet(Set defSet);
+ public List getDefinitionSet(List defSet);
}
1.4 +3 -3 xml-batik/sources/org/apache/batik/svggen/SVGFilterConverter.java
Index: SVGFilterConverter.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGFilterConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SVGFilterConverter.java 2001/04/02 13:36:06 1.3
+++ SVGFilterConverter.java 2001/04/26 14:17:18 1.4
@@ -10,14 +10,14 @@
import java.awt.Rectangle;
import java.awt.image.BufferedImageOp;
-import java.util.Set;
+import java.util.List;
/**
* Defines the interface for classes that are able to convert
* a BufferedImageOp filter.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGFilterConverter.java,v 1.3 2001/04/02 13:36:06 cjolif Exp $
+ * @version $Id: SVGFilterConverter.java,v 1.4 2001/04/26 14:17:18 cjolif Exp $
* @see org.apache.batik.svggen.SVGFilterDescriptor
*/
public interface SVGFilterConverter extends SVGSyntax {
@@ -42,5 +42,5 @@
* If no definition is needed, an empty set should be
* returned.
*/
- public Set getDefinitionSet();
+ public List getDefinitionSet();
}
1.12 +3 -3 xml-batik/sources/org/apache/batik/svggen/SVGFont.java
Index: SVGFont.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGFont.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SVGFont.java 2001/04/03 08:28:50 1.11
+++ SVGFont.java 2001/04/26 14:17:19 1.12
@@ -9,7 +9,7 @@
package org.apache.batik.svggen;
import java.awt.Font;
-import java.util.Hashtable;
+import java.util.HashMap;
import java.util.Map;
import java.awt.font.TextAttribute;
@@ -21,7 +21,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: SVGFont.java,v 1.11 2001/04/03 08:28:50 cjolif Exp $
+ * @version $Id: SVGFont.java,v 1.12 2001/04/26 14:17:19 cjolif Exp $
*/
public class SVGFont extends AbstractSVGConverter {
public static final float EXTRA_LIGHT =
@@ -108,7 +108,7 @@
/**
* Logical fonts mapping
*/
- static Hashtable logicalFontMap = new Hashtable();
+ static Map logicalFontMap = new HashMap();
static {
logicalFontMap.put("dialog", "sans-serif");
1.3 +6 -9 xml-batik/sources/org/apache/batik/svggen/SVGFontDescriptor.java
Index: SVGFontDescriptor.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGFontDescriptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGFontDescriptor.java 2001/04/02 13:36:06 1.2
+++ SVGFontDescriptor.java 2001/04/26 14:17:19 1.3
@@ -8,10 +8,7 @@
package org.apache.batik.svggen;
-import java.util.Map;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
+import java.util.*;
import org.w3c.dom.*;
@@ -19,7 +16,7 @@
* Describes an SVG font
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGFontDescriptor.java,v 1.2 2001/04/02 13:36:06 cjolif Exp $
+ * @version $Id: SVGFontDescriptor.java,v 1.3 2001/04/26 14:17:19 cjolif Exp $
* @see org.apache.batik.svggen.SVGFont
*/
public class SVGFontDescriptor implements SVGDescriptor, SVGSyntax {
@@ -49,7 +46,7 @@
public Map getAttributeMap(Map attrMap){
if(attrMap == null)
- attrMap = new Hashtable();
+ attrMap = new HashMap();
attrMap.put(SVG_FONT_SIZE_ATTRIBUTE, fontSize);
attrMap.put(SVG_FONT_WEIGHT_ATTRIBUTE, fontWeight);
@@ -59,9 +56,9 @@
return attrMap;
}
- public Set getDefinitionSet(Set defSet){
- if(defSet == null)
- defSet = new HashSet();
+ public List getDefinitionSet(List defSet){
+ if (defSet == null)
+ defSet = new LinkedList();
return defSet;
}
1.7 +221 -221 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SVGGeneratorContext.java 2001/04/18 12:18:18 1.6
+++ SVGGeneratorContext.java 2001/04/26 14:17:20 1.7
@@ -1,221 +1,221 @@
-/*****************************************************************************
- * Copyright (C) The Apache Software Foundation. All rights reserved. *
- * ------------------------------------------------------------------------- *
- * This software is published under the terms of the Apache Software License *
- * version 1.1, a copy of which has been included with this distribution in *
- * the LICENSE file. *
- *****************************************************************************/
-
-package org.apache.batik.svggen;
-
-import org.w3c.dom.Document;
-
-/**
- * This class contains all non graphical contextual information that
- * are needed by the {@link org.apache.batik.svggen.SVGGraphics2D} to
- * generate SVG from Java 2D primitives.
- * You can subclass it to change the defaults.
- *
- * @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.6 2001/04/18 12:18:18 cjolif Exp $
- */
-public class SVGGeneratorContext implements ErrorConstants {
- // this fields are package access for read-only purpose
-
- /**
- * Factory used by this Graphics2D to create Elements
- * that make the SVG DOM Tree
- */
- Document domFactory;
-
- /**
- * Handler that defines how images are referenced in the
- * generated SVG fragment. This allows different strategies
- * to be used to handle images.
- * @see org.apache.batik.svggen.ImageHandler
- * @see org.apache.batik.svggen.ImageHandlerBase64Encoder
- * @see org.apache.batik.svggen.ImageHandlerPNGEncoder
- * @see org.apache.batik.svggen.ImageHandlerJPEGEncoder
- */
- ImageHandler imageHandler;
-
- /**
- * To deal with Java 2D extension (custom java.awt.Paint for example).
- */
- ExtensionHandler extensionHandler;
-
- /**
- * To generate consitent ids.
- */
- SVGIDGenerator idGenerator;
-
- /**
- * To set style.
- */
- StyleHandler styleHandler;
-
- /**
- * The comment to insert at generation time.
- */
- String generatorComment;
-
- /**
- * The error handler.
- */
- ErrorHandler errorHandler;
-
- /**
- * Builds an instance of <code>SVGGeneratorContext</code> with the given
- * <code>domFactory</code> but let the user set later the other contextual
- * information.
- * @see #setIDGenerator
- * @see #setExtensionHandler
- * @see #setImageHandler
- */
- protected SVGGeneratorContext(Document domFactory) {
- setDOMFactory(domFactory);
- }
-
- /**
- * Creates an instance of <code>SVGGeneratorContext</code> with the
- * given <code>domFactory</code> and with the default values for the
- * other information.
- * @see org.apache.batik.svggen.SVGIDGenerator
- * @see org.apache.batik.svggen.DefaultExtensionHandler
- * @see org.apache.batik.svggen.ImageHandlerBase64Encoder
- */
- public static SVGGeneratorContext createDefault(Document domFactory) {
- SVGGeneratorContext ctx = new SVGGeneratorContext(domFactory);
- ctx.setIDGenerator(new SVGIDGenerator());
- ctx.setExtensionHandler(new DefaultExtensionHandler());
- ctx.setImageHandler(new ImageHandlerBase64Encoder());
- ctx.setStyleHandler(new DefaultStyleHandler());
- ctx.setComment("Generated by the Batik Graphics2D SVG Generator");
- ctx.setErrorHandler(new DefaultErrorHandler());
- return ctx;
- }
-
- /**
- * Returns the {@link org.apache.batik.svggen.SVGIDGenerator} that
- * has been set.
- */
- final public SVGIDGenerator getIDGenerator() {
- return idGenerator;
- }
-
- /**
- * Sets the {@link org.apache.batik.svggen.SVGIDGenerator}
- * to be used. It should not be <code>null</code>.
- */
- final protected void setIDGenerator(SVGIDGenerator idGenerator) {
- if (idGenerator == null)
- throw new SVGGraphics2DRuntimeException(ERR_ID_GENERATOR_NULL);
- this.idGenerator = idGenerator;
- }
-
- /**
- * Returns the DOM Factory that
- * has been set.
- */
- final public Document getDOMFactory() {
- return domFactory;
- }
-
- /**
- * Sets the DOM Factory
- * to be used. It should not be <code>null</code>.
- */
- final protected void setDOMFactory(Document domFactory) {
- if (domFactory == null)
- throw new SVGGraphics2DRuntimeException(ERR_DOM_FACTORY_NULL);
- this.domFactory = domFactory;
- }
-
- /**
- * Returns the {@link org.apache.batik.svggen.ExtensionHandler} that
- * has been set.
- */
- final public ExtensionHandler getExtensionHandler() {
- return extensionHandler;
- }
-
- /**
- * Sets the {@link org.apache.batik.svggen.ExtensionHandler}
- * to be used. It should not be <code>null</code>.
- */
- final protected void setExtensionHandler(ExtensionHandler extensionHandler) {
- if (extensionHandler == null)
- throw new SVGGraphics2DRuntimeException(ERR_EXTENSION_HANDLER_NULL);
- this.extensionHandler = extensionHandler;
- }
-
- /**
- * Returns the {@link org.apache.batik.svggen.ImageHandler} that
- * has been set.
- */
- final public ImageHandler getImageHandler() {
- return imageHandler;
- }
-
- /**
- * Sets the {@link org.apache.batik.svggen.ImageHandler}
- * to be used. It should not be <code>null</code>.
- */
- final protected void setImageHandler(ImageHandler imageHandler) {
- if (imageHandler == null)
- throw new SVGGraphics2DRuntimeException(ERR_IMAGE_HANDLER_NULL);
- this.imageHandler = imageHandler;
- }
-
- /**
- * Returns the {@link org.apache.batik.svggen.StyleHandler} that
- * has been set.
- */
- final public StyleHandler getStyleHandler() {
- return styleHandler;
- }
-
- /**
- * Sets the {@link org.apache.batik.svggen.Stylehandler}
- * to be used. It should not be <code>null</code>.
- */
- final protected void setStyleHandler(StyleHandler styleHandler) {
- if (styleHandler == null)
- throw new SVGGraphics2DRuntimeException(ERR_STYLE_HANDLER_NULL);
- this.styleHandler = styleHandler;
- }
-
- /**
- * Returns the comment to be generated in the SVG file.
- */
- final public String getComment() {
- return generatorComment;
- }
-
- /**
- * Sets the comment to be used. It can be <code>null</code> if you
- * want to disable it.
- */
- final protected void setComment(String generatorComment) {
- this.generatorComment = generatorComment;
- }
-
- /**
- * Returns the {@link org.apache.batik.svggen.ErrorHandler} that
- * has been set.
- */
- final public ErrorHandler getErrorHandler() {
- return errorHandler;
- }
-
- /**
- * Sets the {@link org.apache.batik.svggen.Errorhandler}
- * to be used. It should not be <code>null</code>.
- */
- final protected void setErrorHandler(ErrorHandler errorHandler) {
- if (errorHandler == null)
- throw new SVGGraphics2DRuntimeException(ERR_ERROR_HANDLER_NULL);
- this.errorHandler = errorHandler;
- }
-}
+/*****************************************************************************
+ * Copyright (C) The Apache Software Foundation. All rights reserved. *
+ * ------------------------------------------------------------------------- *
+ * This software is published under the terms of the Apache Software License *
+ * version 1.1, a copy of which has been included with this distribution in *
+ * the LICENSE file. *
+ *****************************************************************************/
+
+package org.apache.batik.svggen;
+
+import org.w3c.dom.Document;
+
+/**
+ * This class contains all non graphical contextual information that
+ * are needed by the {@link org.apache.batik.svggen.SVGGraphics2D} to
+ * generate SVG from Java 2D primitives.
+ * You can subclass it to change the defaults.
+ *
+ * @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.7 2001/04/26 14:17:20 cjolif Exp $
+ */
+public class SVGGeneratorContext implements ErrorConstants {
+ // this fields are package access for read-only purpose
+
+ /**
+ * Factory used by this Graphics2D to create Elements
+ * that make the SVG DOM Tree
+ */
+ Document domFactory;
+
+ /**
+ * Handler that defines how images are referenced in the
+ * generated SVG fragment. This allows different strategies
+ * to be used to handle images.
+ * @see org.apache.batik.svggen.ImageHandler
+ * @see org.apache.batik.svggen.ImageHandlerBase64Encoder
+ * @see org.apache.batik.svggen.ImageHandlerPNGEncoder
+ * @see org.apache.batik.svggen.ImageHandlerJPEGEncoder
+ */
+ ImageHandler imageHandler;
+
+ /**
+ * To deal with Java 2D extension (custom java.awt.Paint for example).
+ */
+ ExtensionHandler extensionHandler;
+
+ /**
+ * To generate consitent ids.
+ */
+ SVGIDGenerator idGenerator;
+
+ /**
+ * To set style.
+ */
+ StyleHandler styleHandler;
+
+ /**
+ * The comment to insert at generation time.
+ */
+ String generatorComment;
+
+ /**
+ * The error handler.
+ */
+ ErrorHandler errorHandler;
+
+ /**
+ * Builds an instance of <code>SVGGeneratorContext</code> with the given
+ * <code>domFactory</code> but let the user set later the other contextual
+ * information.
+ * @see #setIDGenerator
+ * @see #setExtensionHandler
+ * @see #setImageHandler
+ */
+ protected SVGGeneratorContext(Document domFactory) {
+ setDOMFactory(domFactory);
+ }
+
+ /**
+ * Creates an instance of <code>SVGGeneratorContext</code> with the
+ * given <code>domFactory</code> and with the default values for the
+ * other information.
+ * @see org.apache.batik.svggen.SVGIDGenerator
+ * @see org.apache.batik.svggen.DefaultExtensionHandler
+ * @see org.apache.batik.svggen.ImageHandlerBase64Encoder
+ */
+ public static SVGGeneratorContext createDefault(Document domFactory) {
+ SVGGeneratorContext ctx = new SVGGeneratorContext(domFactory);
+ ctx.setIDGenerator(new SVGIDGenerator());
+ ctx.setExtensionHandler(new DefaultExtensionHandler());
+ ctx.setImageHandler(new ImageHandlerBase64Encoder());
+ ctx.setStyleHandler(new DefaultStyleHandler());
+ ctx.setComment("Generated by the Batik Graphics2D SVG Generator");
+ ctx.setErrorHandler(new DefaultErrorHandler());
+ return ctx;
+ }
+
+ /**
+ * Returns the {@link org.apache.batik.svggen.SVGIDGenerator} that
+ * has been set.
+ */
+ final public SVGIDGenerator getIDGenerator() {
+ return idGenerator;
+ }
+
+ /**
+ * Sets the {@link org.apache.batik.svggen.SVGIDGenerator}
+ * to be used. It should not be <code>null</code>.
+ */
+ final protected void setIDGenerator(SVGIDGenerator idGenerator) {
+ if (idGenerator == null)
+ throw new SVGGraphics2DRuntimeException(ERR_ID_GENERATOR_NULL);
+ this.idGenerator = idGenerator;
+ }
+
+ /**
+ * Returns the DOM Factory that
+ * has been set.
+ */
+ final public Document getDOMFactory() {
+ return domFactory;
+ }
+
+ /**
+ * Sets the DOM Factory
+ * to be used. It should not be <code>null</code>.
+ */
+ final protected void setDOMFactory(Document domFactory) {
+ if (domFactory == null)
+ throw new SVGGraphics2DRuntimeException(ERR_DOM_FACTORY_NULL);
+ this.domFactory = domFactory;
+ }
+
+ /**
+ * Returns the {@link org.apache.batik.svggen.ExtensionHandler} that
+ * has been set.
+ */
+ final public ExtensionHandler getExtensionHandler() {
+ return extensionHandler;
+ }
+
+ /**
+ * Sets the {@link org.apache.batik.svggen.ExtensionHandler}
+ * to be used. It should not be <code>null</code>.
+ */
+ final protected void setExtensionHandler(ExtensionHandler extensionHandler) {
+ if (extensionHandler == null)
+ throw new SVGGraphics2DRuntimeException(ERR_EXTENSION_HANDLER_NULL);
+ this.extensionHandler = extensionHandler;
+ }
+
+ /**
+ * Returns the {@link org.apache.batik.svggen.ImageHandler} that
+ * has been set.
+ */
+ final public ImageHandler getImageHandler() {
+ return imageHandler;
+ }
+
+ /**
+ * Sets the {@link org.apache.batik.svggen.ImageHandler}
+ * to be used. It should not be <code>null</code>.
+ */
+ final protected void setImageHandler(ImageHandler imageHandler) {
+ if (imageHandler == null)
+ throw new SVGGraphics2DRuntimeException(ERR_IMAGE_HANDLER_NULL);
+ this.imageHandler = imageHandler;
+ }
+
+ /**
+ * Returns the {@link org.apache.batik.svggen.StyleHandler} that
+ * has been set.
+ */
+ final public StyleHandler getStyleHandler() {
+ return styleHandler;
+ }
+
+ /**
+ * Sets the {@link org.apache.batik.svggen.Stylehandler}
+ * to be used. It should not be <code>null</code>.
+ */
+ final protected void setStyleHandler(StyleHandler styleHandler) {
+ if (styleHandler == null)
+ throw new SVGGraphics2DRuntimeException(ERR_STYLE_HANDLER_NULL);
+ this.styleHandler = styleHandler;
+ }
+
+ /**
+ * Returns the comment to be generated in the SVG file.
+ */
+ final public String getComment() {
+ return generatorComment;
+ }
+
+ /**
+ * Sets the comment to be used. It can be <code>null</code> if you
+ * want to disable it.
+ */
+ final protected void setComment(String generatorComment) {
+ this.generatorComment = generatorComment;
+ }
+
+ /**
+ * Returns the {@link org.apache.batik.svggen.ErrorHandler} that
+ * has been set.
+ */
+ final public ErrorHandler getErrorHandler() {
+ return errorHandler;
+ }
+
+ /**
+ * Sets the {@link org.apache.batik.svggen.Errorhandler}
+ * to be used. It should not be <code>null</code>.
+ */
+ final protected void setErrorHandler(ErrorHandler errorHandler) {
+ if (errorHandler == null)
+ throw new SVGGraphics2DRuntimeException(ERR_ERROR_HANDLER_NULL);
+ this.errorHandler = errorHandler;
+ }
+}
1.9 +3 -6 xml-batik/sources/org/apache/batik/svggen/SVGGraphicContextConverter.java
Index: SVGGraphicContextConverter.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGGraphicContextConverter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SVGGraphicContextConverter.java 2001/04/02 13:36:07 1.8
+++ SVGGraphicContextConverter.java 2001/04/26 14:17:21 1.9
@@ -8,10 +8,7 @@
package org.apache.batik.svggen;
-import java.awt.*;
-import java.awt.geom.*;
import java.util.*;
-import java.awt.font.*;
import org.w3c.dom.*;
@@ -25,7 +22,7 @@
* SVG attributes.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGGraphicContextConverter.java,v 1.8 2001/04/02 13:36:07 cjolif Exp $
+ * @version $Id: SVGGraphicContextConverter.java,v 1.9 2001/04/26 14:17:21 cjolif Exp $
*/
public class SVGGraphicContextConverter {
private static final int GRAPHIC_CONTEXT_CONVERTER_COUNT = 6;
@@ -104,8 +101,8 @@
* @return a set of element containing definitions for the attribute
* values generated by this converter since its creation.
*/
- public Set getDefinitionSet() {
- Set defSet = new HashSet();
+ public List getDefinitionSet() {
+ List defSet = new LinkedList();
for(int i=0; i<converters.length; i++)
defSet.addAll(converters[i].getDefinitionSet());
1.4 +1 -5 xml-batik/sources/org/apache/batik/svggen/SVGGraphicObjectConverter.java
Index: SVGGraphicObjectConverter.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGGraphicObjectConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SVGGraphicObjectConverter.java 2001/04/02 13:36:07 1.3
+++ SVGGraphicObjectConverter.java 2001/04/26 14:17:22 1.4
@@ -8,17 +8,13 @@
package org.apache.batik.svggen;
-import java.util.Map;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
import org.w3c.dom.Document;
/**
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGGraphicObjectConverter.java,v 1.3 2001/04/02 13:36:07 cjolif Exp $
+ * @version $Id: SVGGraphicObjectConverter.java,v 1.4 2001/04/26 14:17:22 cjolif Exp $
*/
public abstract class SVGGraphicObjectConverter implements SVGSyntax {
/**
1.18 +2 -2 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SVGGraphics2D.java 2001/04/20 15:52:17 1.17
+++ SVGGraphics2D.java 2001/04/26 14:17:22 1.18
@@ -44,7 +44,7 @@
*
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGGraphics2D.java,v 1.17 2001/04/20 15:52:17 cjolif Exp $
+ * @version $Id: SVGGraphics2D.java,v 1.18 2001/04/26 14:17:22 cjolif Exp $
* @see org.apache.batik.ext.awt.g2d.GraphicContext
* @see org.apache.batik.svggen.DOMTreeManager
* @see org.apache.batik.svggen.DOMGroupManager
@@ -358,7 +358,7 @@
* contain all the definitions referenced by the attributes generated by
* the various converters. This also resets the converters.
*/
- public Set getDefinitionSet(){
+ public java.util.List getDefinitionSet(){
return domTreeManager.getDefinitionSet();
}
1.5 +2 -2 xml-batik/sources/org/apache/batik/svggen/SVGGraphics2DUnitTester.java
Index: SVGGraphics2DUnitTester.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGGraphics2DUnitTester.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SVGGraphics2DUnitTester.java 2001/03/26 09:45:14 1.4
+++ SVGGraphics2DUnitTester.java 2001/04/26 14:17:23 1.5
@@ -31,7 +31,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: SVGGraphics2DUnitTester.java,v 1.4 2001/03/26 09:45:14 tkormann Exp $
+ * @version $Id: SVGGraphics2DUnitTester.java,v 1.5 2001/04/26 14:17:23 cjolif Exp $
*/
public class SVGGraphics2DUnitTester implements SVGConstants {
private String[] args;
@@ -878,7 +878,7 @@
traceSVGGC(modifiedSVGGC, converter);
- Set defSet = converter.getDefinitionSet();
+ java.util.List defSet = converter.getDefinitionSet();
Iterator iter = defSet.iterator();
Element defs = domFactory.createElementNS(SVG_NAMESPACE_URI, SVG_DEFS_TAG);
while(iter.hasNext()){
1.4 +8 -13 xml-batik/sources/org/apache/batik/svggen/SVGHintsDescriptor.java
Index: SVGHintsDescriptor.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGHintsDescriptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SVGHintsDescriptor.java 2001/04/02 13:36:08 1.3
+++ SVGHintsDescriptor.java 2001/04/26 14:17:24 1.4
@@ -8,10 +8,7 @@
package org.apache.batik.svggen;
-import java.util.Map;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
+import java.util.*;
import org.w3c.dom.*;
@@ -19,12 +16,10 @@
* Describes a set of SVG hints
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGHintsDescriptor.java,v 1.3 2001/04/02 13:36:08 cjolif Exp $
+ * @version $Id: SVGHintsDescriptor.java,v 1.4 2001/04/26 14:17:24 cjolif Exp $
* @see org.apache.batik.svggen.SVGRenderingHints
*/
public class SVGHintsDescriptor implements SVGDescriptor, SVGSyntax {
- public static final String ERROR_NULL_INPUT = "none of the input arguments should be null";
-
private String colorInterpolation;
private String colorRendering;
private String textRendering;
@@ -53,9 +48,9 @@
this.imageRendering = imageRendering;
}
- public Map getAttributeMap(Map attrMap){
- if(attrMap == null)
- attrMap = new Hashtable();
+ public Map getAttributeMap(Map attrMap) {
+ if (attrMap == null)
+ attrMap = new HashMap();
attrMap.put(SVG_COLOR_INTERPOLATION_ATTRIBUTE, colorInterpolation);
attrMap.put(SVG_COLOR_RENDERING_ATTRIBUTE, colorRendering);
@@ -66,9 +61,9 @@
return attrMap;
}
- public Set getDefinitionSet(Set defSet){
- if(defSet == null)
- defSet = new HashSet();
+ public List getDefinitionSet(List defSet) {
+ if (defSet == null)
+ defSet = new LinkedList();
return defSet;
}
1.3 +3 -3 xml-batik/sources/org/apache/batik/svggen/SVGIDGenerator.java
Index: SVGIDGenerator.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGIDGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGIDGenerator.java 2001/03/21 14:36:10 1.2
+++ SVGIDGenerator.java 2001/04/26 14:17:25 1.3
@@ -9,17 +9,17 @@
package org.apache.batik.svggen;
import java.util.Map;
-import java.util.Hashtable;
+import java.util.HashMap;
/**
* Generates id for an arbitrary number of prefix
*
* @author <a href="mailto:cjolif@ilog.fr">Christophe Jolif</a>
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGIDGenerator.java,v 1.2 2001/03/21 14:36:10 cjolif Exp $
+ * @version $Id: SVGIDGenerator.java,v 1.3 2001/04/26 14:17:25 cjolif Exp $
*/
public class SVGIDGenerator {
- private Map prefixMap = new Hashtable();
+ private Map prefixMap = new HashMap();
public void SVGIDGenerator() {
}
1.11 +1 -6 xml-batik/sources/org/apache/batik/svggen/SVGLinearGradient.java
Index: SVGLinearGradient.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGLinearGradient.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SVGLinearGradient.java 2001/03/26 12:37:34 1.10
+++ SVGLinearGradient.java 2001/04/26 14:17:26 1.11
@@ -12,11 +12,6 @@
import java.awt.GradientPaint;
import java.awt.Paint;
import java.awt.geom.Point2D;
-import java.util.Map;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -28,7 +23,7 @@
* SVG linear gradient element
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGLinearGradient.java,v 1.10 2001/03/26 12:37:34 tkormann Exp $
+ * @version $Id: SVGLinearGradient.java,v 1.11 2001/04/26 14:17:26 cjolif Exp $
*/
public class SVGLinearGradient extends AbstractSVGConverter {
/**
1.11 +1 -6 xml-batik/sources/org/apache/batik/svggen/SVGLookupOp.java
Index: SVGLookupOp.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGLookupOp.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SVGLookupOp.java 2001/04/02 13:36:08 1.10
+++ SVGLookupOp.java 2001/04/26 14:17:26 1.11
@@ -10,11 +10,6 @@
import java.awt.image.*;
import java.awt.*;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -27,7 +22,7 @@
* of the lookup table.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGLookupOp.java,v 1.10 2001/04/02 13:36:08 cjolif Exp $
+ * @version $Id: SVGLookupOp.java,v 1.11 2001/04/26 14:17:26 cjolif Exp $
* @see org.apache.batik.svggen.SVGBufferedImageOp
*/
public class SVGLookupOp extends AbstractSVGFilterConverter {
1.6 +4 -9 xml-batik/sources/org/apache/batik/svggen/SVGPaint.java
Index: SVGPaint.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGPaint.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SVGPaint.java 2001/04/04 13:10:02 1.5
+++ SVGPaint.java 2001/04/26 14:17:27 1.6
@@ -16,13 +16,8 @@
import java.awt.image.BufferedImage;
import java.awt.geom.Rectangle2D;
import java.awt.Rectangle;
+import java.util.*;
-import java.util.Map;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Iterator;
-
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -34,7 +29,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: SVGPaint.java,v 1.5 2001/04/04 13:10:02 cjolif Exp $
+ * @version $Id: SVGPaint.java,v 1.6 2001/04/26 14:17:27 cjolif Exp $
* @see org.apache.batik.svggen.SVGLinearGradient
* @see org.apache.batik.svggen.SVGTexturePaint
*/
@@ -79,8 +74,8 @@
* @return Set of Elements defining the Paints this
* converter has processed since it was created
*/
- public Set getDefinitionSet(){
- Set paintDefs = new HashSet(svgLinearGradient.getDefinitionSet());
+ public List getDefinitionSet(){
+ List paintDefs = new LinkedList(svgLinearGradient.getDefinitionSet());
paintDefs.addAll(svgTexturePaint.getDefinitionSet());
paintDefs.addAll(svgCustomPaint.getDefinitionSet());
paintDefs.addAll(svgColor.getDefinitionSet());
1.3 +5 -8 xml-batik/sources/org/apache/batik/svggen/SVGPaintDescriptor.java
Index: SVGPaintDescriptor.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGPaintDescriptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGPaintDescriptor.java 2001/03/26 09:45:15 1.2
+++ SVGPaintDescriptor.java 2001/04/26 14:17:27 1.3
@@ -8,10 +8,7 @@
package org.apache.batik.svggen;
-import java.util.Map;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
+import java.util.*;
import org.w3c.dom.Element;
@@ -20,7 +17,7 @@
* to values: an SVG paint value and an SVG opacity value
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGPaintDescriptor.java,v 1.2 2001/03/26 09:45:15 tkormann Exp $
+ * @version $Id: SVGPaintDescriptor.java,v 1.3 2001/04/26 14:17:27 cjolif Exp $
*/
public class SVGPaintDescriptor implements SVGDescriptor, SVGSyntax{
private Element def;
@@ -54,7 +51,7 @@
public Map getAttributeMap(Map attrMap){
if(attrMap == null)
- attrMap = new Hashtable();
+ attrMap = new HashMap();
attrMap.put(SVG_FILL_ATTRIBUTE, paintValue);
attrMap.put(SVG_STROKE_ATTRIBUTE, paintValue);
@@ -64,9 +61,9 @@
return attrMap;
}
- public Set getDefinitionSet(Set defSet){
+ public List getDefinitionSet(List defSet){
if(defSet == null)
- defSet = new HashSet();
+ defSet = new LinkedList();
if(def != null)
defSet.add(def);
1.8 +1 -4 xml-batik/sources/org/apache/batik/svggen/SVGRenderingHints.java
Index: SVGRenderingHints.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGRenderingHints.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SVGRenderingHints.java 2001/03/26 12:37:35 1.7
+++ SVGRenderingHints.java 2001/04/26 14:17:29 1.8
@@ -10,9 +10,6 @@
import java.awt.geom.*;
import java.awt.*;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Hashtable;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -35,7 +32,7 @@
* + TEXT_ANTIALIASING -> text-rendering
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGRenderingHints.java,v 1.7 2001/03/26 12:37:35 tkormann Exp $
+ * @version $Id: SVGRenderingHints.java,v 1.8 2001/04/26 14:17:29 cjolif Exp $
*/
public class SVGRenderingHints extends AbstractSVGConverter{
/**
1.10 +1 -6 xml-batik/sources/org/apache/batik/svggen/SVGRescaleOp.java
Index: SVGRescaleOp.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGRescaleOp.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SVGRescaleOp.java 2001/04/02 13:36:09 1.9
+++ SVGRescaleOp.java 2001/04/26 14:17:30 1.10
@@ -10,11 +10,6 @@
import java.awt.image.*;
import java.awt.*;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -28,7 +23,7 @@
* offsets.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGRescaleOp.java,v 1.9 2001/04/02 13:36:09 cjolif Exp $
+ * @version $Id: SVGRescaleOp.java,v 1.10 2001/04/26 14:17:30 cjolif Exp $
* @see org.apache.batik.svggen.SVGBufferedImageOp
*/
public class SVGRescaleOp extends AbstractSVGFilterConverter {
1.5 +1 -4 xml-batik/sources/org/apache/batik/svggen/SVGShape.java
Index: SVGShape.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGShape.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SVGShape.java 2001/03/21 14:36:22 1.4
+++ SVGShape.java 2001/04/26 14:17:31 1.5
@@ -11,9 +11,6 @@
import java.awt.geom.*;
import java.awt.*;
-import java.util.Map;
-import java.util.Hashtable;
-
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -30,7 +27,7 @@
* + Any custom Shape implementation is mapped to path as well.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGShape.java,v 1.4 2001/03/21 14:36:22 cjolif Exp $
+ * @version $Id: SVGShape.java,v 1.5 2001/04/26 14:17:31 cjolif Exp $
*/
public class SVGShape extends SVGGraphicObjectConverter {
/*
1.4 +5 -8 xml-batik/sources/org/apache/batik/svggen/SVGStrokeDescriptor.java
Index: SVGStrokeDescriptor.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGStrokeDescriptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SVGStrokeDescriptor.java 2001/04/02 13:36:09 1.3
+++ SVGStrokeDescriptor.java 2001/04/26 14:17:32 1.4
@@ -8,10 +8,7 @@
package org.apache.batik.svggen;
-import java.util.Map;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
+import java.util.*;
import org.w3c.dom.Element;
@@ -20,7 +17,7 @@
* to values: an SVG paint value and an SVG opacity value
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGStrokeDescriptor.java,v 1.3 2001/04/02 13:36:09 cjolif Exp $
+ * @version $Id: SVGStrokeDescriptor.java,v 1.4 2001/04/26 14:17:32 cjolif Exp $
*/
public class SVGStrokeDescriptor implements SVGDescriptor, SVGSyntax{
private String strokeWidth;
@@ -59,7 +56,7 @@
public Map getAttributeMap(Map attrMap){
if(attrMap == null)
- attrMap = new Hashtable();
+ attrMap = new HashMap();
attrMap.put(SVG_STROKE_WIDTH_ATTRIBUTE, strokeWidth);
attrMap.put(SVG_STROKE_LINECAP_ATTRIBUTE, capStyle);
@@ -71,9 +68,9 @@
return attrMap;
}
- public Set getDefinitionSet(Set defSet){
+ public List getDefinitionSet(List defSet){
if(defSet == null)
- defSet = new HashSet();
+ defSet = new LinkedList();
return defSet;
}
1.13 +1 -7 xml-batik/sources/org/apache/batik/svggen/SVGTexturePaint.java
Index: SVGTexturePaint.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGTexturePaint.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SVGTexturePaint.java 2001/04/02 15:48:08 1.12
+++ SVGTexturePaint.java 2001/04/26 14:17:33 1.13
@@ -15,12 +15,6 @@
import java.awt.geom.Rectangle2D;
import java.awt.Rectangle;
-import java.util.Map;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Iterator;
-
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -31,7 +25,7 @@
* SVG pattern element
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGTexturePaint.java,v 1.12 2001/04/02 15:48:08 cjolif Exp $
+ * @version $Id: SVGTexturePaint.java,v 1.13 2001/04/26 14:17:33 cjolif Exp $
*/
public class SVGTexturePaint extends AbstractSVGConverter {
/**
1.5 +6 -9 xml-batik/sources/org/apache/batik/svggen/SVGTransformDescriptor.java
Index: SVGTransformDescriptor.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGTransformDescriptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SVGTransformDescriptor.java 2001/03/26 09:45:16 1.4
+++ SVGTransformDescriptor.java 2001/04/26 14:17:33 1.5
@@ -8,10 +8,7 @@
package org.apache.batik.svggen;
-import java.util.Map;
-import java.util.Set;
-import java.util.Hashtable;
-import java.util.HashSet;
+import java.util.*;
import org.apache.batik.ext.awt.g2d.GraphicContext;
@@ -19,7 +16,7 @@
* Describes an SVG transform
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGTransformDescriptor.java,v 1.4 2001/03/26 09:45:16 tkormann Exp $
+ * @version $Id: SVGTransformDescriptor.java,v 1.5 2001/04/26 14:17:33 cjolif Exp $
* @see org.apache.batik.ext.awt.g2d.GraphicContext
*/
public class SVGTransformDescriptor implements SVGDescriptor, SVGSyntax{
@@ -39,7 +36,7 @@
*/
public Map getAttributeMap(Map attrMap){
if(attrMap == null)
- attrMap = new Hashtable();
+ attrMap = new HashMap();
attrMap.put(SVG_TRANSFORM_ATTRIBUTE, transform);
@@ -55,9 +52,9 @@
* @return a set containing Elements that represent the definition
* of the descriptor's attribute values
*/
- public Set getDefinitionSet(Set defSet){
- if(defSet == null)
- defSet = new HashSet();
+ public List getDefinitionSet(List defSet) {
+ if (defSet == null)
+ defSet = new LinkedList();
return defSet;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: batik-dev-unsubscribe@xml.apache.org
For additional commands, e-mail: batik-dev-help@xml.apache.org