Delegate MI methods to impl classes

(bzr r5155)

12 files changed, 304 insertions, 287 deletions

diff --git a/src/bind/java/org/inkscape/dom/smil/ElementLayoutImpl.java b/src/bind/java/org/inkscape/dom/smil/ElementLayoutImpl.java
index 0b4b42df7..2dfeacbe7 100644
--- a/src/bind/java/org/inkscape/dom/smil/ElementLayoutImpl.java
+++ b/src/bind/java/org/inkscape/dom/smil/ElementLayoutImpl.java
@@ -32,24 +32,19 @@ import org.w3c.dom.DOMException;
 
 
 public class ElementLayoutImpl
+       extends
+             org.inkscape.cmn.BaseInterface
        implements org.w3c.dom.smil.ElementLayout
 {
 
 public native String getTitle();
-public native void setTitle(String title)
-                                  throws DOMException;
-
+public native void setTitle(String title) throws DOMException;
 public native String getBackgroundColor();
-public native void setBackgroundColor(String backgroundColor)
-                                  throws DOMException;
-
+public native void setBackgroundColor(String backgroundColor) throws DOMException;
 public native int getHeight();
-public native void setHeight(int height)
-                                  throws DOMException;
-
+public native void setHeight(int height) throws DOMException;
 public native int getWidth();
-public native void setWidth(int width)
-                                  throws DOMException;
+public native void setWidth(int width) throws DOMException;
 
 }
 
diff --git a/src/bind/java/org/inkscape/dom/smil/ElementTargetAttributesImpl.java b/src/bind/java/org/inkscape/dom/smil/ElementTargetAttributesImpl.java
index dde7e8067..e406a67e9 100644
--- a/src/bind/java/org/inkscape/dom/smil/ElementTargetAttributesImpl.java
+++ b/src/bind/java/org/inkscape/dom/smil/ElementTargetAttributesImpl.java
@@ -30,6 +30,8 @@ package org.inkscape.dom.smil;
 
 
 public class ElementTargetAttributesImpl
