From fe5ba09ef0bae2dd968a010833a8bcf4f871daec Mon Sep 17 00:00:00 2001 From: ishmal Date: Sat, 22 Mar 2008 21:03:56 +0000 Subject: [PATCH] More multiple inheritance delegation. 53 files to go. --- .../dom/smil/ElementTimeControlImpl.java | 12 +- .../org/inkscape/dom/svg/SVGAElementImpl.java | 22 ++-- .../dom/svg/SVGAltGlyphElementImpl.java | 21 ++-- .../dom/svg/SVGAnimationElementImpl.java | 79 ++++++++---- .../dom/svg/SVGCircleElementImpl.java | 119 ++++++++++++------ .../dom/svg/SVGClipPathElementImpl.java | 83 ++++++++---- 6 files changed, 222 insertions(+), 114 deletions(-) diff --git a/src/bind/java/org/inkscape/dom/smil/ElementTimeControlImpl.java b/src/bind/java/org/inkscape/dom/smil/ElementTimeControlImpl.java index 0fe1a6902..e82161139 100644 --- a/src/bind/java/org/inkscape/dom/smil/ElementTimeControlImpl.java +++ b/src/bind/java/org/inkscape/dom/smil/ElementTimeControlImpl.java @@ -36,14 +36,10 @@ public class ElementTimeControlImpl org.inkscape.cmn.BaseInterface implements org.w3c.dom.smil.ElementTimeControl { -public native boolean beginElement() - throws DOMException; -public native boolean beginElementAt(float offset) - throws DOMException; -public native boolean endElement() - throws DOMException; -public native boolean endElementAt(float offset) - throws DOMException; +public native boolean beginElement() throws DOMException; +public native boolean endElement() throws DOMException; +public native boolean beginElementAt(float offset) throws DOMException; +public native boolean endElementAt(float offset) throws DOMException; } diff --git a/src/bind/java/org/inkscape/dom/svg/SVGAElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGAElementImpl.java index 0ebd44a2c..5a2c8986f 100644 --- a/src/bind/java/org/inkscape/dom/svg/SVGAElementImpl.java +++ b/src/bind/java/org/inkscape/dom/svg/SVGAElementImpl.java @@ -54,25 +54,23 @@ public class SVGAElementImpl //EventTarget implements org.w3c.dom.svg.SVGAElement { + public SVGAElementImpl() { - imbue(_SVGURIReference = new SVGURIReferenceImpl()); - 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()); + imbue(_SVGURIReference = new SVGURIReferenceImpl()); + 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 SVGURIReference private SVGURIReferenceImpl _SVGURIReference; -public SVGAnimatedString getHref( ) -{ - return _SVGURIReference.getHref( ); -} +public SVGAnimatedString getHref() + { return _SVGURIReference.getHref(); } //end SVGURIReference //from SVGTests diff --git a/src/bind/java/org/inkscape/dom/svg/SVGAltGlyphElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGAltGlyphElementImpl.java index 0dbdd1474..a3d8522cb 100644 --- a/src/bind/java/org/inkscape/dom/svg/SVGAltGlyphElementImpl.java +++ b/src/bind/java/org/inkscape/dom/svg/SVGAltGlyphElementImpl.java @@ -39,15 +39,22 @@ public class SVGAltGlyphElementImpl //SVGURIReference implements org.w3c.dom.svg.SVGAltGlyphElement { + +public SVGAltGlyphElementImpl() +{ + imbue(_SVGURIReference = new SVGURIReferenceImpl()); +} + //from SVGURIReference -public native SVGAnimatedString getHref( ); +private SVGURIReferenceImpl _SVGURIReference; +public SVGAnimatedString getHref() + { return _SVGURIReference.getHref(); } //end SVGURIReference -public native String getGlyphRef( ); -public native void setGlyphRef( String glyphRef ) - throws DOMException; -public native String getFormat( ); -public native void setFormat( String format ) - throws DOMException; +public native String getGlyphRef(); +public native void setGlyphRef(String glyphRef) throws DOMException; +public native String getFormat(); +public native void setFormat(String format) throws DOMException; + } diff --git a/src/bind/java/org/inkscape/dom/svg/SVGAnimationElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGAnimationElementImpl.java index e4c1dc160..8681052fd 100644 --- a/src/bind/java/org/inkscape/dom/svg/SVGAnimationElementImpl.java +++ b/src/bind/java/org/inkscape/dom/svg/SVGAnimationElementImpl.java @@ -48,51 +48,76 @@ public class SVGAnimationElementImpl //EventTarget implements org.w3c.dom.svg.SVGAnimationElement { + +public SVGAnimationElementImpl() +{ + imbue(_SVGTests = new SVGTestsImpl()); + imbue(_SVGExternalResourcesRequired = new SVGExternalResourcesRequiredImpl()); + imbue(_ElementTimeControl = new org.inkscape.dom.smil.ElementTimeControlImpl()); + 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 SVGExternalResourcesRequired -public native SVGAnimatedBoolean getExternalResourcesRequired( ); +private SVGExternalResourcesRequiredImpl _SVGExternalResourcesRequired; +public SVGAnimatedBoolean getExternalResourcesRequired() + { return _SVGExternalResourcesRequired.getExternalResourcesRequired(); } //end SVGExternalResourcesRequired //from ElementTimeControl -public native boolean beginElement() - throws DOMException; -public native boolean beginElementAt(float offset) - throws DOMException; -public native boolean endElement() - throws DOMException; -public native boolean endElementAt(float offset) - throws DOMException; +org.inkscape.dom.smil.ElementTimeControlImpl _ElementTimeControl; +public boolean beginElement() throws DOMException + { return _ElementTimeControl.beginElement(); } +public boolean endElement() throws DOMException + { return _ElementTimeControl.endElement(); } +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 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/SVGCircleElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGCircleElementImpl.java index 6b1faacbd..4391867b4 100644 --- a/src/bind/java/org/inkscape/dom/svg/SVGCircleElementImpl.java +++ b/src/bind/java/org/inkscape/dom/svg/SVGCircleElementImpl.java @@ -52,69 +52,114 @@ public class SVGCircleElementImpl //EventTarget implements org.w3c.dom.svg.SVGCircleElement { + +public SVGCircleElementImpl() +{ + 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/SVGClipPathElementImpl.java b/src/bind/java/org/inkscape/dom/svg/SVGClipPathElementImpl.java index 37fc8ad0f..be5dcbbfa 100644 --- a/src/bind/java/org/inkscape/dom/svg/SVGClipPathElementImpl.java +++ b/src/bind/java/org/inkscape/dom/svg/SVGClipPathElementImpl.java @@ -50,48 +50,85 @@ public class SVGClipPathElementImpl //SVGUnitTypes implements org.w3c.dom.svg.SVGClipPathElement { + +public SVGClipPathElementImpl() +{ + imbue(_SVGTests = new SVGTestsImpl()); + imbue(_SVGLangSpace = new SVGLangSpaceImpl()); + imbue(_SVGExternalResourcesRequired = new SVGExternalResourcesRequiredImpl()); + imbue(_SVGStylable = new SVGStylableImpl()); + imbue(_SVGTransformable = new SVGTransformableImpl()); +} + //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 + + public native SVGAnimatedEnumeration getClipPathUnits( ); } -- 2.30.2