More MI delegation. 28 left

(bzr r5183)

26 files changed, 772 insertions, 298 deletions

diff --git a/src/bind/java/org/inkscape/dom/events/DocumentEventImpl.java b/src/bind/java/org/inkscape/dom/events/DocumentEventImpl.java
index 653c004de..504427db3 100644
--- a/src/bind/java/org/inkscape/dom/events/DocumentEventImpl.java
+++ b/src/bind/java/org/inkscape/dom/events/DocumentEventImpl.java
@@ -35,6 +35,8 @@ import org.w3c.dom.events.Event;
 
 
 public class DocumentEventImpl
+       extends
+             org.inkscape.cmn.BaseInterface
        implements org.w3c.dom.events.DocumentEvent
 {
 
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGColorProfileElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGColorProfileElementImpl.java
index 66dac7c5e..6e9e70a74 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGColorProfileElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGColorProfileElementImpl.java
@@ -41,10 +41,19 @@ public class SVGColorProfileElementImpl
                //SVGRenderingIntent
        implements org.w3c.dom.svg.SVGColorProfileElement
 {
+
+public SVGColorProfileElementImpl()
+{
+    imbue(_SVGURIReference = new SVGURIReferenceImpl());
+}
+
 //from SVGURIReference
-public native SVGAnimatedString getHref( );
+private SVGURIReferenceImpl _SVGURIReference;
+public SVGAnimatedString getHref()
+    { return _SVGURIReference.getHref(); }
 //end SVGURIReference
 
+
 public native String getLocal( );
 public native void setLocal( String local )
                        throws DOMException;
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGCursorElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGCursorElementImpl.java
index 6eb318bb9..29ffd4a10 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGCursorElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGCursorElementImpl.java
@@ -40,23 +40,43 @@ public class SVGCursorElementImpl
                //SVGExternalResourcesRequired
        implements org.w3c.dom.svg.SVGCursorElement
 {
+
+public SVGCursorElementImpl()
+{
+    imbue(_SVGURIReference = new SVGURIReferenceImpl());
+    imbue(_SVGTests = new SVGTestsImpl());
+    imbue(_SVGExternalResourcesRequired = new SVGExternalResourcesRequiredImpl());
+}
+
+
 //from SVGURIReference
-public native SVGAnimatedString getHref( );
+private SVGURIReferenceImpl _SVGURIReference;
+public SVGAnimatedString getHref()
+    { return _SVGURIReference.getHref(); }
 //end SVGURIReference
 
 //from SVGTests
-public native SVGStringList getRequiredFeatures( );
-public native SVGStringList getRequiredExtensions( );
-public native SVGStringList getSystemLanguage( );
-public native boolean hasExtension ( String extension );
+private SVGTestsImpl _SVGTests;
+public SVGStringList getRequiredFeatures()
+   { return _SVGTests.getRequiredFeatures(); }
+public SVGStringList getRequiredExtensions()
+   { return _SVGTests.getRequiredExtensions(); }
+public SVGStringList getSystemLanguage()
+   { return _SVGTests.getSystemLanguage(); }
+public boolean hasExtension (String extension)
+   { return _SVGTests.hasExtension(extension); }
 //end SVGTests
 
+
 //from SVGExternalResourcesRequired
-public native SVGAnimatedBoolean getExternalResourcesRequired( );
+private SVGExternalResourcesRequiredImpl _SVGExternalResourcesRequired;
+public SVGAnimatedBoolean getExternalResourcesRequired()
+    { return _SVGExternalResourcesRequired.getExternalResourcesRequired(); }
 //end SVGExternalResourcesRequired
 
 
 
+
 public native SVGAnimatedLength getX( );
 
 public native SVGAnimatedLength getY( );
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGDefsElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGDefsElementImpl.java
index 919de9611..b1d23df04 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGDefsElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGDefsElementImpl.java
@@ -54,69 +54,112 @@ public class SVGDefsElementImpl
                //EventTarget
        implements org.w3c.dom.svg.SVGDefsElement
 {
+public SVGDefsElementImpl()
+{
+    imbue(_SVGTests = new SVGTestsImpl());
+    imbue(_SVGLangSpace = new SVGLangSpaceImpl());
+    imbue(_SVGExternalResourcesRequired = new SVGExternalResourcesRequiredImpl());
+    imbue(_SVGStylable = new SVGStylableImpl());
+    imbue(_SVGTransformable = new SVGTransformableImpl());
+    imbue(_EventTarget = new org.inkscape.dom.events.EventTargetImpl());
+}
+
+
+
 //from SVGTests
-public native SVGStringList getRequiredFeatures( );
-public native SVGStringList getRequiredExtensions( );
-public native SVGStringList getSystemLanguage( );
-public native boolean hasExtension ( String extension );
+private SVGTestsImpl _SVGTests;
+public SVGStringList getRequiredFeatures()
+   { return _SVGTests.getRequiredFeatures(); }
+public SVGStringList getRequiredExtensions()
+   { return _SVGTests.getRequiredExtensions(); }
+public SVGStringList getSystemLanguage()
+   { return _SVGTests.getSystemLanguage(); }
+public boolean hasExtension (String extension)
+   { return _SVGTests.hasExtension(extension); }
 //end SVGTests
 
 //from SVGLangSpace
-public native String getXMLlang( );
-public native void setXMLlang( String xmllang )
-                       throws DOMException;
-public native String getXMLspace( );
-public native void setXMLspace( String xmlspace )
-                       throws DOMException;
+private SVGLangSpaceImpl _SVGLangSpace;
+public String getXMLlang()
+    { return _SVGLangSpace.getXMLlang(); }
+public void setXMLlang(String xmllang)
+                       throws DOMException
+    { _SVGLangSpace.setXMLlang(xmllang); }
+public String getXMLspace()
+    { return _SVGLangSpace.getXMLspace(); }
+public void setXMLspace(String xmlspace)
+                       throws DOMException
+    { _SVGLangSpace.setXMLspace(xmlspace); }
 //end SVGLangSpace
 
 //from SVGExternalResourcesRequired
-public native SVGAnimatedBoolean getExternalResourcesRequired( );
+private SVGExternalResourcesRequiredImpl _SVGExternalResourcesRequired;
+public SVGAnimatedBoolean getExternalResourcesRequired()
+    { return _SVGExternalResourcesRequired.getExternalResourcesRequired(); }
 //end SVGExternalResourcesRequired
 
 //from SVGStylable
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+private SVGStylableImpl _SVGStylable;
+public SVGAnimatedString getClassName()
+    { return _SVGStylable.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGStylable.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGStylable.getPresentationAttribute(name); }
 //end SVGStylable
 
 //from SVGTransformable
-public native SVGAnimatedTransformList getTransform( );
+private SVGTransformableImpl _SVGTransformable;
+public SVGAnimatedTransformList getTransform()
+    { return _SVGTransformable.getTransform(); }
 //end SVGTransformable
 
 //from SVGLocatable (from SVGTransformable)
-public native SVGElement getNearestViewportElement( );
-public native SVGElement getFarthestViewportElement( );
-
-public native SVGRect   getBBox (  );
-public native SVGMatrix getCTM (  );
-public native SVGMatrix getScreenCTM (  );
-public native SVGMatrix getTransformToElement ( SVGElement element )
-                  throws SVGException;
+public SVGElement getNearestViewportElement()
+    { return _SVGTransformable.getNearestViewportElement(); }
+public SVGElement getFarthestViewportElement()
+    { return _SVGTransformable.getFarthestViewportElement(); }
+public SVGRect getBBox()
+    { return _SVGTransformable.getBBox(); }
+public SVGMatrix getCTM()
+    { return _SVGTransformable.getCTM(); }
+public SVGMatrix getScreenCTM()
+    { return _SVGTransformable.getScreenCTM(); }
+public SVGMatrix getTransformToElement (SVGElement element)
+                  throws SVGException
+    { return _SVGTransformable.getTransformToElement(element); }
 //end SVGLocatable
 
 //from EventTarget
-public native void addEventListener(String type,
+private org.inkscape.dom.events.EventTargetImpl _EventTarget;
+public void addEventListener(String type,
                              EventListener listener,
-                             boolean useCapture);
-public native void removeEventListener(String type,
+                             boolean useCapture)
+    { _EventTarget.addEventListener(type, listener, useCapture); }
+public void removeEventListener(String type,
                                 EventListener listener,
-                                boolean useCapture);
-public native boolean dispatchEvent(Event evt)
-                             throws EventException;
-public native void addEventListenerNS(String namespaceURI,
+                                boolean useCapture)
+    { _EventTarget.removeEventListener(type, listener, useCapture); }
+public boolean dispatchEvent(Event evt)
+                             throws EventException
+    { return _EventTarget.dispatchEvent(evt); }
+public void addEventListenerNS(String namespaceURI,
                                String type,
                                EventListener listener,
                                boolean useCapture,
-                               Object evtGroup);
-public native void removeEventListenerNS(String namespaceURI,
+                               Object evtGroup)
+    { _EventTarget.addEventListenerNS(namespaceURI, type, listener, useCapture, evtGroup); }
+public void removeEventListenerNS(String namespaceURI,
                                   String type,
                                   EventListener listener,
-                                  boolean useCapture);
-public native boolean willTriggerNS(String namespaceURI,
-                             String type);
-public native boolean hasEventListenerNS(String namespaceURI,
-                                  String type);
+                                  boolean useCapture)
+    { _EventTarget.removeEventListenerNS(namespaceURI, type, listener, useCapture); }
+public boolean willTriggerNS(String namespaceURI,
+                             String type)
+    { return _EventTarget.willTriggerNS(namespaceURI, type); }
+public boolean hasEventListenerNS(String namespaceURI,
+                                  String type)
+    { return _EventTarget.hasEventListenerNS(namespaceURI, type); }
 //end EventTarget
 
 }
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGDescElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGDescElementImpl.java
index 335362520..56a510974 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGDescElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGDescElementImpl.java
@@ -45,19 +45,37 @@ public class SVGDescElementImpl
        //        SVGStylable
        implements org.w3c.dom.svg.SVGDescElement
 {
+
+public SVGDescElementImpl()
+{
+    imbue(_SVGLangSpace = new SVGLangSpaceImpl());
+    imbue(_SVGStylable = new SVGStylableImpl());
+}
+
+
 //from SVGLangSpace
-public native String getXMLlang( );
-public native void setXMLlang( String xmllang )
-                       throws DOMException;
-public native String getXMLspace( );
-public native void setXMLspace( String xmlspace )
-                       throws DOMException;
+private SVGLangSpaceImpl _SVGLangSpace;
+public String getXMLlang()
+    { return _SVGLangSpace.getXMLlang(); }
+public void setXMLlang(String xmllang)
+                       throws DOMException
+    { _SVGLangSpace.setXMLlang(xmllang); }
+public String getXMLspace()
+    { return _SVGLangSpace.getXMLspace(); }
+public void setXMLspace(String xmlspace)
+                       throws DOMException
+    { _SVGLangSpace.setXMLspace(xmlspace); }
 //end SVGLangSpace
 
+
 //from SVGStylable
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+private SVGStylableImpl _SVGStylable;
+public SVGAnimatedString getClassName()
+    { return _SVGStylable.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGStylable.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGStylable.getPresentationAttribute(name); }
 //end SVGStylable
 
 
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGDocumentImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGDocumentImpl.java
index f23c17a6a..9ee152446 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGDocumentImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGDocumentImpl.java
@@ -40,25 +40,26 @@ import org.w3c.dom.svg.SVGSVGElement;
 public class SVGDocumentImpl
        extends
                org.inkscape.dom.DocumentImpl
-       //        DocumentEvent
+               //DocumentEvent
        implements org.w3c.dom.svg.SVGDocument
 {
-//from DocumentEvent
-public native Event createEvent(String eventType)
-                             throws DOMException;
+public SVGDocumentImpl()
+{
+    imbue(_DocumentEvent = new org.inkscape.dom.events.DocumentEventImpl());
+}
 
-public native boolean canDispatch(String namespaceURI,
-                               String type);
+//from DocumentEvent
+org.inkscape.dom.events.DocumentEventImpl _DocumentEvent;
+public Event createEvent(String eventType) throws DOMException
+    { return _DocumentEvent.createEvent(eventType); }
+public boolean canDispatch(String namespaceURI, String type)
+    { return _DocumentEvent.canDispatch(namespaceURI, type); }
 //end DocumentEvent
 
 public native String getTitle( );
-
 public native String getReferrer( );
-
 public native String getDomain( );
-
 public native String getURL( );
-
 public native SVGSVGElement getRootElement( );
 
 }
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGEllipseElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGEllipseElementImpl.java
index 5a5cdbe91..2e2111649 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGEllipseElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGEllipseElementImpl.java
@@ -53,69 +53,110 @@ public class SVGEllipseElementImpl
                //EventTarget
         implements org.w3c.dom.svg.SVGEllipseElement
 {
+public SVGEllipseElementImpl()
+{
+    imbue(_SVGTests = new SVGTestsImpl());
+    imbue(_SVGLangSpace = new SVGLangSpaceImpl());
+    imbue(_SVGExternalResourcesRequired = new SVGExternalResourcesRequiredImpl());
+    imbue(_SVGStylable = new SVGStylableImpl());
+    imbue(_SVGTransformable = new SVGTransformableImpl());
+    imbue(_EventTarget = new org.inkscape.dom.events.EventTargetImpl());
+}
+
 //from SVGTests
-public native SVGStringList getRequiredFeatures( );
-public native SVGStringList getRequiredExtensions( );
-public native SVGStringList getSystemLanguage( );
-public native boolean hasExtension ( String extension );
+private SVGTestsImpl _SVGTests;
+public SVGStringList getRequiredFeatures()
+   { return _SVGTests.getRequiredFeatures(); }
+public SVGStringList getRequiredExtensions()
+   { return _SVGTests.getRequiredExtensions(); }
+public SVGStringList getSystemLanguage()
+   { return _SVGTests.getSystemLanguage(); }
+public boolean hasExtension (String extension)
+   { return _SVGTests.hasExtension(extension); }
 //end SVGTests
 
 //from SVGLangSpace
-public native String getXMLlang( );
-public native void setXMLlang( String xmllang )
-                       throws DOMException;
-public native String getXMLspace( );
-public native void setXMLspace( String xmlspace )
-                       throws DOMException;
+private SVGLangSpaceImpl _SVGLangSpace;
+public String getXMLlang()
+    { return _SVGLangSpace.getXMLlang(); }
+public void setXMLlang(String xmllang)
+                       throws DOMException
+    { _SVGLangSpace.setXMLlang(xmllang); }
+public String getXMLspace()
+    { return _SVGLangSpace.getXMLspace(); }
+public void setXMLspace(String xmlspace)
+                       throws DOMException
+    { _SVGLangSpace.setXMLspace(xmlspace); }
 //end SVGLangSpace
 
 //from SVGExternalResourcesRequired
-public native SVGAnimatedBoolean getExternalResourcesRequired( );
+private SVGExternalResourcesRequiredImpl _SVGExternalResourcesRequired;
+public SVGAnimatedBoolean getExternalResourcesRequired()
+    { return _SVGExternalResourcesRequired.getExternalResourcesRequired(); }
 //end SVGExternalResourcesRequired
 
 //from SVGStylable
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+private SVGStylableImpl _SVGStylable;
+public SVGAnimatedString getClassName()
+    { return _SVGStylable.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGStylable.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGStylable.getPresentationAttribute(name); }
 //end SVGStylable
 
 //from SVGTransformable
-public native SVGAnimatedTransformList getTransform( );
+private SVGTransformableImpl _SVGTransformable;
+public SVGAnimatedTransformList getTransform()
+    { return _SVGTransformable.getTransform(); }
 //end SVGTransformable
 
 //from SVGLocatable (from SVGTransformable)
-public native SVGElement getNearestViewportElement( );
-public native SVGElement getFarthestViewportElement( );
-
-public native SVGRect   getBBox (  );
-public native SVGMatrix getCTM (  );
-public native SVGMatrix getScreenCTM (  );
-public native SVGMatrix getTransformToElement ( SVGElement element )
-                  throws SVGException;
+public SVGElement getNearestViewportElement()
+    { return _SVGTransformable.getNearestViewportElement(); }
+public SVGElement getFarthestViewportElement()
+    { return _SVGTransformable.getFarthestViewportElement(); }
+public SVGRect getBBox()
+    { return _SVGTransformable.getBBox(); }
+public SVGMatrix getCTM()
+    { return _SVGTransformable.getCTM(); }
+public SVGMatrix getScreenCTM()
+    { return _SVGTransformable.getScreenCTM(); }
+public SVGMatrix getTransformToElement (SVGElement element)
+                  throws SVGException
+    { return _SVGTransformable.getTransformToElement(element); }
 //end SVGLocatable
 
 //from EventTarget
-public native void addEventListener(String type,
+private org.inkscape.dom.events.EventTargetImpl _EventTarget;
+public void addEventListener(String type,
                              EventListener listener,
-                             boolean useCapture);
-public native void removeEventListener(String type,
+                             boolean useCapture)
+    { _EventTarget.addEventListener(type, listener, useCapture); }
+public void removeEventListener(String type,
                                 EventListener listener,
-                                boolean useCapture);
-public native boolean dispatchEvent(Event evt)
-                             throws EventException;
-public native void addEventListenerNS(String namespaceURI,
+                                boolean useCapture)
+    { _EventTarget.removeEventListener(type, listener, useCapture); }
+public boolean dispatchEvent(Event evt)
+                             throws EventException
+    { return _EventTarget.dispatchEvent(evt); }
+public void addEventListenerNS(String namespaceURI,
                                String type,
                                EventListener listener,
                                boolean useCapture,
-                               Object evtGroup);
-public native void removeEventListenerNS(String namespaceURI,
+                               Object evtGroup)
+    { _EventTarget.addEventListenerNS(namespaceURI, type, listener, useCapture, evtGroup); }
+public void removeEventListenerNS(String namespaceURI,
                                   String type,
                                   EventListener listener,
-                                  boolean useCapture);
-public native boolean willTriggerNS(String namespaceURI,
-                             String type);
-public native boolean hasEventListenerNS(String namespaceURI,
-                                  String type);
+                                  boolean useCapture)
+    { _EventTarget.removeEventListenerNS(namespaceURI, type, listener, useCapture); }
+public boolean willTriggerNS(String namespaceURI,
+                             String type)
+    { return _EventTarget.willTriggerNS(namespaceURI, type); }
+public boolean hasEventListenerNS(String namespaceURI,
+                                  String type)
+    { return _EventTarget.hasEventListenerNS(namespaceURI, type); }
 //end EventTarget
 
 
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGFEBlendElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGFEBlendElementImpl.java
index 1bf2b4e98..a55f2ef49 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGFEBlendElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGFEBlendElementImpl.java
@@ -44,25 +44,41 @@ public class SVGFEBlendElementImpl
                //SVGFilterPrimitiveStandardAttributes
        implements org.w3c.dom.svg.SVGFEBlendElement
 {
+public SVGFEBlendElementImpl()
+{
+    imbue(_SVGFilterPrimitiveStandardAttributes =
+             new SVGFilterPrimitiveStandardAttributesImpl());
+}
+
+
 //from SVGFilterPrimitiveStandardAttributes
-public native SVGAnimatedLength getX( );
-public native SVGAnimatedLength getY( );
-public native SVGAnimatedLength getWidth( );
-public native SVGAnimatedLength getHeight( );
-public native SVGAnimatedString getResult( );
+SVGFilterPrimitiveStandardAttributesImpl _SVGFilterPrimitiveStandardAttributes;
+public SVGAnimatedLength getX()
+    { return _SVGFilterPrimitiveStandardAttributes.getX(); }
+public SVGAnimatedLength getY()
+    { return _SVGFilterPrimitiveStandardAttributes.getY(); }
+public SVGAnimatedLength getWidth()
+    { return _SVGFilterPrimitiveStandardAttributes.getWidth(); }
+public SVGAnimatedLength getHeight()
+    { return _SVGFilterPrimitiveStandardAttributes.getHeight(); }
+public SVGAnimatedString getResult()
+    { return _SVGFilterPrimitiveStandardAttributes.getResult(); }
 //end SVGFilterPrimitiveStandardAttributes
 
 //from SVGStylable (from SVGFilterPrimitiveStandardAttributes)
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+public SVGAnimatedString getClassName()
+    { return _SVGFilterPrimitiveStandardAttributes.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGFilterPrimitiveStandardAttributes.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGFilterPrimitiveStandardAttributes.getPresentationAttribute(name); }
 //end SVGStylable
 
 
-public native SVGAnimatedString getIn1( );
+public native SVGAnimatedString getIn1();
 
-public native SVGAnimatedString getIn2( );
+public native SVGAnimatedString getIn2();
 
-public native SVGAnimatedEnumeration getMode( );
+public native SVGAnimatedEnumeration getMode();
 
 }
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGFEColorMatrixElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGFEColorMatrixElementImpl.java
index 626b377b6..9a68d21ab 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGFEColorMatrixElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGFEColorMatrixElementImpl.java
@@ -44,21 +44,37 @@ public class SVGFEColorMatrixElementImpl
                //SVGFilterPrimitiveStandardAttributes
        implements org.w3c.dom.svg.SVGFEColorMatrixElement
 {
+public SVGFEColorMatrixElementImpl()
+{
+    imbue(_SVGFilterPrimitiveStandardAttributes =
+             new SVGFilterPrimitiveStandardAttributesImpl());
+}
+
 //from SVGFilterPrimitiveStandardAttributes
-public native SVGAnimatedLength getX( );
-public native SVGAnimatedLength getY( );
-public native SVGAnimatedLength getWidth( );
-public native SVGAnimatedLength getHeight( );
-public native SVGAnimatedString getResult( );
+SVGFilterPrimitiveStandardAttributesImpl _SVGFilterPrimitiveStandardAttributes;
+public SVGAnimatedLength getX()
+    { return _SVGFilterPrimitiveStandardAttributes.getX(); }
+public SVGAnimatedLength getY()
+    { return _SVGFilterPrimitiveStandardAttributes.getY(); }
+public SVGAnimatedLength getWidth()
+    { return _SVGFilterPrimitiveStandardAttributes.getWidth(); }
+public SVGAnimatedLength getHeight()
+    { return _SVGFilterPrimitiveStandardAttributes.getHeight(); }
+public SVGAnimatedString getResult()
+    { return _SVGFilterPrimitiveStandardAttributes.getResult(); }
 //end SVGFilterPrimitiveStandardAttributes
 
 //from SVGStylable (from SVGFilterPrimitiveStandardAttributes)
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+public SVGAnimatedString getClassName()
+    { return _SVGFilterPrimitiveStandardAttributes.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGFilterPrimitiveStandardAttributes.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGFilterPrimitiveStandardAttributes.getPresentationAttribute(name); }
 //end SVGStylable
 
 
+
 public native SVGAnimatedString getIn1( );
 
 public native SVGAnimatedEnumeration getType( );
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGFEComponentTransferElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGFEComponentTransferElementImpl.java
index 3909943fe..8ecf3180c 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGFEComponentTransferElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGFEComponentTransferElementImpl.java
@@ -43,21 +43,37 @@ public class SVGFEComponentTransferElementImpl
                //SVGFilterPrimitiveStandardAttributes
        implements org.w3c.dom.svg.SVGFEComponentTransferElement
 {
+public SVGFEComponentTransferElementImpl()
+{
+    imbue(_SVGFilterPrimitiveStandardAttributes =
+             new SVGFilterPrimitiveStandardAttributesImpl());
+}
+
 //from SVGFilterPrimitiveStandardAttributes
-public native SVGAnimatedLength getX( );
-public native SVGAnimatedLength getY( );
-public native SVGAnimatedLength getWidth( );
-public native SVGAnimatedLength getHeight( );
-public native SVGAnimatedString getResult( );
+SVGFilterPrimitiveStandardAttributesImpl _SVGFilterPrimitiveStandardAttributes;
+public SVGAnimatedLength getX()
+    { return _SVGFilterPrimitiveStandardAttributes.getX(); }
+public SVGAnimatedLength getY()
+    { return _SVGFilterPrimitiveStandardAttributes.getY(); }
+public SVGAnimatedLength getWidth()
+    { return _SVGFilterPrimitiveStandardAttributes.getWidth(); }
+public SVGAnimatedLength getHeight()
+    { return _SVGFilterPrimitiveStandardAttributes.getHeight(); }
+public SVGAnimatedString getResult()
+    { return _SVGFilterPrimitiveStandardAttributes.getResult(); }
 //end SVGFilterPrimitiveStandardAttributes
 
 //from SVGStylable (from SVGFilterPrimitiveStandardAttributes)
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+public SVGAnimatedString getClassName()
+    { return _SVGFilterPrimitiveStandardAttributes.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGFilterPrimitiveStandardAttributes.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGFilterPrimitiveStandardAttributes.getPresentationAttribute(name); }
 //end SVGStylable
 
 
+
 public native SVGAnimatedString getIn1( );
 
 }
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGFECompositeElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGFECompositeElementImpl.java
index ec6185fc7..0b5ca1276 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGFECompositeElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGFECompositeElementImpl.java
@@ -44,22 +44,38 @@ public class SVGFECompositeElementImpl
                //SVGFilterPrimitiveStandardAttributes
        implements org.w3c.dom.svg.SVGFECompositeElement
 {
+public SVGFECompositeElementImpl()
+{
+    imbue(_SVGFilterPrimitiveStandardAttributes =
+             new SVGFilterPrimitiveStandardAttributesImpl());
+}
+
 //from SVGFilterPrimitiveStandardAttributes
-public native SVGAnimatedLength getX( );
-public native SVGAnimatedLength getY( );
-public native SVGAnimatedLength getWidth( );
-public native SVGAnimatedLength getHeight( );
-public native SVGAnimatedString getResult( );
+SVGFilterPrimitiveStandardAttributesImpl _SVGFilterPrimitiveStandardAttributes;
+public SVGAnimatedLength getX()
+    { return _SVGFilterPrimitiveStandardAttributes.getX(); }
+public SVGAnimatedLength getY()
+    { return _SVGFilterPrimitiveStandardAttributes.getY(); }
+public SVGAnimatedLength getWidth()
+    { return _SVGFilterPrimitiveStandardAttributes.getWidth(); }
+public SVGAnimatedLength getHeight()
+    { return _SVGFilterPrimitiveStandardAttributes.getHeight(); }
+public SVGAnimatedString getResult()
+    { return _SVGFilterPrimitiveStandardAttributes.getResult(); }
 //end SVGFilterPrimitiveStandardAttributes
 
 //from SVGStylable (from SVGFilterPrimitiveStandardAttributes)
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+public SVGAnimatedString getClassName()
+    { return _SVGFilterPrimitiveStandardAttributes.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGFilterPrimitiveStandardAttributes.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGFilterPrimitiveStandardAttributes.getPresentationAttribute(name); }
 //end SVGStylable
 
 
 
+
 public native SVGAnimatedString getIn1( );
 
 public native SVGAnimatedString getIn2( );
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGFEConvolveMatrixElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGFEConvolveMatrixElementImpl.java
index 567df36ec..5fc3514b6 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGFEConvolveMatrixElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGFEConvolveMatrixElementImpl.java
@@ -43,21 +43,37 @@ public class SVGFEConvolveMatrixElementImpl
                //SVGFilterPrimitiveStandardAttributes
        implements org.w3c.dom.svg.SVGFEConvolveMatrixElement
 {
+public SVGFEConvolveMatrixElementImpl()
+{
+    imbue(_SVGFilterPrimitiveStandardAttributes =
+             new SVGFilterPrimitiveStandardAttributesImpl());
+}
+
 //from SVGFilterPrimitiveStandardAttributes
-public native SVGAnimatedLength getX( );
-public native SVGAnimatedLength getY( );
-public native SVGAnimatedLength getWidth( );
-public native SVGAnimatedLength getHeight( );
-public native SVGAnimatedString getResult( );
+SVGFilterPrimitiveStandardAttributesImpl _SVGFilterPrimitiveStandardAttributes;
+public SVGAnimatedLength getX()
+    { return _SVGFilterPrimitiveStandardAttributes.getX(); }
+public SVGAnimatedLength getY()
+    { return _SVGFilterPrimitiveStandardAttributes.getY(); }
+public SVGAnimatedLength getWidth()
+    { return _SVGFilterPrimitiveStandardAttributes.getWidth(); }
+public SVGAnimatedLength getHeight()
+    { return _SVGFilterPrimitiveStandardAttributes.getHeight(); }
+public SVGAnimatedString getResult()
+    { return _SVGFilterPrimitiveStandardAttributes.getResult(); }
 //end SVGFilterPrimitiveStandardAttributes
 
 //from SVGStylable (from SVGFilterPrimitiveStandardAttributes)
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+public SVGAnimatedString getClassName()
+    { return _SVGFilterPrimitiveStandardAttributes.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGFilterPrimitiveStandardAttributes.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGFilterPrimitiveStandardAttributes.getPresentationAttribute(name); }
 //end SVGStylable
 
 
+
 public native SVGAnimatedInteger     getOrderX( );
 
 public native SVGAnimatedInteger     getOrderY( );
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGFEDiffuseLightingElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGFEDiffuseLightingElementImpl.java
index c5bbaa00d..49c95cbec 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGFEDiffuseLightingElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGFEDiffuseLightingElementImpl.java
@@ -43,18 +43,33 @@ public class SVGFEDiffuseLightingElementImpl
                //SVGFilterPrimitiveStandardAttributes
        implements org.w3c.dom.svg.SVGFEDiffuseLightingElement
 {
+public SVGFEDiffuseLightingElementImpl()
+{
+    imbue(_SVGFilterPrimitiveStandardAttributes =
+             new SVGFilterPrimitiveStandardAttributesImpl());
+}
+
 //from SVGFilterPrimitiveStandardAttributes
-public native SVGAnimatedLength getX( );
-public native SVGAnimatedLength getY( );
-public native SVGAnimatedLength getWidth( );
-public native SVGAnimatedLength getHeight( );
-public native SVGAnimatedString getResult( );
+SVGFilterPrimitiveStandardAttributesImpl _SVGFilterPrimitiveStandardAttributes;
+public SVGAnimatedLength getX()
+    { return _SVGFilterPrimitiveStandardAttributes.getX(); }
+public SVGAnimatedLength getY()
+    { return _SVGFilterPrimitiveStandardAttributes.getY(); }
+public SVGAnimatedLength getWidth()
+    { return _SVGFilterPrimitiveStandardAttributes.getWidth(); }
+public SVGAnimatedLength getHeight()
+    { return _SVGFilterPrimitiveStandardAttributes.getHeight(); }
+public SVGAnimatedString getResult()
+    { return _SVGFilterPrimitiveStandardAttributes.getResult(); }
 //end SVGFilterPrimitiveStandardAttributes
 
 //from SVGStylable (from SVGFilterPrimitiveStandardAttributes)
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+public SVGAnimatedString getClassName()
+    { return _SVGFilterPrimitiveStandardAttributes.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGFilterPrimitiveStandardAttributes.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGFilterPrimitiveStandardAttributes.getPresentationAttribute(name); }
 //end SVGStylable
 
 
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGFEDisplacementMapElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGFEDisplacementMapElementImpl.java
index 9a92612fe..53c3199c3 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGFEDisplacementMapElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGFEDisplacementMapElementImpl.java
@@ -43,18 +43,33 @@ public class SVGFEDisplacementMapElementImpl
                //SVGFilterPrimitiveStandardAttributes
        implements org.w3c.dom.svg.SVGFEDisplacementMapElement
 {
+public SVGFEDisplacementMapElementImpl()
+{
+    imbue(_SVGFilterPrimitiveStandardAttributes =
+             new SVGFilterPrimitiveStandardAttributesImpl());
+}
+
 //from SVGFilterPrimitiveStandardAttributes
-public native SVGAnimatedLength getX( );
-public native SVGAnimatedLength getY( );
-public native SVGAnimatedLength getWidth( );
-public native SVGAnimatedLength getHeight( );
-public native SVGAnimatedString getResult( );
+SVGFilterPrimitiveStandardAttributesImpl _SVGFilterPrimitiveStandardAttributes;
+public SVGAnimatedLength getX()
+    { return _SVGFilterPrimitiveStandardAttributes.getX(); }
+public SVGAnimatedLength getY()
+    { return _SVGFilterPrimitiveStandardAttributes.getY(); }
+public SVGAnimatedLength getWidth()
+    { return _SVGFilterPrimitiveStandardAttributes.getWidth(); }
+public SVGAnimatedLength getHeight()
+    { return _SVGFilterPrimitiveStandardAttributes.getHeight(); }
+public SVGAnimatedString getResult()
+    { return _SVGFilterPrimitiveStandardAttributes.getResult(); }
 //end SVGFilterPrimitiveStandardAttributes
 
 //from SVGStylable (from SVGFilterPrimitiveStandardAttributes)
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+public SVGAnimatedString getClassName()
+    { return _SVGFilterPrimitiveStandardAttributes.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGFilterPrimitiveStandardAttributes.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGFilterPrimitiveStandardAttributes.getPresentationAttribute(name); }
 //end SVGStylable
 
 
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGFEFloodElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGFEFloodElementImpl.java
index 006aebb4d..476633c0c 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGFEFloodElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGFEFloodElementImpl.java
@@ -43,21 +43,37 @@ public class SVGFEFloodElementImpl
                //SVGFilterPrimitiveStandardAttributes
        implements org.w3c.dom.svg.SVGFEFloodElement
 {
+public SVGFEFloodElementImpl()
+{
+    imbue(_SVGFilterPrimitiveStandardAttributes =
+             new SVGFilterPrimitiveStandardAttributesImpl());
+}
+
 //from SVGFilterPrimitiveStandardAttributes
-public native SVGAnimatedLength getX( );
-public native SVGAnimatedLength getY( );
-public native SVGAnimatedLength getWidth( );
-public native SVGAnimatedLength getHeight( );
-public native SVGAnimatedString getResult( );
+SVGFilterPrimitiveStandardAttributesImpl _SVGFilterPrimitiveStandardAttributes;
+public SVGAnimatedLength getX()
+    { return _SVGFilterPrimitiveStandardAttributes.getX(); }
+public SVGAnimatedLength getY()
+    { return _SVGFilterPrimitiveStandardAttributes.getY(); }
+public SVGAnimatedLength getWidth()
+    { return _SVGFilterPrimitiveStandardAttributes.getWidth(); }
+public SVGAnimatedLength getHeight()
+    { return _SVGFilterPrimitiveStandardAttributes.getHeight(); }
+public SVGAnimatedString getResult()
+    { return _SVGFilterPrimitiveStandardAttributes.getResult(); }
 //end SVGFilterPrimitiveStandardAttributes
 
 //from SVGStylable (from SVGFilterPrimitiveStandardAttributes)
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+public SVGAnimatedString getClassName()
+    { return _SVGFilterPrimitiveStandardAttributes.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGFilterPrimitiveStandardAttributes.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGFilterPrimitiveStandardAttributes.getPresentationAttribute(name); }
 //end SVGStylable
 
 
+
 public native SVGAnimatedString getIn1( );
 
 }
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGFEGaussianBlurElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGFEGaussianBlurElementImpl.java
index 26d26388e..07c085d35 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGFEGaussianBlurElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGFEGaussianBlurElementImpl.java
@@ -42,22 +42,38 @@ public class SVGFEGaussianBlurElementImpl
                //SVGFilterPrimitiveStandardAttributes
        implements org.w3c.dom.svg.SVGFEGaussianBlurElement
 {
+public SVGFEGaussianBlurElementImpl()
+{
+    imbue(_SVGFilterPrimitiveStandardAttributes =
+             new SVGFilterPrimitiveStandardAttributesImpl());
+}
+
 //from SVGFilterPrimitiveStandardAttributes
-public native SVGAnimatedLength getX( );
-public native SVGAnimatedLength getY( );
-public native SVGAnimatedLength getWidth( );
-public native SVGAnimatedLength getHeight( );
-public native SVGAnimatedString getResult( );
+SVGFilterPrimitiveStandardAttributesImpl _SVGFilterPrimitiveStandardAttributes;
+public SVGAnimatedLength getX()
+    { return _SVGFilterPrimitiveStandardAttributes.getX(); }
+public SVGAnimatedLength getY()
+    { return _SVGFilterPrimitiveStandardAttributes.getY(); }
+public SVGAnimatedLength getWidth()
+    { return _SVGFilterPrimitiveStandardAttributes.getWidth(); }
+public SVGAnimatedLength getHeight()
+    { return _SVGFilterPrimitiveStandardAttributes.getHeight(); }
+public SVGAnimatedString getResult()
+    { return _SVGFilterPrimitiveStandardAttributes.getResult(); }
 //end SVGFilterPrimitiveStandardAttributes
 
 //from SVGStylable (from SVGFilterPrimitiveStandardAttributes)
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+public SVGAnimatedString getClassName()
+    { return _SVGFilterPrimitiveStandardAttributes.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGFilterPrimitiveStandardAttributes.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGFilterPrimitiveStandardAttributes.getPresentationAttribute(name); }
 //end SVGStylable
 
 
 
+
 public native SVGAnimatedString getIn1( );
 
 public native SVGAnimatedNumber getStdDeviationX( );
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGFEImageElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGFEImageElementImpl.java
index 0ae130ffc..896e96228 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGFEImageElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGFEImageElementImpl.java
@@ -51,35 +51,63 @@ public class SVGFEImageElementImpl
                //SVGFilterPrimitiveStandardAttributes
        implements org.w3c.dom.svg.SVGFEImageElement
 {
+public SVGFEImageElementImpl()
+{
+    imbue(_SVGURIReference = new SVGURIReferenceImpl());
+    imbue(_SVGLangSpace = new SVGLangSpaceImpl());
+    imbue(_SVGExternalResourcesRequired = new SVGExternalResourcesRequiredImpl());
+    imbue(_SVGFilterPrimitiveStandardAttributes =
+             new SVGFilterPrimitiveStandardAttributesImpl());
+}
+
+
 //from SVGURIReference
-public native SVGAnimatedString getHref( );
+private SVGURIReferenceImpl _SVGURIReference;
+public SVGAnimatedString getHref()
+    { return _SVGURIReference.getHref(); }
 //end SVGURIReference
 
 //from SVGLangSpace
-public native String getXMLlang( );
-public native void setXMLlang( String xmllang )
-                       throws DOMException;
-public native String getXMLspace( );
-public native void setXMLspace( String xmlspace )
-                       throws DOMException;
+private SVGLangSpaceImpl _SVGLangSpace;
+public String getXMLlang()
+    { return _SVGLangSpace.getXMLlang(); }
+public void setXMLlang(String xmllang)
+                       throws DOMException
+    { _SVGLangSpace.setXMLlang(xmllang); }
+public String getXMLspace()
+    { return _SVGLangSpace.getXMLspace(); }
+public void setXMLspace(String xmlspace)
+                       throws DOMException
+    { _SVGLangSpace.setXMLspace(xmlspace); }
 //end SVGLangSpace
 
 //from SVGExternalResourcesRequired
-public native SVGAnimatedBoolean getExternalResourcesRequired( );
+private SVGExternalResourcesRequiredImpl _SVGExternalResourcesRequired;
+public SVGAnimatedBoolean getExternalResourcesRequired()
+    { return _SVGExternalResourcesRequired.getExternalResourcesRequired(); }
 //end SVGExternalResourcesRequired
 
 //from SVGFilterPrimitiveStandardAttributes
-public native SVGAnimatedLength getX( );
-public native SVGAnimatedLength getY( );
-public native SVGAnimatedLength getWidth( );
-public native SVGAnimatedLength getHeight( );
-public native SVGAnimatedString getResult( );
+SVGFilterPrimitiveStandardAttributesImpl _SVGFilterPrimitiveStandardAttributes;
+public SVGAnimatedLength getX()
+    { return _SVGFilterPrimitiveStandardAttributes.getX(); }
+public SVGAnimatedLength getY()
+    { return _SVGFilterPrimitiveStandardAttributes.getY(); }
+public SVGAnimatedLength getWidth()
+    { return _SVGFilterPrimitiveStandardAttributes.getWidth(); }
+public SVGAnimatedLength getHeight()
+    { return _SVGFilterPrimitiveStandardAttributes.getHeight(); }
+public SVGAnimatedString getResult()
+    { return _SVGFilterPrimitiveStandardAttributes.getResult(); }
 //end SVGFilterPrimitiveStandardAttributes
 
 //from SVGStylable (from SVGFilterPrimitiveStandardAttributes)
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+public SVGAnimatedString getClassName()
+    { return _SVGFilterPrimitiveStandardAttributes.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGFilterPrimitiveStandardAttributes.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGFilterPrimitiveStandardAttributes.getPresentationAttribute(name); }
 //end SVGStylable
 
 
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGFEMergeElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGFEMergeElementImpl.java
index ab9185a55..29e878b69 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGFEMergeElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGFEMergeElementImpl.java
@@ -41,18 +41,33 @@ public class SVGFEMergeElementImpl
                //SVGFilterPrimitiveStandardAttributes
        implements org.w3c.dom.svg.SVGFEMergeElement
 {
+public SVGFEMergeElementImpl()
+{
+    imbue(_SVGFilterPrimitiveStandardAttributes =
+             new SVGFilterPrimitiveStandardAttributesImpl());
+}
+
 //from SVGFilterPrimitiveStandardAttributes
-public native SVGAnimatedLength getX( );
-public native SVGAnimatedLength getY( );
-public native SVGAnimatedLength getWidth( );
-public native SVGAnimatedLength getHeight( );
-public native SVGAnimatedString getResult( );
+SVGFilterPrimitiveStandardAttributesImpl _SVGFilterPrimitiveStandardAttributes;
+public SVGAnimatedLength getX()
+    { return _SVGFilterPrimitiveStandardAttributes.getX(); }
+public SVGAnimatedLength getY()
+    { return _SVGFilterPrimitiveStandardAttributes.getY(); }
+public SVGAnimatedLength getWidth()
+    { return _SVGFilterPrimitiveStandardAttributes.getWidth(); }
+public SVGAnimatedLength getHeight()
+    { return _SVGFilterPrimitiveStandardAttributes.getHeight(); }
+public SVGAnimatedString getResult()
+    { return _SVGFilterPrimitiveStandardAttributes.getResult(); }
 //end SVGFilterPrimitiveStandardAttributes
 
 //from SVGStylable (from SVGFilterPrimitiveStandardAttributes)
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+public SVGAnimatedString getClassName()
+    { return _SVGFilterPrimitiveStandardAttributes.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGFilterPrimitiveStandardAttributes.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGFilterPrimitiveStandardAttributes.getPresentationAttribute(name); }
 //end SVGStylable
 
 
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGFEMorphologyElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGFEMorphologyElementImpl.java
index b6d397733..4952375d0 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGFEMorphologyElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGFEMorphologyElementImpl.java
@@ -40,23 +40,39 @@ public class SVGFEMorphologyElementImpl
                //SVGFilterPrimitiveStandardAttributes
        implements org.w3c.dom.svg.SVGFEMorphologyElement
 {
+public SVGFEMorphologyElementImpl()
+{
+    imbue(_SVGFilterPrimitiveStandardAttributes =
+             new SVGFilterPrimitiveStandardAttributesImpl());
+}
+
 //from SVGFilterPrimitiveStandardAttributes
-public native SVGAnimatedLength getX( );
-public native SVGAnimatedLength getY( );
-public native SVGAnimatedLength getWidth( );
-public native SVGAnimatedLength getHeight( );
-public native SVGAnimatedString getResult( );
+SVGFilterPrimitiveStandardAttributesImpl _SVGFilterPrimitiveStandardAttributes;
+public SVGAnimatedLength getX()
+    { return _SVGFilterPrimitiveStandardAttributes.getX(); }
+public SVGAnimatedLength getY()
+    { return _SVGFilterPrimitiveStandardAttributes.getY(); }
+public SVGAnimatedLength getWidth()
+    { return _SVGFilterPrimitiveStandardAttributes.getWidth(); }
+public SVGAnimatedLength getHeight()
+    { return _SVGFilterPrimitiveStandardAttributes.getHeight(); }
+public SVGAnimatedString getResult()
+    { return _SVGFilterPrimitiveStandardAttributes.getResult(); }
 //end SVGFilterPrimitiveStandardAttributes
 
 //from SVGStylable (from SVGFilterPrimitiveStandardAttributes)
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+public SVGAnimatedString getClassName()
+    { return _SVGFilterPrimitiveStandardAttributes.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGFilterPrimitiveStandardAttributes.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGFilterPrimitiveStandardAttributes.getPresentationAttribute(name); }
 //end SVGStylable
 
 
-public native SVGAnimatedString      getIn1( );
-public native SVGAnimatedEnumeration getOperator( );
-public native SVGAnimatedNumber      getRadiusX( );
-public native SVGAnimatedNumber      getRadiusY( );
+
+public native SVGAnimatedString      getIn1();
+public native SVGAnimatedEnumeration getOperator();
+public native SVGAnimatedNumber      getRadiusX();
+public native SVGAnimatedNumber      getRadiusY();
 }
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGFEOffsetElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGFEOffsetElementImpl.java
index f368c732b..86ca46c5b 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGFEOffsetElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGFEOffsetElementImpl.java
@@ -41,24 +41,39 @@ public class SVGFEOffsetElementImpl
                //SVGFilterPrimitiveStandardAttributes
        implements org.w3c.dom.svg.SVGFEOffsetElement
 {
+public SVGFEOffsetElementImpl()
+{
+    imbue(_SVGFilterPrimitiveStandardAttributes =
+             new SVGFilterPrimitiveStandardAttributesImpl());
+}
+
 //from SVGFilterPrimitiveStandardAttributes
-public native SVGAnimatedLength getX( );
-public native SVGAnimatedLength getY( );
-public native SVGAnimatedLength getWidth( );
-public native SVGAnimatedLength getHeight( );
-public native SVGAnimatedString getResult( );
+SVGFilterPrimitiveStandardAttributesImpl _SVGFilterPrimitiveStandardAttributes;
+public SVGAnimatedLength getX()
+    { return _SVGFilterPrimitiveStandardAttributes.getX(); }
+public SVGAnimatedLength getY()
+    { return _SVGFilterPrimitiveStandardAttributes.getY(); }
+public SVGAnimatedLength getWidth()
+    { return _SVGFilterPrimitiveStandardAttributes.getWidth(); }
+public SVGAnimatedLength getHeight()
+    { return _SVGFilterPrimitiveStandardAttributes.getHeight(); }
+public SVGAnimatedString getResult()
+    { return _SVGFilterPrimitiveStandardAttributes.getResult(); }
 //end SVGFilterPrimitiveStandardAttributes
 
 //from SVGStylable (from SVGFilterPrimitiveStandardAttributes)
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+public SVGAnimatedString getClassName()
+    { return _SVGFilterPrimitiveStandardAttributes.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGFilterPrimitiveStandardAttributes.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGFilterPrimitiveStandardAttributes.getPresentationAttribute(name); }
 //end SVGStylable
 
-public native SVGAnimatedString getIn1( );
+public native SVGAnimatedString getIn1();
 
-public native SVGAnimatedNumber getDx( );
+public native SVGAnimatedNumber getDx();
 
-public native SVGAnimatedNumber getDy( );
+public native SVGAnimatedNumber getDy();
 
 }
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGFESpecularLightingElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGFESpecularLightingElementImpl.java
index ff660695e..4d1091497 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGFESpecularLightingElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGFESpecularLightingElementImpl.java
@@ -40,18 +40,33 @@ public class SVGFESpecularLightingElementImpl
                //SVGFilterPrimitiveStandardAttributes
        implements org.w3c.dom.svg.SVGFESpecularLightingElement
 {
+public SVGFESpecularLightingElementImpl()
+{
+    imbue(_SVGFilterPrimitiveStandardAttributes =
+             new SVGFilterPrimitiveStandardAttributesImpl());
+}
+
 //from SVGFilterPrimitiveStandardAttributes
-public native SVGAnimatedLength getX( );
-public native SVGAnimatedLength getY( );
-public native SVGAnimatedLength getWidth( );
-public native SVGAnimatedLength getHeight( );
-public native SVGAnimatedString getResult( );
+SVGFilterPrimitiveStandardAttributesImpl _SVGFilterPrimitiveStandardAttributes;
+public SVGAnimatedLength getX()
+    { return _SVGFilterPrimitiveStandardAttributes.getX(); }
+public SVGAnimatedLength getY()
+    { return _SVGFilterPrimitiveStandardAttributes.getY(); }
+public SVGAnimatedLength getWidth()
+    { return _SVGFilterPrimitiveStandardAttributes.getWidth(); }
+public SVGAnimatedLength getHeight()
+    { return _SVGFilterPrimitiveStandardAttributes.getHeight(); }
+public SVGAnimatedString getResult()
+    { return _SVGFilterPrimitiveStandardAttributes.getResult(); }
 //end SVGFilterPrimitiveStandardAttributes
 
 //from SVGStylable (from SVGFilterPrimitiveStandardAttributes)
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+public SVGAnimatedString getClassName()
+    { return _SVGFilterPrimitiveStandardAttributes.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGFilterPrimitiveStandardAttributes.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGFilterPrimitiveStandardAttributes.getPresentationAttribute(name); }
 //end SVGStylable
 
 
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGFETileElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGFETileElementImpl.java
index fea42c589..768f1d7b0 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGFETileElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGFETileElementImpl.java
@@ -40,18 +40,33 @@ public class SVGFETileElementImpl
                //SVGFilterPrimitiveStandardAttributes
        implements org.w3c.dom.svg.SVGFETileElement
 {
+public SVGFETileElementImpl()
+{
+    imbue(_SVGFilterPrimitiveStandardAttributes =
+             new SVGFilterPrimitiveStandardAttributesImpl());
+}
+
 //from SVGFilterPrimitiveStandardAttributes
-public native SVGAnimatedLength getX( );
-public native SVGAnimatedLength getY( );
-public native SVGAnimatedLength getWidth( );
-public native SVGAnimatedLength getHeight( );
-public native SVGAnimatedString getResult( );
+SVGFilterPrimitiveStandardAttributesImpl _SVGFilterPrimitiveStandardAttributes;
+public SVGAnimatedLength getX()
+    { return _SVGFilterPrimitiveStandardAttributes.getX(); }
+public SVGAnimatedLength getY()
+    { return _SVGFilterPrimitiveStandardAttributes.getY(); }
+public SVGAnimatedLength getWidth()
+    { return _SVGFilterPrimitiveStandardAttributes.getWidth(); }
+public SVGAnimatedLength getHeight()
+    { return _SVGFilterPrimitiveStandardAttributes.getHeight(); }
+public SVGAnimatedString getResult()
+    { return _SVGFilterPrimitiveStandardAttributes.getResult(); }
 //end SVGFilterPrimitiveStandardAttributes
 
 //from SVGStylable (from SVGFilterPrimitiveStandardAttributes)
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+public SVGAnimatedString getClassName()
+    { return _SVGFilterPrimitiveStandardAttributes.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGFilterPrimitiveStandardAttributes.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGFilterPrimitiveStandardAttributes.getPresentationAttribute(name); }
 //end SVGStylable
 
 
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGFETurbulenceElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGFETurbulenceElementImpl.java
index bac59965a..15c206fe7 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGFETurbulenceElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGFETurbulenceElementImpl.java
@@ -40,20 +40,36 @@ public class SVGFETurbulenceElementImpl
                //SVGFilterPrimitiveStandardAttributes
        implements org.w3c.dom.svg.SVGFETurbulenceElement
 {
+public SVGFETurbulenceElementImpl()
+{
+    imbue(_SVGFilterPrimitiveStandardAttributes =
+             new SVGFilterPrimitiveStandardAttributesImpl());
+}
+
 //from SVGFilterPrimitiveStandardAttributes
-public native SVGAnimatedLength getX( );
-public native SVGAnimatedLength getY( );
-public native SVGAnimatedLength getWidth( );
-public native SVGAnimatedLength getHeight( );
-public native SVGAnimatedString getResult( );
+SVGFilterPrimitiveStandardAttributesImpl _SVGFilterPrimitiveStandardAttributes;
+public SVGAnimatedLength getX()
+    { return _SVGFilterPrimitiveStandardAttributes.getX(); }
+public SVGAnimatedLength getY()
+    { return _SVGFilterPrimitiveStandardAttributes.getY(); }
+public SVGAnimatedLength getWidth()
+    { return _SVGFilterPrimitiveStandardAttributes.getWidth(); }
+public SVGAnimatedLength getHeight()
+    { return _SVGFilterPrimitiveStandardAttributes.getHeight(); }
+public SVGAnimatedString getResult()
+    { return _SVGFilterPrimitiveStandardAttributes.getResult(); }
 //end SVGFilterPrimitiveStandardAttributes
 
 //from SVGStylable (from SVGFilterPrimitiveStandardAttributes)
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+public SVGAnimatedString getClassName()
+    { return _SVGFilterPrimitiveStandardAttributes.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGFilterPrimitiveStandardAttributes.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGFilterPrimitiveStandardAttributes.getPresentationAttribute(name); }
 //end SVGStylable
 
+
 public native SVGAnimatedNumber      getBaseFrequencyX( );
 
 public native SVGAnimatedNumber      getBaseFrequencyY( );
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGFilterElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGFilterElementImpl.java
index 2604d8f03..d5b36e81e 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGFilterElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGFilterElementImpl.java
@@ -48,29 +48,52 @@ public class SVGFilterElementImpl
                //SVGUnitTypes
        implements org.w3c.dom.svg.SVGFilterElement
 {
+public SVGFilterElementImpl()
+{
+    imbue(_SVGURIReference = new SVGURIReferenceImpl());
+    imbue(_SVGLangSpace = new SVGLangSpaceImpl());
+    imbue(_SVGExternalResourcesRequired = new SVGExternalResourcesRequiredImpl());
+    imbue(_SVGStylable = new SVGStylableImpl());
+}
+
+
 //from SVGURIReference
-public native SVGAnimatedString getHref( );
+private SVGURIReferenceImpl _SVGURIReference;
+public SVGAnimatedString getHref()
+    { return _SVGURIReference.getHref(); }
 //end SVGURIReference
 
 //from SVGLangSpace
-public native String getXMLlang( );
-public native void setXMLlang( String xmllang )
-                       throws DOMException;
-public native String getXMLspace( );
-public native void setXMLspace( String xmlspace )
-                       throws DOMException;
+private SVGLangSpaceImpl _SVGLangSpace;
+public String getXMLlang()
+    { return _SVGLangSpace.getXMLlang(); }
+public void setXMLlang(String xmllang)
+                       throws DOMException
+    { _SVGLangSpace.setXMLlang(xmllang); }
+public String getXMLspace()
+    { return _SVGLangSpace.getXMLspace(); }
+public void setXMLspace(String xmlspace)
+                       throws DOMException
+    { _SVGLangSpace.setXMLspace(xmlspace); }
 //end SVGLangSpace
 
 //from SVGExternalResourcesRequired
-public native SVGAnimatedBoolean getExternalResourcesRequired( );
+private SVGExternalResourcesRequiredImpl _SVGExternalResourcesRequired;
+public SVGAnimatedBoolean getExternalResourcesRequired()
+    { return _SVGExternalResourcesRequired.getExternalResourcesRequired(); }
 //end SVGExternalResourcesRequired
 
 //from SVGStylable
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+private SVGStylableImpl _SVGStylable;
+public SVGAnimatedString getClassName()
+    { return _SVGStylable.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGStylable.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGStylable.getPresentationAttribute(name); }
 //end SVGStylable
 
+
 public native SVGAnimatedEnumeration getFilterUnits( );
 public native SVGAnimatedEnumeration getPrimitiveUnits( );
 public native SVGAnimatedLength getX( );
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGFontElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGFontElementImpl.java
index 98522a98a..40e55e27c 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGFontElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGFontElementImpl.java
@@ -43,14 +43,26 @@ public class SVGFontElementImpl
                //SVGStylable
        implements org.w3c.dom.svg.SVGFontElement
 {
+public SVGFontElementImpl()
+{
+    imbue(_SVGExternalResourcesRequired = new SVGExternalResourcesRequiredImpl());
+    imbue(_SVGStylable = new SVGStylableImpl());
+}
+
 //from SVGExternalResourcesRequired
-public native SVGAnimatedBoolean getExternalResourcesRequired( );
+private SVGExternalResourcesRequiredImpl _SVGExternalResourcesRequired;
+public SVGAnimatedBoolean getExternalResourcesRequired()
+    { return _SVGExternalResourcesRequired.getExternalResourcesRequired(); }
 //end SVGExternalResourcesRequired
 
 //from SVGStylable
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+private SVGStylableImpl _SVGStylable;
+public SVGAnimatedString getClassName()
+    { return _SVGStylable.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGStylable.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGStylable.getPresentationAttribute(name); }
 //end SVGStylable
 
 
diff --git a/src/bind/java/org/inkscape/dom/svg/SVGForeignObjectElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGForeignObjectElementImpl.java
index ed7e5dd73..63df6409b 100644
--- a/src/bind/java/org/inkscape/dom/svg/SVGForeignObjectElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/svg/SVGForeignObjectElementImpl.java
@@ -53,72 +53,115 @@ public class SVGForeignObjectElementImpl
                //EventTarget
        implements org.w3c.dom.svg.SVGForeignObjectElement
 {
+public SVGForeignObjectElementImpl()
+{
+    imbue(_SVGTests = new SVGTestsImpl());
+    imbue(_SVGLangSpace = new SVGLangSpaceImpl());
+    imbue(_SVGExternalResourcesRequired = new SVGExternalResourcesRequiredImpl());
+    imbue(_SVGStylable = new SVGStylableImpl());
+    imbue(_SVGTransformable = new SVGTransformableImpl());
+    imbue(_EventTarget = new org.inkscape.dom.events.EventTargetImpl());
+}
+
+
 //from SVGTests
-public native SVGStringList getRequiredFeatures( );
-public native SVGStringList getRequiredExtensions( );
-public native SVGStringList getSystemLanguage( );
-public native boolean hasExtension ( String extension );
+private SVGTestsImpl _SVGTests;
+public SVGStringList getRequiredFeatures()
+   { return _SVGTests.getRequiredFeatures(); }
+public SVGStringList getRequiredExtensions()
+   { return _SVGTests.getRequiredExtensions(); }
+public SVGStringList getSystemLanguage()
+   { return _SVGTests.getSystemLanguage(); }
+public boolean hasExtension (String extension)
+   { return _SVGTests.hasExtension(extension); }
 //end SVGTests
 
 //from SVGLangSpace
-public native String getXMLlang( );
-public native void setXMLlang( String xmllang )
-                       throws DOMException;
-public native String getXMLspace( );
-public native void setXMLspace( String xmlspace )
-                       throws DOMException;
+private SVGLangSpaceImpl _SVGLangSpace;
+public String getXMLlang()
+    { return _SVGLangSpace.getXMLlang(); }
+public void setXMLlang(String xmllang)
+                       throws DOMException
+    { _SVGLangSpace.setXMLlang(xmllang); }
+public String getXMLspace()
+    { return _SVGLangSpace.getXMLspace(); }
+public void setXMLspace(String xmlspace)
+                       throws DOMException
+    { _SVGLangSpace.setXMLspace(xmlspace); }
 //end SVGLangSpace
 
 //from SVGExternalResourcesRequired
-public native SVGAnimatedBoolean getExternalResourcesRequired( );
+private SVGExternalResourcesRequiredImpl _SVGExternalResourcesRequired;
+public SVGAnimatedBoolean getExternalResourcesRequired()
+    { return _SVGExternalResourcesRequired.getExternalResourcesRequired(); }
 //end SVGExternalResourcesRequired
 
 //from SVGStylable
-public native SVGAnimatedString getClassName( );
-public native CSSStyleDeclaration getStyle( );
-public native CSSValue getPresentationAttribute ( String name );
+private SVGStylableImpl _SVGStylable;
+public SVGAnimatedString getClassName()
+    { return _SVGStylable.getClassName(); }
+public CSSStyleDeclaration getStyle()
+    { return _SVGStylable.getStyle(); }
+public CSSValue getPresentationAttribute(String name)
+    { return _SVGStylable.getPresentationAttribute(name); }
 //end SVGStylable
 
 //from SVGTransformable
-public native SVGAnimatedTransformList getTransform( );
+private SVGTransformableImpl _SVGTransformable;
+public SVGAnimatedTransformList getTransform()
+    { return _SVGTransformable.getTransform(); }
 //end SVGTransformable
 
 //from SVGLocatable (from SVGTransformable)
-public native SVGElement getNearestViewportElement( );
-public native SVGElement getFarthestViewportElement( );
-
-public native SVGRect   getBBox (  );
-public native SVGMatrix getCTM (  );
-public native SVGMatrix getScreenCTM (  );
-public native SVGMatrix getTransformToElement ( SVGElement element )
-                  throws SVGException;
+public SVGElement getNearestViewportElement()
+    { return _SVGTransformable.getNearestViewportElement(); }
+public SVGElement getFarthestViewportElement()
+    { return _SVGTransformable.getFarthestViewportElement(); }
+public SVGRect getBBox()
+    { return _SVGTransformable.getBBox(); }
+public SVGMatrix getCTM()
+    { return _SVGTransformable.getCTM(); }
+public SVGMatrix getScreenCTM()
+    { return _SVGTransformable.getScreenCTM(); }
+public SVGMatrix getTransformToElement (SVGElement element)
+                  throws SVGException
+    { return _SVGTransformable.getTransformToElement(element); }
 //end SVGLocatable
 
 //from EventTarget
-public native void addEventListener(String type,
+private org.inkscape.dom.events.EventTargetImpl _EventTarget;
+public void addEventListener(String type,
                              EventListener listener,
-                             boolean useCapture);
-public native void removeEventListener(String type,
+                             boolean useCapture)
+    { _EventTarget.addEventListener(type, listener, useCapture); }
+public void removeEventListener(String type,
                                 EventListener listener,
-                                boolean useCapture);
-public native boolean dispatchEvent(Event evt)
-                             throws EventException;
-public native void addEventListenerNS(String namespaceURI,
+                                boolean useCapture)
+    { _EventTarget.removeEventListener(type, listener, useCapture); }
+public boolean dispatchEvent(Event evt)
+                             throws EventException
+    { return _EventTarget.dispatchEvent(evt); }
+public void addEventListenerNS(String namespaceURI,
                                String type,
                                EventListener listener,
                                boolean useCapture,
-                               Object evtGroup);
-public native void removeEventListenerNS(String namespaceURI,
+                               Object evtGroup)
+    { _EventTarget.addEventListenerNS(namespaceURI, type, listener, useCapture, evtGroup); }
+public void removeEventListenerNS(String namespaceURI,
                                   String type,
                                   EventListener listener,
-                                  boolean useCapture);
-public native boolean willTriggerNS(String namespaceURI,
-                             String type);
-public native boolean hasEventListenerNS(String namespaceURI,
-                                  String type);
+                                  boolean useCapture)
+    { _EventTarget.removeEventListenerNS(namespaceURI, type, listener, useCapture); }
+public boolean willTriggerNS(String namespaceURI,
+                             String type)
+    { return _EventTarget.willTriggerNS(namespaceURI, type); }
+public boolean hasEventListenerNS(String namespaceURI,
+                                  String type)
+    { return _EventTarget.hasEventListenerNS(namespaceURI, type); }
 //end EventTarget
 
 
+
 public native SVGAnimatedLength getX( );
 public native SVGAnimatedLength getY( );
 public native SVGAnimatedLength getWidth( );