deweese 2004/02/24 02:52:48
Modified: sources/org/apache/batik/bridge SVGTextElementBridge.java
Log:
1) Adding elements in the 'null' namespace nolonger causes a NPE exception.
Revision Changes Path
1.91 +6 -6
xml-batik/sources/org/apache/batik/bridge/SVGTextElementBridge.java
Index: SVGTextElementBridge.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGTextElementBridge.java,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- SVGTextElementBridge.java 7 Sep 2003 22:25:28 -0000 1.90
+++ SVGTextElementBridge.java 24 Feb 2004 10:52:48 -0000 1.91
@@ -359,7 +359,7 @@
* @see org.apache.batik.bridge.BridgeUpdateHandler
*/
protected void addContextToChild(BridgeContext ctx,Element e) {
- if (e.getNamespaceURI().equals(SVG_NAMESPACE_URI)) {
+ if (SVG_NAMESPACE_URI.equals(e.getNamespaceURI())) {
if (e.getLocalName().equals(SVG_TSPAN_TAG)) {
((SVGOMElement)e).setSVGContext
(new TspanBridge(ctx, this, e));
@@ -396,7 +396,7 @@
laidoutText = null;
break;
case Node.ELEMENT_NODE:
- if (childNode.getNamespaceURI().equals(SVG_NAMESPACE_URI)) {
+ if (SVG_NAMESPACE_URI.equals(childNode.getNamespaceURI())) {
String nodeName = childNode.getLocalName();
if (nodeName.equals(SVG_TSPAN_TAG) ||
nodeName.equals(SVG_ALT_GLYPH_TAG) ||
@@ -447,7 +447,7 @@
}
break;
case Node.ELEMENT_NODE:
- if (childNode.getNamespaceURI().equals(SVG_NAMESPACE_URI)) {
+ if (SVG_NAMESPACE_URI.equals(childNode.getNamespaceURI())) {
String nodeName = childNode.getLocalName();
if (nodeName.equals(SVG_TSPAN_TAG) ||
nodeName.equals(SVG_ALT_GLYPH_TAG) ||
@@ -501,7 +501,7 @@
protected boolean isParentDisplayed(Node childNode) {
Node parentNode = childNode.getParentNode();
if (parentNode.getNodeType() == Node.ELEMENT_NODE) {
- if (parentNode.getNamespaceURI().equals(SVG_NAMESPACE_URI)) {
+ if (SVG_NAMESPACE_URI.equals(parentNode.getNamespaceURI())) {
String nodeName = parentNode.getLocalName();
if (nodeName.equals(SVG_TEXT_TAG) ||
nodeName.equals(SVG_TSPAN_TAG) ||
@@ -851,7 +851,7 @@
switch (n.getNodeType()) {
case Node.ELEMENT_NODE:
- if (n.getNamespaceURI() != SVG_NAMESPACE_URI) {
+ if (!SVG_NAMESPACE_URI.equals(n.getNamespaceURI())) {
break;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
