vhardy 01/09/28 05:48:30
Modified: sources/org/apache/batik/dom/svg SVGDescriptiveElement.java
SVGGraphicsElement.java SVGOMFEImageElement.java
SVGOMFilterElement.java SVGOMMarkerElement.java
SVGOMPatternElement.java SVGOMSVGElement.java
SVGOMStyleElement.java SVGOMSymbolElement.java
SVGOMTextContentElement.java
sources/org/apache/batik/dom/util XMLSupport.java
Log:
Fixed bug #3720.
Revision Changes Path
1.4 +7 -3
xml-batik/sources/org/apache/batik/dom/svg/SVGDescriptiveElement.java
Index: SVGDescriptiveElement.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGDescriptiveElement.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SVGDescriptiveElement.java 2001/09/10 12:26:07 1.3
+++ SVGDescriptiveElement.java 2001/09/28 12:48:29 1.4
@@ -16,7 +16,7 @@
* descriptive text.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: SVGDescriptiveElement.java,v 1.3 2001/09/10 12:26:07 hillion Exp $
+ * @version $Id: SVGDescriptiveElement.java,v 1.4 2001/09/28 12:48:29 vhardy Exp $
*/
public abstract class SVGDescriptiveElement extends SVGStylableElement {
@@ -48,7 +48,9 @@
* <b>DOM</b>: Sets the xml:lang attribute value.
*/
public void setXMLlang(String lang) {
- XMLSupport.setXMLLang(this, lang);
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_LANG_ATTRIBUTE,
+ lang);
}
/**
@@ -62,6 +64,8 @@
* <b>DOM</b>: Sets the xml:space attribute value.
*/
public void setXMLspace(String space) {
- XMLSupport.setXMLSpace(this, space);
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_SPACE_ATTRIBUTE,
+ space);
}
}
1.9 +7 -3
xml-batik/sources/org/apache/batik/dom/svg/SVGGraphicsElement.java
Index: SVGGraphicsElement.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGGraphicsElement.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SVGGraphicsElement.java 2001/09/12 16:57:07 1.8
+++ SVGGraphicsElement.java 2001/09/28 12:48:29 1.9
@@ -24,7 +24,7 @@
* This class provides a common superclass for all graphics elements.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: SVGGraphicsElement.java,v 1.8 2001/09/12 16:57:07 hillion Exp $
+ * @version $Id: SVGGraphicsElement.java,v 1.9 2001/09/28 12:48:29 vhardy Exp $
*/
public abstract class SVGGraphicsElement extends SVGStylableElement {
@@ -129,7 +129,9 @@
* <b>DOM</b>: Sets the xml:lang attribute value.
*/
public void setXMLlang(String lang) {
- XMLSupport.setXMLLang(this, lang);
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_LANG_ATTRIBUTE,
+ lang);
}
/**
@@ -143,7 +145,9 @@
* <b>DOM</b>: Sets the xml:space attribute value.
*/
public void setXMLspace(String space) {
- XMLSupport.setXMLSpace(this, space);
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_SPACE_ATTRIBUTE,
+ space);
}
// SVGTests support ///////////////////////////////////////////////////
1.7 +7 -3
xml-batik/sources/org/apache/batik/dom/svg/SVGOMFEImageElement.java
Index: SVGOMFEImageElement.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMFEImageElement.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SVGOMFEImageElement.java 2001/09/12 16:57:07 1.6
+++ SVGOMFEImageElement.java 2001/09/28 12:48:29 1.7
@@ -29,7 +29,7 @@
* This class implements {@link SVGFEImageElement}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: SVGOMFEImageElement.java,v 1.6 2001/09/12 16:57:07 hillion Exp $
+ * @version $Id: SVGOMFEImageElement.java,v 1.7 2001/09/28 12:48:29 vhardy Exp $
*/
public class SVGOMFEImageElement
extends SVGOMFilterPrimitiveStandardAttributes
@@ -103,7 +103,9 @@
* <b>DOM</b>: Sets the xml:lang attribute value.
*/
public void setXMLlang(String lang) {
- XMLSupport.setXMLLang(this, lang);
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_LANG_ATTRIBUTE,
+ lang);
}
/**
@@ -117,7 +119,9 @@
* <b>DOM</b>: Sets the xml:space attribute value.
*/
public void setXMLspace(String space) {
- XMLSupport.setXMLSpace(this, space);
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_SPACE_ATTRIBUTE,
+ space);
}
// SVGExternalResourcesRequired support /////////////////////////////
1.11 +7 -3
xml-batik/sources/org/apache/batik/dom/svg/SVGOMFilterElement.java
Index: SVGOMFilterElement.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMFilterElement.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SVGOMFilterElement.java 2001/09/12 16:57:07 1.10
+++ SVGOMFilterElement.java 2001/09/28 12:48:29 1.11
@@ -34,7 +34,7 @@
* This class implements {@link SVGFilterElement}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: SVGOMFilterElement.java,v 1.10 2001/09/12 16:57:07 hillion Exp $
+ * @version $Id: SVGOMFilterElement.java,v 1.11 2001/09/28 12:48:29 vhardy Exp $
*/
public class SVGOMFilterElement
extends SVGStylableElement
@@ -182,7 +182,9 @@
* <b>DOM</b>: Sets the xml:lang attribute value.
*/
public void setXMLlang(String lang) {
- XMLSupport.setXMLLang(this, lang);
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_LANG_ATTRIBUTE,
+ lang);
}
/**
@@ -196,7 +198,9 @@
* <b>DOM</b>: Sets the xml:space attribute value.
*/
public void setXMLspace(String space) {
- XMLSupport.setXMLSpace(this, space);
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_SPACE_ATTRIBUTE,
+ space);
}
/**
1.4 +7 -3
xml-batik/sources/org/apache/batik/dom/svg/SVGOMMarkerElement.java
Index: SVGOMMarkerElement.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMMarkerElement.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SVGOMMarkerElement.java 2001/09/12 16:57:07 1.3
+++ SVGOMMarkerElement.java 2001/09/28 12:48:29 1.4
@@ -29,7 +29,7 @@
* This class implements {@link org.w3c.dom.svg.SVGMarkerElement}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: SVGOMMarkerElement.java,v 1.3 2001/09/12 16:57:07 hillion Exp $
+ * @version $Id: SVGOMMarkerElement.java,v 1.4 2001/09/28 12:48:29 vhardy Exp $
*/
public class SVGOMMarkerElement
extends SVGStylableElement
@@ -174,7 +174,9 @@
* <b>DOM</b>: Sets the xml:lang attribute value.
*/
public void setXMLlang(String lang) {
- XMLSupport.setXMLLang(this, lang);
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_LANG_ATTRIBUTE,
+ lang);
}
/**
@@ -188,7 +190,9 @@
* <b>DOM</b>: Sets the xml:space attribute value.
*/
public void setXMLspace(String space) {
- XMLSupport.setXMLSpace(this, space);
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_SPACE_ATTRIBUTE,
+ space);
}
/**
1.9 +7 -3
xml-batik/sources/org/apache/batik/dom/svg/SVGOMPatternElement.java
Index: SVGOMPatternElement.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMPatternElement.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SVGOMPatternElement.java 2001/09/12 16:57:07 1.8
+++ SVGOMPatternElement.java 2001/09/28 12:48:29 1.9
@@ -29,7 +29,7 @@
* This class implements {@link org.w3c.dom.svg.SVGStopElement}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: SVGOMPatternElement.java,v 1.8 2001/09/12 16:57:07 hillion Exp $
+ * @version $Id: SVGOMPatternElement.java,v 1.9 2001/09/28 12:48:29 vhardy Exp $
*/
public class SVGOMPatternElement
extends SVGStylableElement
@@ -188,7 +188,9 @@
* <b>DOM</b>: Sets the xml:lang attribute value.
*/
public void setXMLlang(String lang) {
- XMLSupport.setXMLLang(this, lang);
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_LANG_ATTRIBUTE,
+ lang);
}
/**
@@ -202,7 +204,9 @@
* <b>DOM</b>: Sets the xml:space attribute value.
*/
public void setXMLspace(String space) {
- XMLSupport.setXMLSpace(this, space);
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_SPACE_ATTRIBUTE,
+ space);
}
// SVGTests support ///////////////////////////////////////////////////
1.14 +7 -3 xml-batik/sources/org/apache/batik/dom/svg/SVGOMSVGElement.java
Index: SVGOMSVGElement.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMSVGElement.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SVGOMSVGElement.java 2001/09/12 16:57:07 1.13
+++ SVGOMSVGElement.java 2001/09/28 12:48:29 1.14
@@ -46,7 +46,7 @@
* This class implements {@link org.w3c.dom.svg.SVGSVGElement}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: SVGOMSVGElement.java,v 1.13 2001/09/12 16:57:07 hillion Exp $
+ * @version $Id: SVGOMSVGElement.java,v 1.14 2001/09/28 12:48:29 vhardy Exp $
*/
public class SVGOMSVGElement
extends SVGStylableElement
@@ -372,7 +372,9 @@
* <b>DOM</b>: Sets the xml:lang attribute value.
*/
public void setXMLlang(String lang) {
- XMLSupport.setXMLLang(this, lang);
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_LANG_ATTRIBUTE,
+ lang);
}
/**
@@ -386,7 +388,9 @@
* <b>DOM</b>: Sets the xml:space attribute value.
*/
public void setXMLspace(String space) {
- XMLSupport.setXMLSpace(this, space);
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_SPACE_ATTRIBUTE,
+ space);
}
// SVGZoomAndPan support ///////////////////////////////////////////////
1.8 +5 -3
xml-batik/sources/org/apache/batik/dom/svg/SVGOMStyleElement.java
Index: SVGOMStyleElement.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMStyleElement.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SVGOMStyleElement.java 2001/09/10 12:26:08 1.7
+++ SVGOMStyleElement.java 2001/09/28 12:48:29 1.8
@@ -24,7 +24,7 @@
* This class implements {@link SVGStyleElement}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: SVGOMStyleElement.java,v 1.7 2001/09/10 12:26:08 hillion Exp $
+ * @version $Id: SVGOMStyleElement.java,v 1.8 2001/09/28 12:48:29 vhardy Exp $
*/
public class SVGOMStyleElement
extends SVGOMElement
@@ -109,8 +109,10 @@
/**
* <b>DOM</b>: Implements {@link SVGStyleElement#setXMLspace(String)}.
*/
- public void setXMLspace(String xmlspace) throws DOMException {
- XMLSupport.setXMLSpace(this, xmlspace);
+ public void setXMLspace(String space) throws DOMException {
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_SPACE_ATTRIBUTE,
+ space);
}
/**
1.7 +7 -3
xml-batik/sources/org/apache/batik/dom/svg/SVGOMSymbolElement.java
Index: SVGOMSymbolElement.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMSymbolElement.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SVGOMSymbolElement.java 2001/09/12 16:57:07 1.6
+++ SVGOMSymbolElement.java 2001/09/28 12:48:29 1.7
@@ -29,7 +29,7 @@
* This class implements {@link SVGSymbolElement}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: SVGOMSymbolElement.java,v 1.6 2001/09/12 16:57:07 hillion Exp $
+ * @version $Id: SVGOMSymbolElement.java,v 1.7 2001/09/28 12:48:29 vhardy Exp $
*/
public class SVGOMSymbolElement
extends SVGStylableElement
@@ -83,7 +83,9 @@
* <b>DOM</b>: Sets the xml:lang attribute value.
*/
public void setXMLlang(String lang) {
- XMLSupport.setXMLLang(this, lang);
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_LANG_ATTRIBUTE,
+ lang);
}
/**
@@ -97,7 +99,9 @@
* <b>DOM</b>: Sets the xml:space attribute value.
*/
public void setXMLspace(String space) {
- XMLSupport.setXMLSpace(this, space);
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_SPACE_ATTRIBUTE,
+ space);
}
// SVGZoomAndPan support ///////////////////////////////////////////////
1.6 +7 -3
xml-batik/sources/org/apache/batik/dom/svg/SVGOMTextContentElement.java
Index: SVGOMTextContentElement.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMTextContentElement.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SVGOMTextContentElement.java 2001/09/12 16:57:07 1.5
+++ SVGOMTextContentElement.java 2001/09/28 12:48:29 1.6
@@ -36,7 +36,7 @@
* This class provides a common superclass for all graphics elements.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: SVGOMTextContentElement.java,v 1.5 2001/09/12 16:57:07 hillion Exp
$
+ * @version $Id: SVGOMTextContentElement.java,v 1.6 2001/09/28 12:48:29 vhardy Exp $
*/
public abstract class SVGOMTextContentElement
extends SVGOMElement
@@ -235,7 +235,9 @@
* <b>DOM</b>: Sets the xml:lang attribute value.
*/
public void setXMLlang(String lang) {
- XMLSupport.setXMLLang(this, lang);
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_LANG_ATTRIBUTE,
+ lang);
}
/**
@@ -249,7 +251,9 @@
* <b>DOM</b>: Sets the xml:space attribute value.
*/
public void setXMLspace(String space) {
- XMLSupport.setXMLSpace(this, space);
+ setAttributeNS(XMLSupport.XML_NAMESPACE_URI,
+ XMLSupport.XML_SPACE_ATTRIBUTE,
+ space);
}
// SVGTests support ///////////////////////////////////////////////////
1.4 +4 -33 xml-batik/sources/org/apache/batik/dom/util/XMLSupport.java
Index: XMLSupport.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/util/XMLSupport.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLSupport.java 2000/10/31 10:28:33 1.3
+++ XMLSupport.java 2001/09/28 12:48:30 1.4
@@ -8,6 +8,8 @@
package org.apache.batik.dom.util;
+import org.apache.batik.util.XMLConstants;
+
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
@@ -17,23 +19,11 @@
* This class provides support for XML features.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: XMLSupport.java,v 1.3 2000/10/31 10:28:33 hillion Exp $
+ * @version $Id: XMLSupport.java,v 1.4 2001/09/28 12:48:30 vhardy Exp $
*/
-
-public class XMLSupport {
- /**
- * The XML namespace URI.
- */
- public final static String XML_NAMESPACE_URI =
- "http://www.w3.org/XML/1998/namespace";;
+public class XMLSupport implements XMLConstants {
/**
- * The xmlns namespace URI.
- */
- public final static String XMLNS_NAMESPACE_URI =
- "http://www.w3.org/2000/xmlns/";;
-
- /**
* This class do not need to be instanciated.
*/
protected XMLSupport() {
@@ -60,13 +50,6 @@
}
/**
- * Sets the xml:lang attribute value of the given element.
- */
- public static void setXMLLang(Element elt, String lang) {
- elt.setAttributeNS(XML_NAMESPACE_URI, "lang", lang);
- }
-
- /**
* Returns the xml:space attribute value of the given element.
*/
public static String getXMLSpace(Element elt) {
@@ -84,18 +67,6 @@
}
}
return "default";
- }
-
- /**
- * Sets the xml:space attribute value of the given element.
- */
- public static void setXMLSpace(Element elt, String space)
- throws DOMException {
- if (!"default".equals(space) && !"preserve".equals(space)) {
- throw new DOMException(DOMException.SYNTAX_ERR,
- "Invalid attribute Value: " + space);
- }
- elt.setAttributeNS(XML_NAMESPACE_URI, "space", space);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
