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 vh...@apache.org on 2001/01/29 21:36:12 UTC
cvs commit: xml-batik/sources/org/apache/batik/svggen AbstractImageHandlerEncoder.java DOMGroupManager.java DOMTreeManager.java DefaultImageHandler.java ImageHandlerBase64Encoder.java ImageHandlerJPEGEncoder.java ImageHandlerPNGEncoder.java SVGAlphaComposite.java SVGBasicStroke.java SVGBufferedImageOp.java SVGCSSStyler.java SVGClip.java SVGColor.java SVGConvolveOp.java SVGEllipse.java SVGFont.java SVGGraphics2D.java SVGLine.java SVGLinearGradient.java SVGLookupOp.java SVGPath.java SVGPolygon.java SVGRectangle.java SVGRenderingHints.java SVGRescaleOp.java SVGTexturePaint.java SwingSVGPrettyPrint.java
vhardy 01/01/29 12:36:11
Modified: sources/org/apache/batik/svggen
AbstractImageHandlerEncoder.java
DOMGroupManager.java DOMTreeManager.java
DefaultImageHandler.java
ImageHandlerBase64Encoder.java
ImageHandlerJPEGEncoder.java
ImageHandlerPNGEncoder.java SVGAlphaComposite.java
SVGBasicStroke.java SVGBufferedImageOp.java
SVGCSSStyler.java SVGClip.java SVGColor.java
SVGConvolveOp.java SVGEllipse.java SVGFont.java
SVGGraphics2D.java SVGLine.java
SVGLinearGradient.java SVGLookupOp.java
SVGPath.java SVGPolygon.java SVGRectangle.java
SVGRenderingHints.java SVGRescaleOp.java
SVGTexturePaint.java SwingSVGPrettyPrint.java
Log:
a. Now uses DOM2 API's getAttributeNS and setAttributeNS instead of legacy
DOM1 API calls getAttribute and setAttribute.
b. Modified font size conversion attribute (no longer uses pt units).
Revision Changes Path
1.2 +2 -2 xml-batik/sources/org/apache/batik/svggen/AbstractImageHandlerEncoder.java
Index: AbstractImageHandlerEncoder.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/AbstractImageHandlerEncoder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractImageHandlerEncoder.java 2001/01/23 17:12:14 1.1
+++ AbstractImageHandlerEncoder.java 2001/01/29 20:35:02 1.2
@@ -26,7 +26,7 @@
* of the file created by this handler.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: AbstractImageHandlerEncoder.java,v 1.1 2001/01/23 17:12:14 tkormann Exp $
+ * @version $Id: AbstractImageHandlerEncoder.java,v 1.2 2001/01/29 20:35:02 vhardy Exp $
* @see org.apache.batik.svggen.SVGGraphics2D
* @see org.apache.batik.svggen.ImageHandlerJPEGEncoder
* @see org.apache.batik.svggen.ImageHandlerPNGEncoder
@@ -141,7 +141,7 @@
encodeImage(buf, imageFile);
// Update HREF
- imageElement.setAttribute(ATTR_HREF, urlRoot + "/" + imageFile.getName());
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, ATTR_HREF, urlRoot + "/" + imageFile.getName());
}
/**
1.2 +6 -6 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMGroupManager.java 2001/01/23 17:12:16 1.1
+++ DOMGroupManager.java 2001/01/29 20:35:04 1.2
@@ -44,7 +44,7 @@
* DOMTreeManager handle group managers that would be used concurrently.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: DOMGroupManager.java,v 1.1 2001/01/23 17:12:16 tkormann Exp $
+ * @version $Id: DOMGroupManager.java,v 1.2 2001/01/29 20:35:04 vhardy Exp $
*/
public class DOMGroupManager implements SVGSyntax{
static final String ERROR_GC_NULL = "gc should not be null";
@@ -199,7 +199,7 @@
private void setTransform(Element element, TransformStackElement transformStack[]){
String transform = domTreeManager.gcConverter.toSVG(transformStack).trim();
if(transform.length() > 0)
- element.setAttribute(ATTR_TRANSFORM, transform);
+ element.setAttributeNS(SVG_NAMESPACE_URI, ATTR_TRANSFORM, transform);
}
/**
@@ -212,8 +212,8 @@
Iterator iter = attrMap.keySet().iterator();
while(iter.hasNext()){
String attrName = (String)iter.next();
- if(element.getAttribute(attrName).length() == 0)
- element.setAttribute(attrName, (String)attrMap.get(attrName));
+ if(element.getAttributeNS(SVG_NAMESPACE_URI, attrName).length() == 0)
+ element.setAttributeNS(SVG_NAMESPACE_URI, attrName, (String)attrMap.get(attrName));
}
}
@@ -321,8 +321,8 @@
Element path = domFactory.createElement(TAG_PATH);
Element polygon = domFactory.createElement(TAG_POLYGON);
- rect.setAttribute(ATTR_FILL, VALUE_NONE);
- polygon.setAttribute(ATTR_STROKE, VALUE_NONE);
+ rect.setAttributeNS(SVG_NAMESPACE_URI, ATTR_FILL, VALUE_NONE);
+ polygon.setAttributeNS(SVG_NAMESPACE_URI, ATTR_STROKE, VALUE_NONE);
domTreeManager.addElement(rect);
1.2 +7 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMTreeManager.java 2001/01/23 17:12:16 1.1
+++ DOMTreeManager.java 2001/01/29 20:35:05 1.2
@@ -42,7 +42,7 @@
* +-- [g] Group n
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: DOMTreeManager.java,v 1.1 2001/01/23 17:12:16 tkormann Exp $
+ * @version $Id: DOMTreeManager.java,v 1.2 2001/01/29 20:35:05 vhardy Exp $
*/
public class DOMTreeManager implements SVGSyntax{
static final String ERROR_GC_NULL = "gc should not be null";
@@ -247,7 +247,7 @@
// Enable background if required by AlphaComposite convertion
if(gcConverter.getCompositeConverter().getAlphaCompositeConverter().requiresBackgroundAccess())
- svg.setAttribute(SVG_ENABLE_BACKGROUND_ATTRIBUTE, VALUE_NEW);
+ svg.setAttributeNS(SVG_NAMESPACE_URI, SVG_ENABLE_BACKGROUND_ATTRIBUTE, VALUE_NEW);
Comment generatorComment = domFactory.createComment(GENERATOR_COMMENT);
svg.appendChild(generatorComment);
@@ -257,7 +257,7 @@
Iterator iter = groupDefaults.keySet().iterator();
while(iter.hasNext()){
String attrName = (String)iter.next();
- svg.setAttribute(attrName, (String)groupDefaults.get(attrName));
+ svg.setAttributeNS(SVG_NAMESPACE_URI, attrName, (String)groupDefaults.get(attrName));
}
svg.appendChild(getGenericDefinitions());
@@ -277,7 +277,7 @@
genericDefs.appendChild((Element)iter.next());
}
- genericDefs.setAttribute(ATTR_ID, ID_PREFIX_GENERIC_DEFS);
+ genericDefs.setAttributeNS(SVG_NAMESPACE_URI, ATTR_ID, ID_PREFIX_GENERIC_DEFS);
return genericDefs;
}
@@ -357,7 +357,7 @@
if(defElement == null){
defElement = domFactory.createElement(SVG_DEFS_TAG);
- defElement.setAttribute(ATTR_ID, SVGIDGenerator.generateID(ID_PREFIX_DEFS));
+ defElement.setAttributeNS(SVG_NAMESPACE_URI, ATTR_ID, SVGIDGenerator.generateID(ID_PREFIX_DEFS));
if(topLevelGroup.getChildNodes().getLength() > 0)
topLevelGroup.insertBefore(defElement, topLevelGroup.getFirstChild());
else
@@ -415,8 +415,8 @@
Element path = domFactory.createElement(TAG_PATH);
Element polygon = domFactory.createElement(TAG_POLYGON);
- rect.setAttribute(SVG_FILL_ATTRIBUTE, SVG_NONE_VALUE);
- polygon.setAttribute(ATTR_STROKE, SVG_NONE_VALUE);
+ rect.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILL_ATTRIBUTE, SVG_NONE_VALUE);
+ polygon.setAttributeNS(SVG_NAMESPACE_URI, ATTR_STROKE, SVG_NONE_VALUE);
domGroupManager.addElement(rect);
1.2 +10 -10 xml-batik/sources/org/apache/batik/svggen/DefaultImageHandler.java
Index: DefaultImageHandler.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/DefaultImageHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultImageHandler.java 2001/01/23 17:12:17 1.1
+++ DefaultImageHandler.java 2001/01/29 20:35:08 1.2
@@ -20,7 +20,7 @@
* attribute and sets the width and height of the element.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: DefaultImageHandler.java,v 1.1 2001/01/23 17:12:17 tkormann Exp $
+ * @version $Id: DefaultImageHandler.java,v 1.2 2001/01/29 20:35:08 vhardy Exp $
* @see org.apache.batik.svggen.SVGGraphics2D
*/
public class DefaultImageHandler implements ImageHandler{
@@ -32,8 +32,8 @@
//
// First, set the image width and height
//
- imageElement.setAttribute(SVG_WIDTH_ATTRIBUTE, "" + image.getWidth(null));
- imageElement.setAttribute(SVG_HEIGHT_ATTRIBUTE, "" + image.getHeight(null));
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_WIDTH_ATTRIBUTE, "" + image.getWidth(null));
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_HEIGHT_ATTRIBUTE, "" + image.getHeight(null));
//
// Now, set the href
@@ -49,8 +49,8 @@
//
// First, set the image width and height
//
- imageElement.setAttribute(SVG_WIDTH_ATTRIBUTE, "" + image.getWidth());
- imageElement.setAttribute(SVG_HEIGHT_ATTRIBUTE, "" + image.getHeight());
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_WIDTH_ATTRIBUTE, "" + image.getWidth());
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_HEIGHT_ATTRIBUTE, "" + image.getHeight());
//
// Now, set the href
@@ -66,8 +66,8 @@
//
// First, set the image width and height
//
- imageElement.setAttribute(SVG_WIDTH_ATTRIBUTE, "" + image.getWidth());
- imageElement.setAttribute(SVG_HEIGHT_ATTRIBUTE, "" + image.getHeight());
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_WIDTH_ATTRIBUTE, "" + image.getWidth());
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_HEIGHT_ATTRIBUTE, "" + image.getHeight());
//
// Now, set the href
@@ -81,7 +81,7 @@
*/
protected void handleHREF(Image image, Element imageElement){
// Simply write a placeholder
- imageElement.setAttribute(ATTR_HREF, image.toString());
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, ATTR_HREF, image.toString());
}
/**
@@ -92,7 +92,7 @@
System.out.println("********************************************");
System.out.println("Setting HREF attribute....");
// Simply write a placeholder
- imageElement.setAttribute(ATTR_HREF, image.toString());
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, ATTR_HREF, image.toString());
}
/**
@@ -101,6 +101,6 @@
*/
protected void handleHREF(RenderableImage image, Element imageElement){
// Simply write a placeholder
- imageElement.setAttribute(ATTR_HREF, image.toString());
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, ATTR_HREF, image.toString());
}
}
1.2 +6 -6 xml-batik/sources/org/apache/batik/svggen/ImageHandlerBase64Encoder.java
Index: ImageHandlerBase64Encoder.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/ImageHandlerBase64Encoder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImageHandlerBase64Encoder.java 2001/01/29 19:46:40 1.1
+++ ImageHandlerBase64Encoder.java 2001/01/29 20:35:10 1.2
@@ -28,7 +28,7 @@
* the data protocol.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: ImageHandlerBase64Encoder.java,v 1.1 2001/01/29 19:46:40 vhardy Exp $
+ * @version $Id: ImageHandlerBase64Encoder.java,v 1.2 2001/01/29 20:35:10 vhardy Exp $
* @see org.apache.batik.svggen.SVGGraphics2D
* @see org.apache.batik.svggen.ImageHandler
*/
@@ -79,9 +79,9 @@
}
protected void handleEmptyImage(Element imageElement){
- imageElement.setAttribute(ATTR_HREF, DATA_PROTOCOL_PNG_PREFIX);
- imageElement.setAttribute(SVG_WIDTH_ATTRIBUTE, "0");
- imageElement.setAttribute(SVG_HEIGHT_ATTRIBUTE, "0");
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, ATTR_HREF, DATA_PROTOCOL_PNG_PREFIX);
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_WIDTH_ATTRIBUTE, "0");
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_HEIGHT_ATTRIBUTE, "0");
}
/**
@@ -113,7 +113,7 @@
//
// Finally, write out url
//
- imageElement.setAttribute(ATTR_HREF,
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, ATTR_HREF,
DATA_PROTOCOL_PNG_PREFIX +
os.toString());
@@ -164,7 +164,7 @@
System.out.println();
System.out.println("<svg width=\"450\" height=\"500\">");
System.out.println(" <rect width=\"100%\" height=\"100%\" fill=\"yellow\" />");
- System.out.println(" <image x=\"30\" y=\"30\" xlink:href=\"" + imageElement.getAttribute(SVGSyntax.ATTR_HREF) + "\" width=\"100\" height=\"100\" />");
+ System.out.println(" <image x=\"30\" y=\"30\" xlink:href=\"" + imageElement.getAttributeNS(SVG_NAMESPACE_URI, SVGSyntax.ATTR_HREF) + "\" width=\"100\" height=\"100\" />");
System.out.println("</svg>");
System.exit(0);
}
1.2 +2 -2 xml-batik/sources/org/apache/batik/svggen/ImageHandlerJPEGEncoder.java
Index: ImageHandlerJPEGEncoder.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/ImageHandlerJPEGEncoder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImageHandlerJPEGEncoder.java 2001/01/23 17:12:18 1.1
+++ ImageHandlerJPEGEncoder.java 2001/01/29 20:35:11 1.2
@@ -26,7 +26,7 @@
* image elements it handles.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: ImageHandlerJPEGEncoder.java,v 1.1 2001/01/23 17:12:18 tkormann Exp $
+ * @version $Id: ImageHandlerJPEGEncoder.java,v 1.2 2001/01/29 20:35:11 vhardy Exp $
* @see org.apache.batik.svggen.SVGGraphics2D
* @see org.apache.batik.svggen.ImageHandlerJPEGEncoder
* @see org.apache.batik.svggen.ImageHandlerPNGEncoder
@@ -112,7 +112,7 @@
g.dispose();
imageHandler.handleImage((RenderedImage)testImage, imageElement);
- System.out.println("Generated xlink:href is : " + imageElement.getAttribute(SVGSyntax.ATTR_HREF));
+ System.out.println("Generated xlink:href is : " + imageElement.getAttributeNS(SVG_NAMESPACE_URI, SVGSyntax.ATTR_HREF));
System.exit(0);
}
}
1.2 +2 -2 xml-batik/sources/org/apache/batik/svggen/ImageHandlerPNGEncoder.java
Index: ImageHandlerPNGEncoder.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/ImageHandlerPNGEncoder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImageHandlerPNGEncoder.java 2001/01/23 17:12:18 1.1
+++ ImageHandlerPNGEncoder.java 2001/01/29 20:35:12 1.2
@@ -27,7 +27,7 @@
* image elements it handles.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: ImageHandlerPNGEncoder.java,v 1.1 2001/01/23 17:12:18 tkormann Exp $
+ * @version $Id: ImageHandlerPNGEncoder.java,v 1.2 2001/01/29 20:35:12 vhardy Exp $
* @see org.apache.batik.svggen.SVGGraphics2D
* @see org.apache.batik.svggen.ImageHandlerJPEGEncoder
* @see org.apache.batik.svggen.ImageHandlerPNGEncoder
@@ -109,7 +109,7 @@
g.dispose();
imageHandler.handleImage((RenderedImage)testImage, imageElement);
- System.out.println("Generated xlink:href is : " + imageElement.getAttribute(SVGSyntax.ATTR_HREF));
+ System.out.println("Generated xlink:href is : " + imageElement.getAttributeNS(SVG_NAMESPACE_URI, SVGSyntax.ATTR_HREF));
System.exit(0);
}
}
1.2 +24 -24 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGAlphaComposite.java 2001/01/23 17:12:19 1.1
+++ SVGAlphaComposite.java 2001/01/29 20:35:14 1.2
@@ -34,7 +34,7 @@
* 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.1 2001/01/23 17:12:19 tkormann Exp $
+ * @version $Id: SVGAlphaComposite.java,v 1.2 2001/01/29 20:35:14 vhardy Exp $
* @see org.apache.batik.svggen.SVGAlphaComposite
*/
public class SVGAlphaComposite extends AbstractSVGConverter{
@@ -131,7 +131,7 @@
// Process the filter value
StringBuffer filterAttrBuf = new StringBuffer(URL_PREFIX);
filterAttrBuf.append(SIGN_POUND);
- filterAttrBuf.append(filterDef.getAttribute(ATTR_ID));
+ filterAttrBuf.append(filterDef.getAttributeNS(SVG_NAMESPACE_URI, ATTR_ID));
filterAttrBuf.append(URL_SUFFIX);
filterValue = filterAttrBuf.toString();
@@ -222,32 +222,32 @@
}
Element compositeFilter = domFactory.createElement(SVG_FILTER_TAG);
- compositeFilter.setAttribute(ATTR_ID, id);
- compositeFilter.setAttribute(SVG_FILTER_UNITS_ATTRIBUTE,
+ compositeFilter.setAttributeNS(SVG_NAMESPACE_URI, ATTR_ID, id);
+ compositeFilter.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILTER_UNITS_ATTRIBUTE,
SVG_OBJECT_BOUNDING_BOX_VALUE);
- compositeFilter.setAttribute(SVG_X_ATTRIBUTE, VALUE_ZERO_PERCENT);
- compositeFilter.setAttribute(SVG_Y_ATTRIBUTE, VALUE_ZERO_PERCENT);
- compositeFilter.setAttribute(SVG_WIDTH_ATTRIBUTE, VALUE_HUNDRED_PERCENT);
- compositeFilter.setAttribute(SVG_HEIGHT_ATTRIBUTE, VALUE_HUNDRED_PERCENT);
+ compositeFilter.setAttributeNS(SVG_NAMESPACE_URI, SVG_X_ATTRIBUTE, VALUE_ZERO_PERCENT);
+ compositeFilter.setAttributeNS(SVG_NAMESPACE_URI, SVG_Y_ATTRIBUTE, VALUE_ZERO_PERCENT);
+ compositeFilter.setAttributeNS(SVG_NAMESPACE_URI, SVG_WIDTH_ATTRIBUTE, VALUE_HUNDRED_PERCENT);
+ compositeFilter.setAttributeNS(SVG_NAMESPACE_URI, SVG_HEIGHT_ATTRIBUTE, VALUE_HUNDRED_PERCENT);
Element feComposite = domFactory.createElement(SVG_FE_COMPOSITE_TAG);
- feComposite.setAttribute(SVG_OPERATOR_ATTRIBUTE, operator);
- feComposite.setAttribute(SVG_IN_ATTRIBUTE, input1);
- feComposite.setAttribute(SVG_IN2_ATTRIBUTE, input2);
- feComposite.setAttribute(SVG_K2_ATTRIBUTE, k2);
- feComposite.setAttribute(ATTR_RESULT, VALUE_COMPOSITE);
+ feComposite.setAttributeNS(SVG_NAMESPACE_URI, SVG_OPERATOR_ATTRIBUTE, operator);
+ feComposite.setAttributeNS(SVG_NAMESPACE_URI, SVG_IN_ATTRIBUTE, input1);
+ feComposite.setAttributeNS(SVG_NAMESPACE_URI, SVG_IN2_ATTRIBUTE, input2);
+ feComposite.setAttributeNS(SVG_NAMESPACE_URI, SVG_K2_ATTRIBUTE, k2);
+ feComposite.setAttributeNS(SVG_NAMESPACE_URI, ATTR_RESULT, VALUE_COMPOSITE);
Element feFlood = domFactory.createElement(SVG_FE_FLOOD_TAG);
- feFlood.setAttribute(SVG_FLOOD_COLOR_ATTRIBUTE, "white");
- feFlood.setAttribute(SVG_FLOOD_OPACITY_ATTRIBUTE, "1");
- feFlood.setAttribute(ATTR_RESULT, VALUE_FLOOD);
+ feFlood.setAttributeNS(SVG_NAMESPACE_URI, SVG_FLOOD_COLOR_ATTRIBUTE, "white");
+ feFlood.setAttributeNS(SVG_NAMESPACE_URI, SVG_FLOOD_OPACITY_ATTRIBUTE, "1");
+ feFlood.setAttributeNS(SVG_NAMESPACE_URI, ATTR_RESULT, VALUE_FLOOD);
Element feMerge = domFactory.createElement(SVG_FE_MERGE_TAG);
Element feMergeNodeFlood = domFactory.createElement(SVG_FE_MERGE_NODE_TAG);
- feMergeNodeFlood.setAttribute(SVG_IN_ATTRIBUTE, VALUE_FLOOD);
+ feMergeNodeFlood.setAttributeNS(SVG_NAMESPACE_URI, SVG_IN_ATTRIBUTE, VALUE_FLOOD);
Element feMergeNodeComposite = domFactory.createElement(SVG_FE_MERGE_NODE_TAG);
- feMergeNodeComposite.setAttribute(SVG_IN_ATTRIBUTE, VALUE_COMPOSITE);
+ feMergeNodeComposite.setAttributeNS(SVG_NAMESPACE_URI, SVG_IN_ATTRIBUTE, VALUE_COMPOSITE);
feMerge.appendChild(feMergeNodeFlood);
feMerge.appendChild(feMergeNodeComposite);
@@ -283,11 +283,11 @@
SVGAlphaComposite converter = new SVGAlphaComposite(domFactory);
Element groupOne = domFactory.createElement(SVG_G_TAG);
- groupOne.setAttribute(ATTR_ID, "groupOne");
+ groupOne.setAttributeNS(SVG_NAMESPACE_URI, ATTR_ID, "groupOne");
buildTestGroup(groupOne, composites, converter);
Element groupTwo = domFactory.createElement(SVG_G_TAG);
- groupTwo.setAttribute(ATTR_ID, "group2");
+ groupTwo.setAttributeNS(SVG_NAMESPACE_URI, ATTR_ID, "group2");
buildTestGroup(groupTwo, composites, converter);
Element defs = domFactory.createElement(SVG_DEFS_TAG);
@@ -298,12 +298,12 @@
}
Element groupThree = domFactory.createElement(SVG_G_TAG);
- groupThree.setAttribute(ATTR_ID, "groupThree");
+ groupThree.setAttributeNS(SVG_NAMESPACE_URI, ATTR_ID, "groupThree");
SVGAlphaComposite newConverter = new SVGAlphaComposite(domFactory);
buildTestGroup(groupThree, new AlphaComposite[]{ ac.SrcIn, ac.DstOut },
newConverter);
Element newDefs = domFactory.createElement(SVG_DEFS_TAG);
- newDefs.setAttribute(ATTR_ID, "alphaCompositeSubset");
+ newDefs.setAttributeNS(SVG_NAMESPACE_URI, ATTR_ID, "alphaCompositeSubset");
Iterator newIter = newConverter.getDefinitionSet().iterator();
while(newIter.hasNext()){
Element filter = (Element)newIter.next();
@@ -331,9 +331,9 @@
for(int i=0; i<composites.length; i++){
SVGCompositeDescriptor compositeDesc = converter.toSVG(composites[i]);
Element rect = domFactory.createElement(TAG_RECT);
- rect.setAttribute(ATTR_OPACITY, compositeDesc.getOpacityValue());
+ rect.setAttributeNS(SVG_NAMESPACE_URI, ATTR_OPACITY, compositeDesc.getOpacityValue());
if(compositeDesc.getDef() != null)
- rect.setAttribute(SVG_FILTER_ATTRIBUTE, compositeDesc.getFilterValue());
+ rect.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILTER_ATTRIBUTE, compositeDesc.getFilterValue());
group.appendChild(rect);
}
}
1.2 +2 -2 xml-batik/sources/org/apache/batik/svggen/SVGBasicStroke.java
Index: SVGBasicStroke.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGBasicStroke.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGBasicStroke.java 2001/01/23 17:12:20 1.1
+++ SVGBasicStroke.java 2001/01/29 20:35:15 1.2
@@ -17,7 +17,7 @@
* a set of SVG style attributes
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGBasicStroke.java,v 1.1 2001/01/23 17:12:20 tkormann Exp $
+ * @version $Id: SVGBasicStroke.java,v 1.2 2001/01/29 20:35:15 vhardy Exp $
*/
public class SVGBasicStroke extends AbstractSVGConverter{
/**
@@ -157,7 +157,7 @@
while(iter.hasNext()){
String attrName = (String)iter.next();
String attrValue = (String)attrMap.get(attrName);
- rectElement.setAttribute(attrName, attrValue);
+ rectElement.setAttributeNS(SVG_NAMESPACE_URI, attrName, attrValue);
}
rectGroup.appendChild(rectElement);
}
1.2 +3 -3 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGBufferedImageOp.java 2001/01/23 17:12:20 1.1
+++ SVGBufferedImageOp.java 2001/01/29 20:35:16 1.2
@@ -25,7 +25,7 @@
* an SVG filter.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGBufferedImageOp.java,v 1.1 2001/01/23 17:12:20 tkormann Exp $
+ * @version $Id: SVGBufferedImageOp.java,v 1.2 2001/01/29 20:35:16 vhardy Exp $
* @see org.apache.batik.svggen.SVGCustomBufferedImageOp
* @see org.apache.batik.svggen.SVGLookupOp
* @see org.apache.batik.svggen.SVGRescaleOp
@@ -158,7 +158,7 @@
SVGFilterDescriptor filterDesc = converter.toSVG(ops[i], null);
if(filterDesc != null){
Element rect = domFactory.createElement(TAG_RECT);
- rect.setAttribute(SVG_FILTER_ATTRIBUTE, filterDesc.getFilterValue());
+ rect.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILTER_ATTRIBUTE, filterDesc.getFilterValue());
rectGroupOne.appendChild(rect);
}
}
@@ -167,7 +167,7 @@
SVGFilterDescriptor filterDesc = converter.toSVG(ops[i], null);
if(filterDesc != null){
Element rect = domFactory.createElement(TAG_RECT);
- rect.setAttribute(SVG_FILTER_ATTRIBUTE, filterDesc.getFilterValue());
+ rect.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILTER_ATTRIBUTE, filterDesc.getFilterValue());
rectGroupTwo.appendChild(rect);
}
}
1.2 +2 -2 xml-batik/sources/org/apache/batik/svggen/SVGCSSStyler.java
Index: SVGCSSStyler.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGCSSStyler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGCSSStyler.java 2001/01/23 17:12:20 1.1
+++ SVGCSSStyler.java 2001/01/29 20:35:18 1.2
@@ -17,7 +17,7 @@
* attribute into one that uses the CSS style attribute instead
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGCSSStyler.java,v 1.1 2001/01/23 17:12:20 tkormann Exp $
+ * @version $Id: SVGCSSStyler.java,v 1.2 2001/01/29 20:35:18 vhardy Exp $
*/
public class SVGCSSStyler implements SVGSyntax{
static private String CSS_PROPERTY_VALUE_SEPARATOR = ":";
@@ -57,7 +57,7 @@
if(styleAttrBuffer.length() > 0){
// System.out.println("Setting style attribute on node: " + styleAttrBuffer.toString().trim());
// There were some styling attributes
- element.setAttribute(ATTR_STYLE, styleAttrBuffer.toString().trim());
+ element.setAttributeNS(SVG_NAMESPACE_URI, ATTR_STYLE, styleAttrBuffer.toString().trim());
int n = toBeRemoved.size();
for(int i=0; i<n; i++)
1.2 +8 -8 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGClip.java 2001/01/23 17:12:20 1.1
+++ SVGClip.java 2001/01/29 20:35:19 1.2
@@ -23,7 +23,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.1 2001/01/23 17:12:20 tkormann Exp $
+ * @version $Id: SVGClip.java,v 1.2 2001/01/29 20:35:19 vhardy Exp $
*/
public class SVGClip extends AbstractSVGConverter{
/**
@@ -81,7 +81,7 @@
if(clipDesc == null){
Element clipDef = clipToSVG(clip);
clipPathAttrBuf.append(SIGN_POUND);
- clipPathAttrBuf.append(clipDef.getAttribute(ATTR_ID));
+ clipPathAttrBuf.append(clipDef.getAttributeNS(SVG_NAMESPACE_URI, ATTR_ID));
clipPathAttrBuf.append(URL_SUFFIX);
clipDesc = new SVGClipDescriptor(clipPathAttrBuf.toString(),
@@ -106,8 +106,8 @@
*/
private Element clipToSVG(Shape clip){
Element clipDef = domFactory.createElement(SVG_CLIP_PATH_TAG);
- clipDef.setAttribute(SVG_CLIP_PATH_UNITS_ATTRIBUTE, SVG_USER_SPACE_ON_USE_VALUE);
- clipDef.setAttribute(ATTR_ID, SVGIDGenerator.generateID(ID_PREFIX_CLIP_PATH));
+ clipDef.setAttributeNS(SVG_NAMESPACE_URI, SVG_CLIP_PATH_UNITS_ATTRIBUTE, SVG_USER_SPACE_ON_USE_VALUE);
+ clipDef.setAttributeNS(SVG_NAMESPACE_URI, ATTR_ID, SVGIDGenerator.generateID(ID_PREFIX_CLIP_PATH));
Element clipPath = shapeConverter.toSVG(clip);
clipDef.appendChild(clipPath);
@@ -189,8 +189,8 @@
Element groupOne = domFactory.createElement(SVG_G_TAG);
for(int i=0; i<clips.length; i++){
Element rect = domFactory.createElement(TAG_RECT);
- rect.setAttribute(ATTR_ID, clips[i].getClass().getName());
- rect.setAttribute(SVG_CLIP_PATH_ATTRIBUTE, (String)converter.toSVG(clips[i]).getAttributeMap(null).get(SVG_CLIP_PATH_ATTRIBUTE));
+ rect.setAttributeNS(SVG_NAMESPACE_URI, ATTR_ID, clips[i].getClass().getName());
+ rect.setAttributeNS(SVG_NAMESPACE_URI, SVG_CLIP_PATH_ATTRIBUTE, (String)converter.toSVG(clips[i]).getAttributeMap(null).get(SVG_CLIP_PATH_ATTRIBUTE));
groupOne.appendChild(rect);
}
@@ -200,8 +200,8 @@
Element groupTwo = domFactory.createElement(SVG_G_TAG);
for(int i=0; i<clips.length; i++){
Element rect = domFactory.createElement(TAG_RECT);
- rect.setAttribute(ATTR_ID, clips[i].getClass().getName());
- rect.setAttribute(SVG_CLIP_PATH_ATTRIBUTE, (String)converter.toSVG(clips[i]).getAttributeMap(null).get(SVG_CLIP_PATH_ATTRIBUTE));
+ rect.setAttributeNS(SVG_NAMESPACE_URI, ATTR_ID, clips[i].getClass().getName());
+ rect.setAttributeNS(SVG_NAMESPACE_URI, SVG_CLIP_PATH_ATTRIBUTE, (String)converter.toSVG(clips[i]).getAttributeMap(null).get(SVG_CLIP_PATH_ATTRIBUTE));
groupTwo.appendChild(rect);
}
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGColor.java 2001/01/23 17:12:21 1.1
+++ SVGColor.java 2001/01/29 20:35:20 1.2
@@ -21,7 +21,7 @@
* corresponding SVG attributes.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGColor.java,v 1.1 2001/01/23 17:12:21 tkormann Exp $
+ * @version $Id: SVGColor.java,v 1.2 2001/01/29 20:35:20 vhardy Exp $
* @see org.apache.batik.svggen.DOMTreeManager
*/
public class SVGColor extends AbstractSVGConverter{
@@ -149,8 +149,8 @@
for(int i=0; i<testColors.length; i++){
SVGPaintDescriptor paintDesc = toSVG(testColors[i]);
Element rect = domFactory.createElement(TAG_RECT);
- rect.setAttribute(SVG_FILL_ATTRIBUTE, paintDesc.getPaintValue());
- rect.setAttribute(SVG_FILL_OPACITY_ATTRIBUTE, paintDesc.getOpacityValue());
+ rect.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILL_ATTRIBUTE, paintDesc.getPaintValue());
+ rect.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILL_OPACITY_ATTRIBUTE, paintDesc.getOpacityValue());
group.appendChild(rect);
}
1.2 +9 -9 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGConvolveOp.java 2001/01/23 17:12:22 1.1
+++ SVGConvolveOp.java 2001/01/29 20:35:23 1.2
@@ -24,7 +24,7 @@
* an SVG filter descriptor.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGConvolveOp.java,v 1.1 2001/01/23 17:12:22 tkormann Exp $
+ * @version $Id: SVGConvolveOp.java,v 1.2 2001/01/29 20:35:23 vhardy Exp $
* @see org.apache.batik.svggen.SVGBufferedImageOp
*/
public class SVGConvolveOp extends AbstractSVGFilterConverter{
@@ -76,7 +76,7 @@
domFactory.createElement(SVG_FE_CONVOLVE_MATRIX_TAG);
// Convert the kernel size
- feConvolveMatrixDef.setAttribute(SVG_ORDER_ATTRIBUTE,
+ feConvolveMatrixDef.setAttributeNS(SVG_NAMESPACE_URI, SVG_ORDER_ATTRIBUTE,
kernel.getWidth() + SPACE +
kernel.getHeight());
@@ -88,18 +88,18 @@
kernelMatrixBuf.append(SPACE);
}
- feConvolveMatrixDef.setAttribute(SVG_KERNEL_MATRIX_ATTRIBUTE,
+ feConvolveMatrixDef.setAttributeNS(SVG_NAMESPACE_URI, SVG_KERNEL_MATRIX_ATTRIBUTE,
kernelMatrixBuf.toString().trim());
filterDef.appendChild(feConvolveMatrixDef);
- filterDef.setAttribute(ATTR_ID, SVGIDGenerator.generateID(ID_PREFIX_FE_CONVOLVE_MATRIX));
+ filterDef.setAttributeNS(SVG_NAMESPACE_URI, ATTR_ID, SVGIDGenerator.generateID(ID_PREFIX_FE_CONVOLVE_MATRIX));
// Convert the edge mode
if(convolveOp.getEdgeCondition() == ConvolveOp.EDGE_NO_OP)
- feConvolveMatrixDef.setAttribute(SVG_EDGE_MODE_ATTRIBUTE,
+ feConvolveMatrixDef.setAttributeNS(SVG_NAMESPACE_URI, SVG_EDGE_MODE_ATTRIBUTE,
SVG_DUPLICATE_VALUE);
else
- feConvolveMatrixDef.setAttribute(SVG_EDGE_MODE_ATTRIBUTE,
+ feConvolveMatrixDef.setAttributeNS(SVG_NAMESPACE_URI, SVG_EDGE_MODE_ATTRIBUTE,
SVG_NONE_VALUE);
//
@@ -109,7 +109,7 @@
// Process filter attribute
StringBuffer filterAttrBuf = new StringBuffer(URL_PREFIX);
filterAttrBuf.append(SIGN_POUND);
- filterAttrBuf.append(filterDef.getAttribute(ATTR_ID));
+ filterAttrBuf.append(filterDef.getAttributeNS(SVG_NAMESPACE_URI, ATTR_ID));
filterAttrBuf.append(URL_SUFFIX);
filterDesc = new SVGFilterDescriptor(filterAttrBuf.toString(), filterDef);
@@ -145,14 +145,14 @@
for(int i=0; i<convolveOps.length; i++){
SVGFilterDescriptor filterDesc = converter.toSVG(convolveOps[i]);
Element rect = domFactory.createElement(TAG_RECT);
- rect.setAttribute(SVG_FILTER_ATTRIBUTE, filterDesc.getFilterValue());
+ rect.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILTER_ATTRIBUTE, filterDesc.getFilterValue());
rectGroupOne.appendChild(rect);
}
for(int i=0; i<convolveOps.length; i++){
SVGFilterDescriptor filterDesc = converter.toSVG(convolveOps[i]);
Element rect = domFactory.createElement(TAG_RECT);
- rect.setAttribute(SVG_FILTER_ATTRIBUTE, filterDesc.getFilterValue());
+ rect.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILTER_ATTRIBUTE, filterDesc.getFilterValue());
rectGroupTwo.appendChild(rect);
}
1.2 +8 -8 xml-batik/sources/org/apache/batik/svggen/SVGEllipse.java
Index: SVGEllipse.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGEllipse.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGEllipse.java 2001/01/23 17:12:24 1.1
+++ SVGEllipse.java 2001/01/29 20:35:24 1.2
@@ -19,7 +19,7 @@
* a corresponding SVG element, i.e., a circle or an ellipse.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGEllipse.java,v 1.1 2001/01/23 17:12:24 tkormann Exp $
+ * @version $Id: SVGEllipse.java,v 1.2 2001/01/29 20:35:24 vhardy Exp $
*/
public class SVGEllipse extends SVGGraphicObjectConverter{
/**
@@ -44,11 +44,11 @@
*/
private Element toSVGCircle(Ellipse2D ellipse){
Element svgCircle = domFactory.createElement(SVG_CIRCLE_TAG);
- svgCircle.setAttribute(SVG_CX_ATTRIBUTE,
+ svgCircle.setAttributeNS(SVG_NAMESPACE_URI, SVG_CX_ATTRIBUTE,
doubleString(ellipse.getX() + ellipse.getWidth()/2));
- svgCircle.setAttribute(SVG_CY_ATTRIBUTE,
+ svgCircle.setAttributeNS(SVG_NAMESPACE_URI, SVG_CY_ATTRIBUTE,
doubleString(ellipse.getY() + ellipse.getHeight()/2));
- svgCircle.setAttribute(SVG_R_ATTRIBUTE, doubleString(ellipse.getWidth()/2));
+ svgCircle.setAttributeNS(SVG_NAMESPACE_URI, SVG_R_ATTRIBUTE, doubleString(ellipse.getWidth()/2));
return svgCircle;
}
@@ -57,13 +57,13 @@
*/
private Element toSVGEllipse(Ellipse2D ellipse){
Element svgCircle = domFactory.createElement(SVG_ELLIPSE_TAG);
- svgCircle.setAttribute(SVG_CX_ATTRIBUTE,
+ svgCircle.setAttributeNS(SVG_NAMESPACE_URI, SVG_CX_ATTRIBUTE,
doubleString(ellipse.getX() + ellipse.getWidth()/2));
- svgCircle.setAttribute(SVG_CY_ATTRIBUTE,
+ svgCircle.setAttributeNS(SVG_NAMESPACE_URI, SVG_CY_ATTRIBUTE,
doubleString(ellipse.getY() + ellipse.getHeight()/2));
- svgCircle.setAttribute(SVG_RX_ATTRIBUTE,
+ svgCircle.setAttributeNS(SVG_NAMESPACE_URI, SVG_RX_ATTRIBUTE,
doubleString(ellipse.getWidth()/2));
- svgCircle.setAttribute(SVG_RY_ATTRIBUTE,
+ svgCircle.setAttributeNS(SVG_NAMESPACE_URI, SVG_RY_ATTRIBUTE,
doubleString(ellipse.getHeight()/2));
return svgCircle;
}
1.2 +6 -6 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGFont.java 2001/01/23 17:12:25 1.1
+++ SVGFont.java 2001/01/29 20:35:25 1.2
@@ -19,7 +19,7 @@
* font attributes
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGFont.java,v 1.1 2001/01/23 17:12:25 tkormann Exp $
+ * @version $Id: SVGFont.java,v 1.2 2001/01/29 20:35:25 vhardy Exp $
*/
public class SVGFont extends AbstractSVGConverter{
public static final float EXTRA_LIGHT = TextAttribute.WEIGHT_EXTRA_LIGHT.floatValue();
@@ -122,7 +122,7 @@
* @return description of attribute values that describe the font
*/
public static SVGFontDescriptor toSVG(Font font){
- String fontSize = "" + font.getSize() + "pt";
+ String fontSize = "" + font.getSize();
String fontWeight = weightToSVG(font);
String fontStyle = styleToSVG(font);
String fontFamilyStr = font.getFamily();
@@ -259,11 +259,11 @@
while(iter.hasNext()){
String attrName = (String)iter.next();
String attrValue = (String)attrMap.get(attrName);
- textElement.setAttribute(attrName, attrValue);
+ textElement.setAttributeNS(SVG_NAMESPACE_URI, attrName, attrValue);
}
- textElement.setAttribute(SVG_FONT_SIZE_ATTRIBUTE, "30");
- textElement.setAttribute(SVG_X_ATTRIBUTE, "30");
- textElement.setAttribute(SVG_Y_ATTRIBUTE, "" + (40*(i+1)));
+ textElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_FONT_SIZE_ATTRIBUTE, "30");
+ textElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_X_ATTRIBUTE, "30");
+ textElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_Y_ATTRIBUTE, "" + (40*(i+1)));
textElement.appendChild(domFactory.createTextNode(font.getFamily()));
group.appendChild(textElement);
}
1.3 +29 -29 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGGraphics2D.java 2001/01/29 19:46:41 1.2
+++ SVGGraphics2D.java 2001/01/29 20:35:27 1.3
@@ -41,7 +41,7 @@
*
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGGraphics2D.java,v 1.2 2001/01/29 19:46:41 vhardy Exp $
+ * @version $Id: SVGGraphics2D.java,v 1.3 2001/01/29 20:35:27 vhardy Exp $
* @see org.apache.batik.svggen.GraphicContext
* @see org.apache.batik.svggen.DOMTreeManager
* @see org.apache.batik.svggen.DOMGroupManager
@@ -387,8 +387,8 @@
public Element getRoot(){
Element svgRoot = domTreeManager.getRoot();
if(svgCanvasSize != null){
- svgRoot.setAttribute(SVG_WIDTH_ATTRIBUTE, "" + svgCanvasSize.width);
- svgRoot.setAttribute(SVG_HEIGHT_ATTRIBUTE, "" + svgCanvasSize.height);
+ svgRoot.setAttributeNS(SVG_NAMESPACE_URI, SVG_WIDTH_ATTRIBUTE, "" + svgCanvasSize.width);
+ svgRoot.setAttributeNS(SVG_NAMESPACE_URI, SVG_HEIGHT_ATTRIBUTE, "" + svgCanvasSize.height);
}
return svgRoot;
}
@@ -1020,11 +1020,11 @@
public boolean drawImage(Image img, int x, int y,
ImageObserver observer){
Element imageElement = domFactory.createElement(SVG_IMAGE_TAG);
- imageElement.setAttribute(SVG_X_ATTRIBUTE, Integer.toString(x));
- imageElement.setAttribute(SVG_Y_ATTRIBUTE, Integer.toString(y));
- imageElement.setAttribute(SVG_WIDTH_ATTRIBUTE,
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_X_ATTRIBUTE, Integer.toString(x));
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_Y_ATTRIBUTE, Integer.toString(y));
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_WIDTH_ATTRIBUTE,
Integer.toString(img.getWidth(null)));
- imageElement.setAttribute(SVG_HEIGHT_ATTRIBUTE,
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_HEIGHT_ATTRIBUTE,
Integer.toString(img.getHeight(null)));
imageHandler.handleImage(img, imageElement);
domGroupManager.addElement(imageElement);
@@ -1070,10 +1070,10 @@
ImageObserver observer){
Element imageElement = domFactory.createElement(SVG_IMAGE_TAG);
imageHandler.handleImage(img, imageElement);
- imageElement.setAttribute(SVG_X_ATTRIBUTE, Integer.toString(x));
- imageElement.setAttribute(SVG_Y_ATTRIBUTE, Integer.toString(y));
- imageElement.setAttribute(SVG_WIDTH_ATTRIBUTE, Integer.toString(width));
- imageElement.setAttribute(SVG_HEIGHT_ATTRIBUTE, Integer.toString(height));
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_X_ATTRIBUTE, Integer.toString(x));
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_Y_ATTRIBUTE, Integer.toString(y));
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_WIDTH_ATTRIBUTE, Integer.toString(width));
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_HEIGHT_ATTRIBUTE, Integer.toString(height));
domGroupManager.addElement(imageElement);
return true;
}
@@ -1352,7 +1352,7 @@
if(stroke instanceof BasicStroke){
Element svgShape = shapeConverter.toSVG(s);
if(svgShape != null){
- svgShape.setAttribute(SVG_FILL_ATTRIBUTE, SVG_NONE_VALUE);
+ svgShape.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILL_ATTRIBUTE, SVG_NONE_VALUE);
domGroupManager.addElement(svgShape);
}
}
@@ -1492,13 +1492,13 @@
//
Element imageElement = domFactory.createElement(SVG_IMAGE_TAG);
imageHandler.handleImage((Image)img, imageElement);
- imageElement.setAttribute(SVG_X_ATTRIBUTE, Integer.toString(x));
- imageElement.setAttribute(SVG_Y_ATTRIBUTE, Integer.toString(y));
- imageElement.setAttribute(SVG_WIDTH_ATTRIBUTE,
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_X_ATTRIBUTE, Integer.toString(x));
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_Y_ATTRIBUTE, Integer.toString(y));
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_WIDTH_ATTRIBUTE,
Integer.toString(img.getWidth(null)));
- imageElement.setAttribute(SVG_HEIGHT_ATTRIBUTE,
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_HEIGHT_ATTRIBUTE,
Integer.toString(img.getHeight(null)));
- imageElement.setAttribute(SVG_FILTER_ATTRIBUTE,
+ imageElement.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILTER_ATTRIBUTE,
filterDesc.getFilterValue());
Element imageGroup = domFactory.createElement(SVG_G_TAG);
imageGroup.appendChild(imageElement);
@@ -1541,10 +1541,10 @@
AffineTransform xform){
Element image = domFactory.createElement(SVG_IMAGE_TAG);
imageHandler.handleImage(img, image);
- image.setAttribute(SVG_X_ATTRIBUTE, Integer.toString(img.getMinX()));
- image.setAttribute(SVG_Y_ATTRIBUTE, Integer.toString(img.getMinY()));
- image.setAttribute(SVG_WIDTH_ATTRIBUTE, Integer.toString(img.getWidth()));
- image.setAttribute(SVG_HEIGHT_ATTRIBUTE, Integer.toString(img.getHeight()));
+ image.setAttributeNS(SVG_NAMESPACE_URI, SVG_X_ATTRIBUTE, Integer.toString(img.getMinX()));
+ image.setAttributeNS(SVG_NAMESPACE_URI, SVG_Y_ATTRIBUTE, Integer.toString(img.getMinY()));
+ image.setAttributeNS(SVG_NAMESPACE_URI, SVG_WIDTH_ATTRIBUTE, Integer.toString(img.getWidth()));
+ image.setAttributeNS(SVG_NAMESPACE_URI, SVG_HEIGHT_ATTRIBUTE, Integer.toString(img.getHeight()));
AffineTransform finalTransform = null;
if(xform.getDeterminant() != 0){
@@ -1603,13 +1603,13 @@
AffineTransform xform){
Element image = domFactory.createElement(SVG_IMAGE_TAG);
imageHandler.handleImage(img, image);
- image.setAttribute(SVG_X_ATTRIBUTE,
+ image.setAttributeNS(SVG_NAMESPACE_URI, SVG_X_ATTRIBUTE,
AbstractSVGConverter.doubleString(img.getMinX()));
- image.setAttribute(SVG_Y_ATTRIBUTE,
+ image.setAttributeNS(SVG_NAMESPACE_URI, SVG_Y_ATTRIBUTE,
AbstractSVGConverter.doubleString(img.getMinY()));
- image.setAttribute(SVG_WIDTH_ATTRIBUTE,
+ image.setAttributeNS(SVG_NAMESPACE_URI, SVG_WIDTH_ATTRIBUTE,
AbstractSVGConverter.doubleString(img.getWidth()));
- image.setAttribute(SVG_HEIGHT_ATTRIBUTE,
+ image.setAttributeNS(SVG_NAMESPACE_URI, SVG_HEIGHT_ATTRIBUTE,
AbstractSVGConverter.doubleString(img.getHeight()));
if(xform.getDeterminant() != 0){
@@ -1658,9 +1658,9 @@
public void drawString(String s, float x, float y){
if(textAsShapes == false){
Element text = domFactory.createElement(SVG_TEXT_TAG);
- text.setAttribute(SVG_X_ATTRIBUTE, AbstractSVGConverter.doubleString(x));
- text.setAttribute(SVG_Y_ATTRIBUTE, AbstractSVGConverter.doubleString(y));
- text.setAttribute(ATTR_STROKE, SVG_NONE_VALUE);
+ text.setAttributeNS(SVG_NAMESPACE_URI, SVG_X_ATTRIBUTE, AbstractSVGConverter.doubleString(x));
+ text.setAttributeNS(SVG_NAMESPACE_URI, SVG_Y_ATTRIBUTE, AbstractSVGConverter.doubleString(y));
+ text.setAttributeNS(SVG_NAMESPACE_URI, ATTR_STROKE, SVG_NONE_VALUE);
text.appendChild(domFactory.createTextNode(s));
domGroupManager.addElement(text);
}
@@ -1747,7 +1747,7 @@
public void fill(Shape s){
Element svgShape = shapeConverter.toSVG(s);
if(svgShape != null){
- svgShape.setAttribute(ATTR_STROKE, SVG_NONE_VALUE);
+ svgShape.setAttributeNS(SVG_NAMESPACE_URI, ATTR_STROKE, SVG_NONE_VALUE);
domGroupManager.addElement(svgShape);
}
}
1.2 +5 -5 xml-batik/sources/org/apache/batik/svggen/SVGLine.java
Index: SVGLine.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGLine.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGLine.java 2001/01/23 17:12:28 1.1
+++ SVGLine.java 2001/01/29 20:35:29 1.2
@@ -19,7 +19,7 @@
* a corresponding SVG line element.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGLine.java,v 1.1 2001/01/23 17:12:28 tkormann Exp $
+ * @version $Id: SVGLine.java,v 1.2 2001/01/29 20:35:29 vhardy Exp $
*/
public class SVGLine extends SVGGraphicObjectConverter{
/**
@@ -34,10 +34,10 @@
*/
public Element toSVG(Line2D line){
Element svgLine = domFactory.createElement(TAG_LINE);
- svgLine.setAttribute(ATTR_X1, doubleString(line.getX1()));
- svgLine.setAttribute(ATTR_Y1, doubleString(line.getY1()));
- svgLine.setAttribute(ATTR_X2, doubleString(line.getX2()));
- svgLine.setAttribute(ATTR_Y2, doubleString(line.getY2()));
+ svgLine.setAttributeNS(SVG_NAMESPACE_URI, ATTR_X1, doubleString(line.getX1()));
+ svgLine.setAttributeNS(SVG_NAMESPACE_URI, ATTR_Y1, doubleString(line.getY1()));
+ svgLine.setAttributeNS(SVG_NAMESPACE_URI, ATTR_X2, doubleString(line.getX2()));
+ svgLine.setAttributeNS(SVG_NAMESPACE_URI, ATTR_Y2, doubleString(line.getY2()));
return svgLine;
}
1.2 +17 -17 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGLinearGradient.java 2001/01/23 17:12:28 1.1
+++ SVGLinearGradient.java 2001/01/29 20:35:30 1.2
@@ -26,7 +26,7 @@
* SVG linear gradient element
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGLinearGradient.java,v 1.1 2001/01/23 17:12:28 tkormann Exp $
+ * @version $Id: SVGLinearGradient.java,v 1.2 2001/01/29 20:35:30 vhardy Exp $
*/
public class SVGLinearGradient extends AbstractSVGConverter{
/**
@@ -63,7 +63,7 @@
if(gradientDesc == null){
Element gradientDef = domFactory.createElement(TAG_LINEAR_GRADIENT);
- gradientDef.setAttribute(ATTR_GRADIENT_UNITS,
+ gradientDef.setAttributeNS(SVG_NAMESPACE_URI, ATTR_GRADIENT_UNITS,
SVG_USER_SPACE_ON_USE_VALUE);
//
@@ -71,10 +71,10 @@
//
Point2D p1 = gradient.getPoint1();
Point2D p2 = gradient.getPoint2();
- gradientDef.setAttribute(ATTR_X1, "" + doubleString(p1.getX()));
- gradientDef.setAttribute(ATTR_Y1, "" + doubleString(p1.getY()));
- gradientDef.setAttribute(ATTR_X2, "" + doubleString(p2.getX()));
- gradientDef.setAttribute(ATTR_Y2, "" + doubleString(p2.getY()));
+ gradientDef.setAttributeNS(SVG_NAMESPACE_URI, ATTR_X1, "" + doubleString(p1.getX()));
+ gradientDef.setAttributeNS(SVG_NAMESPACE_URI, ATTR_Y1, "" + doubleString(p1.getY()));
+ gradientDef.setAttributeNS(SVG_NAMESPACE_URI, ATTR_X2, "" + doubleString(p2.getX()));
+ gradientDef.setAttributeNS(SVG_NAMESPACE_URI, ATTR_Y2, "" + doubleString(p2.getY()));
//
// Spread method
@@ -82,19 +82,19 @@
String spreadMethod = VALUE_PAD;
if(gradient.isCyclic())
spreadMethod = VALUE_REFLECT;
- gradientDef.setAttribute(ATTR_SPREAD_METHOD, spreadMethod);
+ gradientDef.setAttributeNS(SVG_NAMESPACE_URI, ATTR_SPREAD_METHOD, spreadMethod);
//
// First gradient stop
//
Element gradientStop = domFactory.createElement(SVG_STOP_TAG);
- gradientStop.setAttribute(SVG_OFFSET_ATTRIBUTE,
+ gradientStop.setAttributeNS(SVG_NAMESPACE_URI, SVG_OFFSET_ATTRIBUTE,
VALUE_ZERO_PERCENT);
SVGPaintDescriptor colorDesc = SVGColor.toSVG(gradient.getColor1());
- gradientStop.setAttribute(ATTR_STOP_COLOR,
+ gradientStop.setAttributeNS(SVG_NAMESPACE_URI, ATTR_STOP_COLOR,
colorDesc.getPaintValue());
- gradientStop.setAttribute(ATTR_STOP_OPACITY,
+ gradientStop.setAttributeNS(SVG_NAMESPACE_URI, ATTR_STOP_OPACITY,
colorDesc.getOpacityValue());
gradientDef.appendChild(gradientStop);
@@ -103,13 +103,13 @@
// Second gradient stop
//
gradientStop = domFactory.createElement(SVG_STOP_TAG);
- gradientStop.setAttribute(SVG_OFFSET_ATTRIBUTE,
+ gradientStop.setAttributeNS(SVG_NAMESPACE_URI, SVG_OFFSET_ATTRIBUTE,
VALUE_HUNDRED_PERCENT);
colorDesc = SVGColor.toSVG(gradient.getColor2());
- gradientStop.setAttribute(ATTR_STOP_COLOR,
+ gradientStop.setAttributeNS(SVG_NAMESPACE_URI, ATTR_STOP_COLOR,
colorDesc.getPaintValue());
- gradientStop.setAttribute(ATTR_STOP_OPACITY,
+ gradientStop.setAttributeNS(SVG_NAMESPACE_URI, ATTR_STOP_OPACITY,
colorDesc.getOpacityValue());
gradientDef.appendChild(gradientStop);
@@ -117,14 +117,14 @@
//
// Gradient ID
//
- gradientDef.setAttribute(ATTR_ID, SVGIDGenerator.generateID(ID_PREFIX_LINEAR_GRADIENT));
+ gradientDef.setAttributeNS(SVG_NAMESPACE_URI, ATTR_ID, SVGIDGenerator.generateID(ID_PREFIX_LINEAR_GRADIENT));
//
// Build Paint descriptor
//
StringBuffer paintAttrBuf = new StringBuffer(URL_PREFIX);
paintAttrBuf.append(SIGN_POUND);
- paintAttrBuf.append(gradientDef.getAttribute(ATTR_ID));
+ paintAttrBuf.append(gradientDef.getAttributeNS(SVG_NAMESPACE_URI, ATTR_ID));
paintAttrBuf.append(URL_SUFFIX);
gradientDesc = new SVGPaintDescriptor(paintAttrBuf.toString(),
@@ -167,8 +167,8 @@
}
Element rect = domFactory.createElement(TAG_RECT);
- rect.setAttribute(SVG_FILL_ATTRIBUTE, gradientDesc.getPaintValue());
- rect.setAttribute(SVG_FILL_OPACITY_ATTRIBUTE, gradientDesc.getOpacityValue());
+ rect.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILL_ATTRIBUTE, gradientDesc.getPaintValue());
+ rect.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILL_OPACITY_ATTRIBUTE, gradientDesc.getOpacityValue());
group.appendChild(defs);
group.appendChild(rect);
1.2 +19 -19 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGLookupOp.java 2001/01/23 17:12:29 1.1
+++ SVGLookupOp.java 2001/01/29 20:35:30 1.2
@@ -27,7 +27,7 @@
* of the lookup table.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGLookupOp.java,v 1.1 2001/01/23 17:12:29 tkormann Exp $
+ * @version $Id: SVGLookupOp.java,v 1.2 2001/01/29 20:35:30 vhardy Exp $
* @see org.apache.batik.svggen.SVGBufferedImageOp
*/
public class SVGLookupOp extends AbstractSVGFilterConverter{
@@ -99,25 +99,25 @@
String type = VALUE_TYPE_TABLE;
if(lookupTables.length == 1){
- feFuncR.setAttribute(SVG_TYPE_ATTRIBUTE, type);
- feFuncG.setAttribute(SVG_TYPE_ATTRIBUTE, type);
- feFuncB.setAttribute(SVG_TYPE_ATTRIBUTE, type);
- feFuncR.setAttribute(SVG_TABLE_VALUES_ATTRIBUTE, lookupTables[0]);
- feFuncG.setAttribute(SVG_TABLE_VALUES_ATTRIBUTE, lookupTables[0]);
- feFuncB.setAttribute(SVG_TABLE_VALUES_ATTRIBUTE, lookupTables[0]);
+ feFuncR.setAttributeNS(SVG_NAMESPACE_URI, SVG_TYPE_ATTRIBUTE, type);
+ feFuncG.setAttributeNS(SVG_NAMESPACE_URI, SVG_TYPE_ATTRIBUTE, type);
+ feFuncB.setAttributeNS(SVG_NAMESPACE_URI, SVG_TYPE_ATTRIBUTE, type);
+ feFuncR.setAttributeNS(SVG_NAMESPACE_URI, SVG_TABLE_VALUES_ATTRIBUTE, lookupTables[0]);
+ feFuncG.setAttributeNS(SVG_NAMESPACE_URI, SVG_TABLE_VALUES_ATTRIBUTE, lookupTables[0]);
+ feFuncB.setAttributeNS(SVG_NAMESPACE_URI, SVG_TABLE_VALUES_ATTRIBUTE, lookupTables[0]);
}
else if(lookupTables.length >= 3){
- feFuncR.setAttribute(SVG_TYPE_ATTRIBUTE, type);
- feFuncG.setAttribute(SVG_TYPE_ATTRIBUTE, type);
- feFuncB.setAttribute(SVG_TYPE_ATTRIBUTE, type);
- feFuncR.setAttribute(SVG_TABLE_VALUES_ATTRIBUTE, lookupTables[0]);
- feFuncG.setAttribute(SVG_TABLE_VALUES_ATTRIBUTE, lookupTables[1]);
- feFuncB.setAttribute(SVG_TABLE_VALUES_ATTRIBUTE, lookupTables[2]);
+ feFuncR.setAttributeNS(SVG_NAMESPACE_URI, SVG_TYPE_ATTRIBUTE, type);
+ feFuncG.setAttributeNS(SVG_NAMESPACE_URI, SVG_TYPE_ATTRIBUTE, type);
+ feFuncB.setAttributeNS(SVG_NAMESPACE_URI, SVG_TYPE_ATTRIBUTE, type);
+ feFuncR.setAttributeNS(SVG_NAMESPACE_URI, SVG_TABLE_VALUES_ATTRIBUTE, lookupTables[0]);
+ feFuncG.setAttributeNS(SVG_NAMESPACE_URI, SVG_TABLE_VALUES_ATTRIBUTE, lookupTables[1]);
+ feFuncB.setAttributeNS(SVG_NAMESPACE_URI, SVG_TABLE_VALUES_ATTRIBUTE, lookupTables[2]);
if(lookupTables.length == 4){
feFuncA = domFactory.createElement(SVG_FE_FUNC_A_TAG);
- feFuncA.setAttribute(SVG_TYPE_ATTRIBUTE, type);
- feFuncA.setAttribute(SVG_TABLE_VALUES_ATTRIBUTE, lookupTables[3]);
+ feFuncA.setAttributeNS(SVG_NAMESPACE_URI, SVG_TYPE_ATTRIBUTE, type);
+ feFuncA.setAttributeNS(SVG_NAMESPACE_URI, SVG_TABLE_VALUES_ATTRIBUTE, lookupTables[3]);
}
}
@@ -128,7 +128,7 @@
feComponentTransferDef.appendChild(feFuncA);
filterDef.appendChild(feComponentTransferDef);
- filterDef.setAttribute(ATTR_ID, SVGIDGenerator.generateID(ID_PREFIX_FE_COMPONENT_TRANSFER));
+ filterDef.setAttributeNS(SVG_NAMESPACE_URI, ATTR_ID, SVGIDGenerator.generateID(ID_PREFIX_FE_COMPONENT_TRANSFER));
//
// Create a filter descriptor
@@ -137,7 +137,7 @@
// Process filter attribute
StringBuffer filterAttrBuf = new StringBuffer(URL_PREFIX);
filterAttrBuf.append(SIGN_POUND);
- filterAttrBuf.append(filterDef.getAttribute(ATTR_ID));
+ filterAttrBuf.append(filterDef.getAttributeNS(SVG_NAMESPACE_URI, ATTR_ID));
filterAttrBuf.append(URL_SUFFIX);
filterDesc = new SVGFilterDescriptor(filterAttrBuf.toString(), filterDef);
@@ -292,14 +292,14 @@
for(int i=0; i<lookupOps.length; i++){
SVGFilterDescriptor filterDesc = converter.toSVG(lookupOps[i]);
Element rect = domFactory.createElement(TAG_RECT);
- rect.setAttribute(SVG_FILTER_ATTRIBUTE, filterDesc.getFilterValue());
+ rect.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILTER_ATTRIBUTE, filterDesc.getFilterValue());
rectGroupOne.appendChild(rect);
}
for(int i=0; i<lookupOps.length; i++){
SVGFilterDescriptor filterDesc = converter.toSVG(lookupOps[i]);
Element rect = domFactory.createElement(TAG_RECT);
- rect.setAttribute(SVG_FILTER_ATTRIBUTE, filterDesc.getFilterValue());
+ rect.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILTER_ATTRIBUTE, filterDesc.getFilterValue());
rectGroupTwo.appendChild(rect);
}
1.2 +3 -3 xml-batik/sources/org/apache/batik/svggen/SVGPath.java
Index: SVGPath.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGPath.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGPath.java 2001/01/23 17:12:30 1.1
+++ SVGPath.java 2001/01/29 20:35:32 1.2
@@ -31,7 +31,7 @@
* to be specified in the majority of path elements.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGPath.java,v 1.1 2001/01/23 17:12:30 tkormann Exp $
+ * @version $Id: SVGPath.java,v 1.2 2001/01/29 20:35:32 vhardy Exp $
*/
public class SVGPath extends SVGGraphicObjectConverter{
/**
@@ -62,11 +62,11 @@
}
Element svgPath = domFactory.createElement(TAG_PATH);
- svgPath.setAttribute(SVG_D_ATTRIBUTE, dAttr);
+ svgPath.setAttributeNS(SVG_NAMESPACE_URI, SVG_D_ATTRIBUTE, dAttr);
// Set winding rule if different than SVG's default
if(shape.getWindingRule() == GeneralPath.WIND_EVEN_ODD)
- svgPath.setAttribute(SVG_FILL_RULE_ATTRIBUTE, VALUE_EVEN_ODD);
+ svgPath.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILL_RULE_ATTRIBUTE, VALUE_EVEN_ODD);
return svgPath;
1.2 +2 -2 xml-batik/sources/org/apache/batik/svggen/SVGPolygon.java
Index: SVGPolygon.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGPolygon.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGPolygon.java 2001/01/23 17:12:30 1.1
+++ SVGPolygon.java 2001/01/29 20:35:33 1.2
@@ -19,7 +19,7 @@
* an SVG element.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGPolygon.java,v 1.1 2001/01/23 17:12:30 tkormann Exp $
+ * @version $Id: SVGPolygon.java,v 1.2 2001/01/29 20:35:33 vhardy Exp $
*/
public class SVGPolygon extends SVGGraphicObjectConverter{
/**
@@ -60,7 +60,7 @@
pi.next();
} // while !isDone
- svgPolygon.setAttribute(ATTR_POINTS, points.substring(0, points.length() - 1));
+ svgPolygon.setAttributeNS(SVG_NAMESPACE_URI, ATTR_POINTS, points.substring(0, points.length() - 1));
return svgPolygon;
}
1.2 +7 -7 xml-batik/sources/org/apache/batik/svggen/SVGRectangle.java
Index: SVGRectangle.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGRectangle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGRectangle.java 2001/01/23 17:12:30 1.1
+++ SVGRectangle.java 2001/01/29 20:35:34 1.2
@@ -19,7 +19,7 @@
* object into an SVG element.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGRectangle.java,v 1.1 2001/01/23 17:12:30 tkormann Exp $
+ * @version $Id: SVGRectangle.java,v 1.2 2001/01/29 20:35:34 vhardy Exp $
*/
public class SVGRectangle extends SVGGraphicObjectConverter{
/**
@@ -42,8 +42,8 @@
*/
public Element toSVG(RoundRectangle2D rect){
Element svgRect = toSVG((RectangularShape)rect);
- svgRect.setAttribute(SVG_RX_ATTRIBUTE, doubleString(rect.getArcWidth()/2));
- svgRect.setAttribute(SVG_RY_ATTRIBUTE, doubleString(rect.getArcHeight()/2));
+ svgRect.setAttributeNS(SVG_NAMESPACE_URI, SVG_RX_ATTRIBUTE, doubleString(rect.getArcWidth()/2));
+ svgRect.setAttributeNS(SVG_NAMESPACE_URI, SVG_RY_ATTRIBUTE, doubleString(rect.getArcHeight()/2));
return svgRect;
}
@@ -53,10 +53,10 @@
*/
private Element toSVG(RectangularShape rect){
Element svgRect = domFactory.createElement(TAG_RECT);
- svgRect.setAttribute(SVG_X_ATTRIBUTE, doubleString(rect.getX()));
- svgRect.setAttribute(SVG_Y_ATTRIBUTE, doubleString(rect.getY()));
- svgRect.setAttribute(SVG_WIDTH_ATTRIBUTE, doubleString(rect.getWidth()));
- svgRect.setAttribute(SVG_HEIGHT_ATTRIBUTE, doubleString(rect.getHeight()));
+ svgRect.setAttributeNS(SVG_NAMESPACE_URI, SVG_X_ATTRIBUTE, doubleString(rect.getX()));
+ svgRect.setAttributeNS(SVG_NAMESPACE_URI, SVG_Y_ATTRIBUTE, doubleString(rect.getY()));
+ svgRect.setAttributeNS(SVG_NAMESPACE_URI, SVG_WIDTH_ATTRIBUTE, doubleString(rect.getWidth()));
+ svgRect.setAttributeNS(SVG_NAMESPACE_URI, SVG_HEIGHT_ATTRIBUTE, doubleString(rect.getHeight()));
return svgRect;
}
1.2 +3 -3 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGRenderingHints.java 2001/01/23 17:12:31 1.1
+++ SVGRenderingHints.java 2001/01/29 20:35:36 1.2
@@ -33,7 +33,7 @@
* + TEXT_ANTIALIASING -> text-rendering
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGRenderingHints.java,v 1.1 2001/01/23 17:12:31 tkormann Exp $
+ * @version $Id: SVGRenderingHints.java,v 1.2 2001/01/29 20:35:36 vhardy Exp $
*/
public class SVGRenderingHints extends AbstractSVGConverter{
/**
@@ -236,14 +236,14 @@
String testName = (String)iter.next();
RenderingHints hints[] = (RenderingHints[])testMap.get(testName);
Element testGroup = domFactory.createElement(SVG_G_TAG);
- testGroup.setAttribute(ATTR_ID, testName);
+ testGroup.setAttributeNS(SVG_NAMESPACE_URI, ATTR_ID, testName);
for(int i=0; i<hints.length; i++){
Element testRect = domFactory.createElement(TAG_RECT);
Map attrMap = converter.toSVG(hints[i]).getAttributeMap(null);
Iterator attrIter = attrMap.keySet().iterator();
while(attrIter.hasNext()){
String attrName = (String)attrIter.next();
- testRect.setAttribute(attrName, (String)attrMap.get(attrName));
+ testRect.setAttributeNS(SVG_NAMESPACE_URI, attrName, (String)attrMap.get(attrName));
}
testGroup.appendChild(testRect);
}
1.2 +26 -26 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGRescaleOp.java 2001/01/23 17:12:31 1.1
+++ SVGRescaleOp.java 2001/01/29 20:35:37 1.2
@@ -28,7 +28,7 @@
* offsets.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGRescaleOp.java,v 1.1 2001/01/23 17:12:31 tkormann Exp $
+ * @version $Id: SVGRescaleOp.java,v 1.2 2001/01/29 20:35:37 vhardy Exp $
* @see org.apache.batik.svggen.SVGBufferedImageOp
*/
public class SVGRescaleOp extends AbstractSVGFilterConverter{
@@ -112,33 +112,33 @@
if(offsets.length == 1){
String slope = doubleString(scaleFactors[0]);
String intercept = doubleString(offsets[0]);
- feFuncR.setAttribute(SVG_TYPE_ATTRIBUTE, type);
- feFuncG.setAttribute(SVG_TYPE_ATTRIBUTE, type);
- feFuncB.setAttribute(SVG_TYPE_ATTRIBUTE, type);
- feFuncR.setAttribute(SVG_SLOPE_ATTRIBUTE, slope);
- feFuncG.setAttribute(SVG_SLOPE_ATTRIBUTE, slope);
- feFuncB.setAttribute(SVG_SLOPE_ATTRIBUTE, slope);
- feFuncR.setAttribute(SVG_INTERCEPT_ATTRIBUTE, intercept);
- feFuncG.setAttribute(SVG_INTERCEPT_ATTRIBUTE, intercept);
- feFuncB.setAttribute(SVG_INTERCEPT_ATTRIBUTE, intercept);
+ feFuncR.setAttributeNS(SVG_NAMESPACE_URI, SVG_TYPE_ATTRIBUTE, type);
+ feFuncG.setAttributeNS(SVG_NAMESPACE_URI, SVG_TYPE_ATTRIBUTE, type);
+ feFuncB.setAttributeNS(SVG_NAMESPACE_URI, SVG_TYPE_ATTRIBUTE, type);
+ feFuncR.setAttributeNS(SVG_NAMESPACE_URI, SVG_SLOPE_ATTRIBUTE, slope);
+ feFuncG.setAttributeNS(SVG_NAMESPACE_URI, SVG_SLOPE_ATTRIBUTE, slope);
+ feFuncB.setAttributeNS(SVG_NAMESPACE_URI, SVG_SLOPE_ATTRIBUTE, slope);
+ feFuncR.setAttributeNS(SVG_NAMESPACE_URI, SVG_INTERCEPT_ATTRIBUTE, intercept);
+ feFuncG.setAttributeNS(SVG_NAMESPACE_URI, SVG_INTERCEPT_ATTRIBUTE, intercept);
+ feFuncB.setAttributeNS(SVG_NAMESPACE_URI, SVG_INTERCEPT_ATTRIBUTE, intercept);
}
else if(offsets.length >= 3){
- feFuncR.setAttribute(SVG_TYPE_ATTRIBUTE, type);
- feFuncG.setAttribute(SVG_TYPE_ATTRIBUTE, type);
- feFuncB.setAttribute(SVG_TYPE_ATTRIBUTE, type);
- feFuncR.setAttribute(SVG_SLOPE_ATTRIBUTE, doubleString(scaleFactors[0]));
- feFuncG.setAttribute(SVG_SLOPE_ATTRIBUTE, doubleString(scaleFactors[1]));
- feFuncB.setAttribute(SVG_SLOPE_ATTRIBUTE, doubleString(scaleFactors[2]));
- feFuncR.setAttribute(SVG_INTERCEPT_ATTRIBUTE, doubleString(offsets[0]));
- feFuncG.setAttribute(SVG_INTERCEPT_ATTRIBUTE, doubleString(offsets[1]));
- feFuncB.setAttribute(SVG_INTERCEPT_ATTRIBUTE, doubleString(offsets[2]));
+ feFuncR.setAttributeNS(SVG_NAMESPACE_URI, SVG_TYPE_ATTRIBUTE, type);
+ feFuncG.setAttributeNS(SVG_NAMESPACE_URI, SVG_TYPE_ATTRIBUTE, type);
+ feFuncB.setAttributeNS(SVG_NAMESPACE_URI, SVG_TYPE_ATTRIBUTE, type);
+ feFuncR.setAttributeNS(SVG_NAMESPACE_URI, SVG_SLOPE_ATTRIBUTE, doubleString(scaleFactors[0]));
+ feFuncG.setAttributeNS(SVG_NAMESPACE_URI, SVG_SLOPE_ATTRIBUTE, doubleString(scaleFactors[1]));
+ feFuncB.setAttributeNS(SVG_NAMESPACE_URI, SVG_SLOPE_ATTRIBUTE, doubleString(scaleFactors[2]));
+ feFuncR.setAttributeNS(SVG_NAMESPACE_URI, SVG_INTERCEPT_ATTRIBUTE, doubleString(offsets[0]));
+ feFuncG.setAttributeNS(SVG_NAMESPACE_URI, SVG_INTERCEPT_ATTRIBUTE, doubleString(offsets[1]));
+ feFuncB.setAttributeNS(SVG_NAMESPACE_URI, SVG_INTERCEPT_ATTRIBUTE, doubleString(offsets[2]));
if(offsets.length == 4){
feFuncA = domFactory.createElement(SVG_FE_FUNC_A_TAG);
- feFuncA.setAttribute(SVG_TYPE_ATTRIBUTE, type);
- feFuncA.setAttribute(SVG_SLOPE_ATTRIBUTE,
+ feFuncA.setAttributeNS(SVG_NAMESPACE_URI, SVG_TYPE_ATTRIBUTE, type);
+ feFuncA.setAttributeNS(SVG_NAMESPACE_URI, SVG_SLOPE_ATTRIBUTE,
doubleString(scaleFactors[3]));
- feFuncA.setAttribute(SVG_INTERCEPT_ATTRIBUTE,
+ feFuncA.setAttributeNS(SVG_NAMESPACE_URI, SVG_INTERCEPT_ATTRIBUTE,
doubleString(offsets[3]));
}
}
@@ -150,7 +150,7 @@
feComponentTransferDef.appendChild(feFuncA);
filterDef.appendChild(feComponentTransferDef);
- filterDef.setAttribute(ATTR_ID, SVGIDGenerator.generateID(ID_PREFIX_FE_COMPONENT_TRANSFER));
+ filterDef.setAttributeNS(SVG_NAMESPACE_URI, ATTR_ID, SVGIDGenerator.generateID(ID_PREFIX_FE_COMPONENT_TRANSFER));
//
// Create a filter descriptor
@@ -159,7 +159,7 @@
// Process filter attribute
StringBuffer filterAttrBuf = new StringBuffer(URL_PREFIX);
filterAttrBuf.append(SIGN_POUND);
- filterAttrBuf.append(filterDef.getAttribute(ATTR_ID));
+ filterAttrBuf.append(filterDef.getAttributeNS(SVG_NAMESPACE_URI, ATTR_ID));
filterAttrBuf.append(URL_SUFFIX);
filterDesc = new SVGFilterDescriptor(filterAttrBuf.toString(), filterDef);
@@ -192,14 +192,14 @@
for(int i=0; i<rescaleOps.length; i++){
SVGFilterDescriptor filterDesc = converter.toSVG(rescaleOps[i]);
Element rect = domFactory.createElement(TAG_RECT);
- rect.setAttribute(SVG_FILTER_ATTRIBUTE, filterDesc.getFilterValue());
+ rect.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILTER_ATTRIBUTE, filterDesc.getFilterValue());
rectGroupOne.appendChild(rect);
}
for(int i=0; i<rescaleOps.length; i++){
SVGFilterDescriptor filterDesc = converter.toSVG(rescaleOps[i]);
Element rect = domFactory.createElement(TAG_RECT);
- rect.setAttribute(SVG_FILTER_ATTRIBUTE, filterDesc.getFilterValue());
+ rect.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILTER_ATTRIBUTE, filterDesc.getFilterValue());
rectGroupTwo.appendChild(rect);
}
1.2 +10 -10 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGTexturePaint.java 2001/01/23 17:12:33 1.1
+++ SVGTexturePaint.java 2001/01/29 20:35:38 1.2
@@ -28,7 +28,7 @@
* SVG pattern element
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGTexturePaint.java,v 1.1 2001/01/23 17:12:33 tkormann Exp $
+ * @version $Id: SVGTexturePaint.java,v 1.2 2001/01/29 20:35:38 vhardy Exp $
*/
public class SVGTexturePaint extends AbstractSVGConverter{
public static final String ERROR_IMAGE_HANDLER_NULL =
@@ -80,19 +80,19 @@
if(patternDesc == null){
Rectangle2D anchorRect = texture.getAnchorRect();
Element patternDef = domFactory.createElement(TAG_PATTERN);
- patternDef.setAttribute(ATTR_PATTERN_UNITS,
+ patternDef.setAttributeNS(SVG_NAMESPACE_URI, ATTR_PATTERN_UNITS,
SVG_USER_SPACE_ON_USE_VALUE);
//
// First, set the pattern anchor
//
- patternDef.setAttribute(SVG_X_ATTRIBUTE,
+ patternDef.setAttributeNS(SVG_NAMESPACE_URI, SVG_X_ATTRIBUTE,
doubleString(anchorRect.getX()));
- patternDef.setAttribute(SVG_Y_ATTRIBUTE,
+ patternDef.setAttributeNS(SVG_NAMESPACE_URI, SVG_Y_ATTRIBUTE,
doubleString(anchorRect.getY()));
- patternDef.setAttribute(SVG_WIDTH_ATTRIBUTE,
+ patternDef.setAttributeNS(SVG_NAMESPACE_URI, SVG_WIDTH_ATTRIBUTE,
doubleString(anchorRect.getWidth()));
- patternDef.setAttribute(SVG_HEIGHT_ATTRIBUTE,
+ patternDef.setAttributeNS(SVG_NAMESPACE_URI, SVG_HEIGHT_ATTRIBUTE,
doubleString(anchorRect.getHeight()));
//
@@ -102,12 +102,12 @@
imageHandler.handleImage((RenderedImage)texture.getImage(), imageElement);
patternDef.appendChild(imageElement);
- patternDef.setAttribute(ATTR_ID,
+ patternDef.setAttributeNS(SVG_NAMESPACE_URI, ATTR_ID,
SVGIDGenerator.generateID(ID_PREFIX_PATTERN));
StringBuffer patternAttrBuf = new StringBuffer(URL_PREFIX);
patternAttrBuf.append(SIGN_POUND);
- patternAttrBuf.append(patternDef.getAttribute(ATTR_ID));
+ patternAttrBuf.append(patternDef.getAttributeNS(SVG_NAMESPACE_URI, ATTR_ID));
patternAttrBuf.append(URL_SUFFIX);
patternDesc = new SVGPaintDescriptor(patternAttrBuf.toString(),
@@ -142,8 +142,8 @@
}
Element rect = domFactory.createElement(TAG_RECT);
- rect.setAttribute(SVG_FILL_ATTRIBUTE, patternDesc.getPaintValue());
- rect.setAttribute(SVG_FILL_OPACITY_ATTRIBUTE, patternDesc.getOpacityValue());
+ rect.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILL_ATTRIBUTE, patternDesc.getPaintValue());
+ rect.setAttributeNS(SVG_NAMESPACE_URI, SVG_FILL_OPACITY_ATTRIBUTE, patternDesc.getOpacityValue());
group.appendChild(defs);
group.appendChild(rect);
1.2 +3 -3 xml-batik/sources/org/apache/batik/svggen/SwingSVGPrettyPrint.java
Index: SwingSVGPrettyPrint.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SwingSVGPrettyPrint.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SwingSVGPrettyPrint.java 2001/01/23 17:12:34 1.1
+++ SwingSVGPrettyPrint.java 2001/01/29 20:35:40 1.2
@@ -19,7 +19,7 @@
* @author Vincent Hardy
* @version 1.1, May 2nd, 2000. Added
*/
-public abstract class SwingSVGPrettyPrint{
+public abstract class SwingSVGPrettyPrint implements SVGSyntax{
/**
* @param cmp Swing component to be converted to SVG
* @param svgGen SVGraphics2D to use to paint Swing components
@@ -54,7 +54,7 @@
// Now, structure DOM tree to reflect this component's structure
Element cmpGroup = g.getTopLevelGroup();
- cmpGroup.setAttribute("id", SVGIDGenerator.generateID(cmp.getClass().getName()));
+ cmpGroup.setAttributeNS(SVG_NAMESPACE_URI, "id", SVGIDGenerator.generateID(cmp.getClass().getName()));
topLevelGroup.appendChild(cmpGroup);
svgGen.setTopLevelGroup(topLevelGroup);
@@ -86,7 +86,7 @@
// Now, structure DOM tree to reflect this component's structure
Element cmpGroup = g.getTopLevelGroup();
- cmpGroup.setAttribute("id", SVGIDGenerator.generateID(cmp.getClass().getName()));
+ cmpGroup.setAttributeNS(SVG_NAMESPACE_URI, "id", SVGIDGenerator.generateID(cmp.getClass().getName()));
topLevelGroup.appendChild(cmpGroup);
svgGen.setTopLevelGroup(topLevelGroup);