+       extends
+             org.inkscape.cmn.BaseInterface
        implements org.w3c.dom.smil.ElementTargetAttributes
 {
 
diff --git a/src/bind/java/org/inkscape/dom/smil/ElementTimeContainerImpl.java b/src/bind/java/org/inkscape/dom/smil/ElementTimeContainerImpl.java
index 20aa07804..2f4fc4cb2 100644
--- a/src/bind/java/org/inkscape/dom/smil/ElementTimeContainerImpl.java
+++ b/src/bind/java/org/inkscape/dom/smil/ElementTimeContainerImpl.java
@@ -37,8 +37,6 @@ public class ElementTimeContainerImpl
 {
 
 public native NodeList getTimeChildren();
-
-
 public native NodeList getActiveChildrenAt(float instant);
 
 }
diff --git a/src/bind/java/org/inkscape/dom/smil/ElementTimeControlImpl.java b/src/bind/java/org/inkscape/dom/smil/ElementTimeControlImpl.java
index 4f7579978..0fe1a6902 100644
--- a/src/bind/java/org/inkscape/dom/smil/ElementTimeControlImpl.java
+++ b/src/bind/java/org/inkscape/dom/smil/ElementTimeControlImpl.java
@@ -32,6 +32,8 @@ import org.w3c.dom.DOMException;
 
 
 public class ElementTimeControlImpl
+       extends
+             org.inkscape.cmn.BaseInterface
        implements org.w3c.dom.smil.ElementTimeControl
 {
 public native boolean beginElement()
diff --git a/src/bind/java/org/inkscape/dom/smil/ElementTimeImpl.java b/src/bind/java/org/inkscape/dom/smil/ElementTimeImpl.java
index af2d5aff3..fd1567033 100644
--- a/src/bind/java/org/inkscape/dom/smil/ElementTimeImpl.java
+++ b/src/bind/java/org/inkscape/dom/smil/ElementTimeImpl.java
@@ -35,6 +35,8 @@ import org.w3c.dom.smil.TimeList;
 
 
 public class ElementTimeImpl
+       extends
+             org.inkscape.cmn.BaseInterface
        implements org.w3c.dom.smil.ElementTime
 {
 
diff --git a/src/bind/java/org/inkscape/dom/smil/SMILAnimationImpl.java b/src/bind/java/org/inkscape/dom/smil/SMILAnimationImpl.java
index b888d0fc7..46c8feeb3 100644
--- a/src/bind/java/org/inkscape/dom/smil/SMILAnimationImpl.java
+++ b/src/bind/java/org/inkscape/dom/smil/SMILAnimationImpl.java
@@ -40,77 +40,75 @@ public class SMILAnimationImpl
                //ElementTimeControl
        implements org.w3c.dom.smil.SMILAnimation
 {
-//from ElementTargetAttributes
-public native String getAttributeName();
-public native void setAttributeName(String attributeName);
 
+public SMILAnimationImpl()
+{
+    imbue(_ElementTargetAttributes = new ElementTargetAttributesImpl());
+    imbue(_ElementTime = new ElementTimeImpl());
+    imbue(_ElementTimeControl = new ElementTimeControlImpl());
+}
 
-public native short getAttributeType();
-public native void setAttributeType(short attributeType);
+//from ElementTargetAttributes
+ElementTargetAttributesImpl _ElementTargetAttributes;
+public String getAttributeName()
+    { return _ElementTargetAttributes.getAttributeName(); }
+public void setAttributeName(String attributeName)
+    { _ElementTargetAttributes.setAttributeName(attributeName); }
+public short getAttributeType()
+    { return _ElementTargetAttributes.getAttributeType(); }
+public void setAttributeType(short attributeType)
+    { _ElementTargetAttributes.setAttributeType(attributeType); }
 //end ElementTargetAttributes
 
 //from ElementTime
-public native TimeList getBegin();
-public native void setBegin(TimeList begin)
-                 throws DOMException;
-
-
-public native TimeList getEnd();
-public native void setEnd(TimeList end)
-                 throws DOMException;
-
-
-public native float getDur();
-public native void setDur(float dur)
-                 throws DOMException;
-
-
-
-public native short getRestart();
-public native void setRestart(short restart)
-                 throws DOMException;
-
-
-
-public native short getFill();
-public native void setFill(short fill)
-                 throws DOMException;
-
-
-public native float getRepeatCount();
-public native void setRepeatCount(float repeatCount)
-                 throws DOMException;
-
-
-public native float getRepeatDur();
-public native void setRepeatDur(float repeatDur)
-                 throws DOMException;
-
-
-public native boolean beginElement();
-
-
-public native boolean endElement();
-
-
-public native void pauseElement();
-
-
-public native void resumeElement();
-
-
-public native void seekElement(float seekTo);
+ElementTimeImpl _ElementTime;
+public TimeList getBegin()
+    { return _ElementTime.getBegin(); }
+public void setBegin(TimeList begin) throws DOMException
+    { _ElementTime.setBegin(begin); }
+public TimeList getEnd()
+    { return _ElementTime.getEnd(); }
+public void setEnd(TimeList end) throws DOMException
+    { _ElementTime.setEnd(end); }
+public float getDur()
+    { return _ElementTime.getDur(); }
+public void setDur(float dur) throws DOMException
+    { _ElementTime.setDur(dur); }
+public short getRestart()
+    { return _ElementTime.getRestart(); }
+public void setRestart(short restart) throws DOMException
+    { _ElementTime.setRestart(restart); }
+public short getFill()
+    { return _ElementTime.getFill(); }
+public void setFill(short fill) throws DOMException
+    { _ElementTime.setFill(fill); }
+public float getRepeatCount()
+    { return _ElementTime.getRepeatCount(); }
+public void setRepeatCount(float repeatCount) throws DOMException
+    { _ElementTime.setRepeatCount(repeatCount); }
+public float getRepeatDur()
+    { return _ElementTime.getRepeatDur(); }
+public void setRepeatDur(float repeatDur) throws DOMException
+    { _ElementTime.setRepeatDur(repeatDur); }
+public boolean beginElement()
+    { return _ElementTime.beginElement(); }
+public boolean endElement()
+    { return _ElementTime.endElement(); }
+public void pauseElement()
+    { _ElementTime.pauseElement(); }
+public void resumeElement()
+    { _ElementTime.resumeElement(); }
+public void seekElement(float seekTo)
+    { _ElementTime.seekElement(seekTo); }
 //end ElementTime
 
 
 //from ElementTimeControl
-public native boolean beginElementAt(float offset)
-                                  throws DOMException;
-
-
-public native boolean endElementAt(float offset)
-                                throws DOMException;
-
+ElementTimeControlImpl _ElementTimeControl;
+public boolean beginElementAt(float offset) throws DOMException
+    { return _ElementTimeControl.beginElementAt(offset); }
+public boolean endElementAt(float offset) throws DOMException
+    { return _ElementTimeControl.endElementAt(offset); }
 //end ElementTimeControl
 
 
diff --git a/src/bind/java/org/inkscape/dom/smil/SMILDocumentImpl.java b/src/bind/java/org/inkscape/dom/smil/SMILDocumentImpl.java
index 8ff21db44..15104bf47 100644
--- a/src/bind/java/org/inkscape/dom/smil/SMILDocumentImpl.java
+++ b/src/bind/java/org/inkscape/dom/smil/SMILDocumentImpl.java
@@ -40,64 +40,64 @@ public class SMILDocumentImpl
                  //ElementTimeContainer
        implements org.w3c.dom.smil.SMILDocument
 {
-//from ElementTime
-public native TimeList getBegin();
-public native void setBegin(TimeList begin)
-                 throws DOMException;
-
-
-public native TimeList getEnd();
-public native void setEnd(TimeList end)
-                 throws DOMException;
-
-
-public native float getDur();
-public native void setDur(float dur)
-                 throws DOMException;
-
-
-
-public native short getRestart();
-public native void setRestart(short restart)
-                 throws DOMException;
-
-
-
-public native short getFill();
-public native void setFill(short fill)
-                 throws DOMException;
-
-
-public native float getRepeatCount();
-public native void setRepeatCount(float repeatCount)
-                 throws DOMException;
-
-
-public native float getRepeatDur();
-public native void setRepeatDur(float repeatDur)
-                 throws DOMException;
-
-
-public native boolean beginElement();
-
-
-public native boolean endElement();
-
-
-public native void pauseElement();
+public SMILDocumentImpl()
+{
+    imbue(_ElementTimeContainer = new ElementTimeContainerImpl());
+    _ElementTime = (ElementTimeImpl)_ElementTimeContainer;
+}
 
 
-public native void resumeElement();
 
+//from ElementTimeContainer
+ElementTimeContainerImpl _ElementTimeContainer;
+public NodeList getTimeChildren()
+    { return _ElementTimeContainer.getTimeChildren(); }
+public NodeList getActiveChildrenAt(float instant)
+    { return _ElementTimeContainer.getActiveChildrenAt(instant); }
+//end ElementTimeContainer
 
-public native void seekElement(float seekTo);
+//from ElementTime
+ElementTimeImpl _ElementTime;
+public TimeList getBegin()
+    { return _ElementTime.getBegin(); }
+public void setBegin(TimeList begin) throws DOMException
+    { _ElementTime.setBegin(begin); }
+public TimeList getEnd()
+    { return _ElementTime.getEnd(); }
+public void setEnd(TimeList end) throws DOMException
+    { _ElementTime.setEnd(end); }
+public float getDur()
+    { return _ElementTime.getDur(); }
+public void setDur(float dur) throws DOMException
+    { _ElementTime.setDur(dur); }
+public short getRestart()
+    { return _ElementTime.getRestart(); }
+public void setRestart(short restart) throws DOMException
+    { _ElementTime.setRestart(restart); }
+public short getFill()
+    { return _ElementTime.getFill(); }
+public void setFill(short fill) throws DOMException
+    { _ElementTime.setFill(fill); }
+public float getRepeatCount()
+    { return _ElementTime.getRepeatCount(); }
+public void setRepeatCount(float repeatCount) throws DOMException
+    { _ElementTime.setRepeatCount(repeatCount); }
+public float getRepeatDur()
+    { return _ElementTime.getRepeatDur(); }
+public void setRepeatDur(float repeatDur) throws DOMException
+    { _ElementTime.setRepeatDur(repeatDur); }
+public boolean beginElement()
+    { return _ElementTime.beginElement(); }
+public boolean endElement()
+    { return _ElementTime.endElement(); }
+public void pauseElement()
+    { _ElementTime.pauseElement(); }
+public void resumeElement()
+    { _ElementTime.resumeElement(); }
+public void seekElement(float seekTo)
+    { _ElementTime.seekElement(seekTo); }
 //end ElementTime
 
-//from ElementTimeContainer
-public native NodeList getTimeChildren();
-
-public native NodeList getActiveChildrenAt(float instant);
-//end ElementTimeContainer
 
 }
 
diff --git a/src/bind/java/org/inkscape/dom/smil/SMILMediaElementImpl.java b/src/bind/java/org/inkscape/dom/smil/SMILMediaElementImpl.java
index f0293db2c..67e8b032a 100644
--- a/src/bind/java/org/inkscape/dom/smil/SMILMediaElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/smil/SMILMediaElementImpl.java
@@ -35,60 +35,55 @@ import org.w3c.dom.smil.TimeList;
 
 
 public class SMILMediaElementImpl
-       extends SMILElementImpl //ElementTime
+       extends SMILElementImpl
+             //ElementTime
        implements org.w3c.dom.smil.SMILMediaElement
 {
-//from ElementTime
-public native TimeList getBegin();
-public native void setBegin(TimeList begin)
-                 throws DOMException;
-
-
-public native TimeList getEnd();
-public native void setEnd(TimeList end)
-                 throws DOMException;
-
-
-public native float getDur();
-public native void setDur(float dur)
-                 throws DOMException;
-
-
-
-public native short getRestart();
-public native void setRestart(short restart)
-                 throws DOMException;
-
-
-
-public native short getFill();
-public native void setFill(short fill)
-                 throws DOMException;
-
-
-public native float getRepeatCount();
-public native void setRepeatCount(float repeatCount)
-                 throws DOMException;
-
-
-public native float getRepeatDur();
-public native void setRepeatDur(float repeatDur)
-                 throws DOMException;
-
-
-public native boolean beginElement();
-
-
-public native boolean endElement();
-
-
-public native void pauseElement();
-
-
-public native void resumeElement();
-
+public SMILMediaElementImpl()
+{
+    imbue(_ElementTime = new ElementTimeImpl());
+}
 
-public native void seekElement(float seekTo);
+//from ElementTime
+ElementTimeImpl _ElementTime;
+public TimeList getBegin()
+    { return _ElementTime.getBegin(); }
+public void setBegin(TimeList begin) throws DOMException
+    { _ElementTime.setBegin(begin); }
+public TimeList getEnd()
+    { return _ElementTime.getEnd(); }
+public void setEnd(TimeList end) throws DOMException
+    { _ElementTime.setEnd(end); }
+public float getDur()
+    { return _ElementTime.getDur(); }
+public void setDur(float dur) throws DOMException
+    { _ElementTime.setDur(dur); }
+public short getRestart()
+    { return _ElementTime.getRestart(); }
+public void setRestart(short restart) throws DOMException
+    { _ElementTime.setRestart(restart); }
+public short getFill()
+    { return _ElementTime.getFill(); }
+public void setFill(short fill) throws DOMException
+    { _ElementTime.setFill(fill); }
+public float getRepeatCount()
+    { return _ElementTime.getRepeatCount(); }
+public void setRepeatCount(float repeatCount) throws DOMException
+    { _ElementTime.setRepeatCount(repeatCount); }
+public float getRepeatDur()
+    { return _ElementTime.getRepeatDur(); }
+public void setRepeatDur(float repeatDur) throws DOMException
+    { _ElementTime.setRepeatDur(repeatDur); }
+public boolean beginElement()
+    { return _ElementTime.beginElement(); }
+public boolean endElement()
+    { return _ElementTime.endElement(); }
+public void pauseElement()
+    { _ElementTime.pauseElement(); }
+public void resumeElement()
+    { _ElementTime.resumeElement(); }
+public void seekElement(float seekTo)
+    { _ElementTime.seekElement(seekTo); }
 //end ElementTime
 
 
diff --git a/src/bind/java/org/inkscape/dom/smil/SMILRegionElementImpl.java b/src/bind/java/org/inkscape/dom/smil/SMILRegionElementImpl.java
index 1e0def6cd..d85cf3d0f 100644
--- a/src/bind/java/org/inkscape/dom/smil/SMILRegionElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/smil/SMILRegionElementImpl.java
@@ -32,26 +32,34 @@ import org.w3c.dom.DOMException;
 
 
 public class SMILRegionElementImpl
-       extends SMILElementImpl  //, ElementLayout
+       extends SMILElementImpl
+             //ElementLayout
        implements org.w3c.dom.smil.SMILRegionElement
 {
 
-//from ElementLayout
-public native String getTitle();
-public native void setTitle(String title)
-                                  throws DOMException;
-
-public native String getBackgroundColor();
-public native void setBackgroundColor(String backgroundColor)
-                                  throws DOMException;
-
-public native int getHeight();
-public native void setHeight(int height)
-                                  throws DOMException;
+public SMILRegionElementImpl()
+{
+    imbue(_ElementLayout = new ElementLayoutImpl());
+}
 
-public native int getWidth();
-public native void setWidth(int width)
-                                  throws DOMException;
+//from ElementLayout
+ElementLayoutImpl _ElementLayout;
+public String getTitle()
+    { return _ElementLayout.getTitle(); }
+public void setTitle(String title) throws DOMException
+    { _ElementLayout.setTitle(title); }
+public String getBackgroundColor()
+    { return _ElementLayout.getBackgroundColor(); }
+public void setBackgroundColor(String backgroundColor) throws DOMException
+    { _ElementLayout.setBackgroundColor(backgroundColor); }
+public int getHeight()
+    { return _ElementLayout.getHeight(); }
+public void setHeight(int height) throws DOMException
+    { _ElementLayout.setHeight(height); }
+public int getWidth()
+    { return _ElementLayout.getWidth(); }
+public void setWidth(int width) throws DOMException
+    { _ElementLayout.setWidth(width); }
 //end ElementLayout
 
 
diff --git a/src/bind/java/org/inkscape/dom/smil/SMILRootLayoutElementImpl.java b/src/bind/java/org/inkscape/dom/smil/SMILRootLayoutElementImpl.java
index 5e43bcf2d..01def0622 100644
--- a/src/bind/java/org/inkscape/dom/smil/SMILRootLayoutElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/smil/SMILRootLayoutElementImpl.java
@@ -33,25 +33,34 @@ import org.w3c.dom.DOMException;
 
 
 public class SMILRootLayoutElementImpl
-       extends SMILElementImpl  //, ElementLayout
+       extends SMILElementImpl
+             //, ElementLayout
        implements org.w3c.dom.smil.SMILRootLayoutElement
 {
-//from ElementLayout
-public native String getTitle();
-public native void setTitle(String title)
-                                  throws DOMException;
-
-public native String getBackgroundColor();
-public native void setBackgroundColor(String backgroundColor)
-                                  throws DOMException;
 
-public native int getHeight();
-public native void setHeight(int height)
-                                  throws DOMException;
+public SMILRootLayoutElementImpl()
+{
+    imbue(_ElementLayout = new ElementLayoutImpl());
+}
 
-public native int getWidth();
-public native void setWidth(int width)
-                                  throws DOMException;
+//from ElementLayout
+ElementLayoutImpl _ElementLayout;
+public String getTitle()
+    { return _ElementLayout.getTitle(); }
+public void setTitle(String title) throws DOMException
+    { _ElementLayout.setTitle(title); }
+public String getBackgroundColor()
+    { return _ElementLayout.getBackgroundColor(); }
+public void setBackgroundColor(String backgroundColor) throws DOMException
+    { _ElementLayout.setBackgroundColor(backgroundColor); }
+public int getHeight()
+    { return _ElementLayout.getHeight(); }
+public void setHeight(int height) throws DOMException
+    { _ElementLayout.setHeight(height); }
+public int getWidth()
+    { return _ElementLayout.getWidth(); }
+public void setWidth(int width) throws DOMException
+    { _ElementLayout.setWidth(width); }
 //end ElementLayout
 
 }
diff --git a/src/bind/java/org/inkscape/dom/smil/SMILSetElementImpl.java b/src/bind/java/org/inkscape/dom/smil/SMILSetElementImpl.java
index 6465efb7d..fce213000 100644
--- a/src/bind/java/org/inkscape/dom/smil/SMILSetElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/smil/SMILSetElementImpl.java
@@ -41,79 +41,78 @@ public class SMILSetElementImpl
                //ElementTargetAttributes
        implements org.w3c.dom.smil.SMILSetElement
 {
-//from ElementTimeControl
-public native boolean beginElement()
-                                throws DOMException;
-
-public native boolean beginElementAt(float offset)
-                                  throws DOMException;
-
-public native boolean endElement()
-                              throws DOMException;
 
+public SMILSetElementImpl()
+{
+    imbue(_ElementTimeControl = new ElementTimeControlImpl());
+    imbue(_ElementTime = new ElementTimeImpl());
+    imbue(_ElementTargetAttributes = new ElementTargetAttributesImpl());
+}
 
-public native boolean endElementAt(float offset)
-                                throws DOMException;
 
+//from ElementTimeControl
+ElementTimeControlImpl _ElementTimeControl;
+public boolean beginElementAt(float offset) throws DOMException
+    { return _ElementTimeControl.beginElementAt(offset); }
+public boolean endElementAt(float offset) throws DOMException
+    { return _ElementTimeControl.endElementAt(offset); }
 //end ElementTimeControl
 
-
 //from ElementTime
-public native TimeList getBegin();
-public native void setBegin(TimeList begin)
-                 throws DOMException;
-
-
-public native TimeList getEnd();
-public native void setEnd(TimeList end)
-                 throws DOMException;
-
-
-public native float getDur();
-public native void setDur(float dur)
-                 throws DOMException;
-
-
-
-public native short getRestart();
-public native void setRestart(short restart)
-                 throws DOMException;
-
-
-
-public native short getFill();
-public native void setFill(short fill)
-                 throws DOMException;
-
-
-public native float getRepeatCount();
-public native void setRepeatCount(float repeatCount)
-                 throws DOMException;
-
-
-public native float getRepeatDur();
-public native void setRepeatDur(float repeatDur)
-                 throws DOMException;
-
-
-public native void pauseElement();
-
-
-public native void resumeElement();
-
-
-public native void seekElement(float seekTo);
+ElementTimeImpl _ElementTime;
+public TimeList getBegin()
+    { return _ElementTime.getBegin(); }
+public void setBegin(TimeList begin) throws DOMException
+    { _ElementTime.setBegin(begin); }
+public TimeList getEnd()
+    { return _ElementTime.getEnd(); }
+public void setEnd(TimeList end) throws DOMException
+    { _ElementTime.setEnd(end); }
+public float getDur()
+    { return _ElementTime.getDur(); }
+public void setDur(float dur) throws DOMException
+    { _ElementTime.setDur(dur); }
+public short getRestart()
+    { return _ElementTime.getRestart(); }
+public void setRestart(short restart) throws DOMException
+    { _ElementTime.setRestart(restart); }
+public short getFill()
+    { return _ElementTime.getFill(); }
+public void setFill(short fill) throws DOMException
+    { _ElementTime.setFill(fill); }
+public float getRepeatCount()
+    { return _ElementTime.getRepeatCount(); }
+public void setRepeatCount(float repeatCount) throws DOMException
+    { _ElementTime.setRepeatCount(repeatCount); }
+public float getRepeatDur()
+    { return _ElementTime.getRepeatDur(); }
+public void setRepeatDur(float repeatDur) throws DOMException
+    { _ElementTime.setRepeatDur(repeatDur); }
+public boolean beginElement()
+    { return _ElementTime.beginElement(); }
+public boolean endElement()
+    { return _ElementTime.endElement(); }
+public void pauseElement()
+    { _ElementTime.pauseElement(); }
+public void resumeElement()
+    { _ElementTime.resumeElement(); }
+public void seekElement(float seekTo)
+    { _ElementTime.seekElement(seekTo); }
 //end ElementTime
 
-
 //from ElementTargetAttributes
-public native String getAttributeName();
-public native void setAttributeName(String attributeName);
+ElementTargetAttributesImpl _ElementTargetAttributes;
+public String getAttributeName()
+    { return _ElementTargetAttributes.getAttributeName(); }
+public void setAttributeName(String attributeName)
+    { _ElementTargetAttributes.setAttributeName(attributeName); }
+public short getAttributeType()
+    { return _ElementTargetAttributes.getAttributeType(); }
+public void setAttributeType(short attributeType)
+    { _ElementTargetAttributes.setAttributeType(attributeType); }
+//end ElementTargetAttributes
 
 
-public native short getAttributeType();
-public native void setAttributeType(short attributeType);
-//end ElementTargetAttributes
 
 
 public native String getTo();
diff --git a/src/bind/java/org/inkscape/dom/smil/SMILTopLayoutElementImpl.java b/src/bind/java/org/inkscape/dom/smil/SMILTopLayoutElementImpl.java
index 2e372eda8..c5982e5b3 100644
--- a/src/bind/java/org/inkscape/dom/smil/SMILTopLayoutElementImpl.java
+++ b/src/bind/java/org/inkscape/dom/smil/SMILTopLayoutElementImpl.java
@@ -33,25 +33,34 @@ import org.w3c.dom.DOMException;
 
 
 public class SMILTopLayoutElementImpl
-       extends SMILElementImpl //, ElementLayout
+       extends SMILElementImpl
+             //, ElementLayout
        implements org.w3c.dom.smil.SMILTopLayoutElement
 {
-//from ElementLayout
-public native String getTitle();
-public native void setTitle(String title)
-                                  throws DOMException;
-
-public native String getBackgroundColor();
-public native void setBackgroundColor(String backgroundColor)
-                                  throws DOMException;
-
-public native int getHeight();
-public native void setHeight(int height)
-                                  throws DOMException;
+public SMILTopLayoutElementImpl()
+{
+    imbue(_ElementLayout = new ElementLayoutImpl());
+}
 
-public native int getWidth();
-public native void setWidth(int width)
-                                  throws DOMException;
+//from ElementLayout
+ElementLayoutImpl _ElementLayout;
+public String getTitle()
+    { return _ElementLayout.getTitle(); }
+public void setTitle(String title) throws DOMException
+    { _ElementLayout.setTitle(title); }
+public String getBackgroundColor()
+    { return _ElementLayout.getBackgroundColor(); }
+public void setBackgroundColor(String backgroundColor) throws DOMException
+    { _ElementLayout.setBackgroundColor(backgroundColor); }
+public int getHeight()
+    { return _ElementLayout.getHeight(); }
+public void setHeight(int height) throws DOMException
+    { _ElementLayout.setHeight(height); }
+public int getWidth()
+    { return _ElementLayout.getWidth(); }
+public void setWidth(int width) throws DOMException
+    { _ElementLayout.setWidth(width); }
 //end ElementLayout
+
 }