You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by de...@apache.org on 2009/01/28 12:03:09 UTC

svn commit: r738451 - /xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGUseElementBridge.java

Author: deweese
Date: Wed Jan 28 11:03:08 2009
New Revision: 738451

URL: http://svn.apache.org/viewvc?rev=738451&view=rev
Log:
Fix and NPE when setting an 'unknown' animated attribute

Modified:
    xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGUseElementBridge.java

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGUseElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGUseElementBridge.java?rev=738451&r1=738450&r2=738451&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGUseElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGUseElementBridge.java Wed Jan 28 11:03:08 2009
@@ -447,18 +447,23 @@
         try {
             String ns = alav.getNamespaceURI();
             String ln = alav.getLocalName();
-            if (ns == null
-                    && (ln.equals(SVG_X_ATTRIBUTE)
-                        || ln.equals(SVG_Y_ATTRIBUTE)
-                        || ln.equals(SVG_TRANSFORM_ATTRIBUTE))) {
-                node.setTransform(computeTransform((SVGTransformable) e, ctx));
-                handleGeometryChanged();
-            } else if (ns == null
-                    && (ln.equals(SVG_WIDTH_ATTRIBUTE)
-                        || ln.equals(SVG_HEIGHT_ATTRIBUTE))
-                    || ns.equals(XLINK_NAMESPACE_URI)
-                        && (ln.equals(XLINK_HREF_ATTRIBUTE))) {
-                buildCompositeGraphicsNode(ctx, e, (CompositeGraphicsNode)node);
+            if (ns == null) {
+                if (ln.equals(SVG_X_ATTRIBUTE) ||
+                    ln.equals(SVG_Y_ATTRIBUTE) ||
+                    ln.equals(SVG_TRANSFORM_ATTRIBUTE)) {
+                    node.setTransform
+                        (computeTransform((SVGTransformable) e, ctx));
+                    handleGeometryChanged();
+                } 
+                else if (ln.equals(SVG_WIDTH_ATTRIBUTE) ||
+                         ln.equals(SVG_HEIGHT_ATTRIBUTE))
+                    buildCompositeGraphicsNode
+                        (ctx, e, (CompositeGraphicsNode)node);
+            } else {
+                if (ns.equals(XLINK_NAMESPACE_URI) &&
+                    ln.equals(XLINK_HREF_ATTRIBUTE)) 
+                    buildCompositeGraphicsNode
+                        (ctx, e, (CompositeGraphicsNode)node);
             }
         } catch (LiveAttributeException ex) {
             throw new BridgeException(ctx, ex);