From 9fb81d2764cedfb36372fc7c8daa3948e2fa2faa Mon Sep 17 00:00:00 2001 From: "edburns%acm.org" Date: Mon, 12 Mar 2007 16:13:03 +0000 Subject: [PATCH] First step on allowing JAVADom to run on NativeEventThread. Have no public native methods. Have each formerly public native method now be a package private method with the same name as before, but the string "native" prepended, and the first letter of the old name capitalized. Have a new public method with the same name as the old method with a body that calls through to the corresponding native method, passing args correctly. Next step will be to provide a threading solution from webclient. M dom/classes/org/mozilla/dom/AttrImpl.java M dom/classes/org/mozilla/dom/CharacterDataImpl.java M dom/classes/org/mozilla/dom/DOMAccessor.java M dom/classes/org/mozilla/dom/DOMImplementationImpl.java M dom/classes/org/mozilla/dom/DocumentImpl.java M dom/classes/org/mozilla/dom/DocumentTypeImpl.java M dom/classes/org/mozilla/dom/ElementImpl.java M dom/classes/org/mozilla/dom/EntityImpl.java M dom/classes/org/mozilla/dom/NamedNodeMapImpl.java M dom/classes/org/mozilla/dom/NodeImpl.java M dom/classes/org/mozilla/dom/NodeListImpl.java M dom/classes/org/mozilla/dom/NotationImpl.java M dom/classes/org/mozilla/dom/ProcessingInstructionImpl.java M dom/classes/org/mozilla/dom/events/EventImpl.java M dom/classes/org/mozilla/dom/events/MouseEventImpl.java M dom/classes/org/mozilla/dom/events/UIEventImpl.java M dom/jni/org_mozilla_dom_AttrImpl.cpp M dom/jni/org_mozilla_dom_CharacterDataImpl.cpp M dom/jni/org_mozilla_dom_DOMAccessor.cpp M dom/jni/org_mozilla_dom_DOMImplementationImpl.cpp M dom/jni/org_mozilla_dom_DocumentImpl.cpp M dom/jni/org_mozilla_dom_ElementImpl.cpp M dom/jni/org_mozilla_dom_EntityImpl.cpp M dom/jni/org_mozilla_dom_NamedNodeMapImpl.cpp M dom/jni/org_mozilla_dom_NodeImpl.cpp M dom/jni/org_mozilla_dom_NodeListImpl.cpp M dom/jni/org_mozilla_dom_NotationImpl.cpp M dom/jni/org_mozilla_dom_ProcessingInstructionImpl.cpp M dom/jni/org_mozilla_dom_events_EventImpl.cpp M dom/jni/org_mozilla_dom_events_MouseEventImpl.cpp M dom/jni/org_mozilla_dom_events_UIEventImpl.cpp git-svn-id: svn://10.0.0.236/trunk@221779 18797224-902f-48f8-a5cc-f745e15eee43 --- .../dom/classes/org/mozilla/dom/AttrImpl.java | 29 ++- .../org/mozilla/dom/CharacterDataImpl.java | 48 ++++- .../classes/org/mozilla/dom/DOMAccessor.java | 28 ++- .../mozilla/dom/DOMImplementationImpl.java | 36 +++- .../classes/org/mozilla/dom/DocumentImpl.java | 95 +++++++-- .../org/mozilla/dom/DocumentTypeImpl.java | 36 +++- .../classes/org/mozilla/dom/ElementImpl.java | 101 ++++++++-- .../classes/org/mozilla/dom/EntityImpl.java | 18 +- .../org/mozilla/dom/NamedNodeMapImpl.java | 30 ++- .../dom/classes/org/mozilla/dom/NodeImpl.java | 181 ++++++++++++++---- .../classes/org/mozilla/dom/NodeListImpl.java | 27 ++- .../classes/org/mozilla/dom/NotationImpl.java | 12 +- .../dom/ProcessingInstructionImpl.java | 18 +- .../org/mozilla/dom/events/EventImpl.java | 73 +++++-- .../mozilla/dom/events/MouseEventImpl.java | 110 ++++++++--- .../org/mozilla/dom/events/UIEventImpl.java | 31 ++- .../java/dom/jni/org_mozilla_dom_AttrImpl.cpp | 10 +- .../jni/org_mozilla_dom_CharacterDataImpl.cpp | 16 +- .../dom/jni/org_mozilla_dom_DOMAccessor.cpp | 10 +- .../org_mozilla_dom_DOMImplementationImpl.cpp | 12 +- .../dom/jni/org_mozilla_dom_DocumentImpl.cpp | 32 ++-- .../dom/jni/org_mozilla_dom_ElementImpl.cpp | 36 ++-- .../dom/jni/org_mozilla_dom_EntityImpl.cpp | 6 +- .../jni/org_mozilla_dom_NamedNodeMapImpl.cpp | 10 +- .../java/dom/jni/org_mozilla_dom_NodeImpl.cpp | 62 +++--- .../dom/jni/org_mozilla_dom_NodeListImpl.cpp | 10 +- .../dom/jni/org_mozilla_dom_NotationImpl.cpp | 4 +- ..._mozilla_dom_ProcessingInstructionImpl.cpp | 6 +- .../jni/org_mozilla_dom_events_EventImpl.cpp | 24 +-- .../org_mozilla_dom_events_MouseEventImpl.cpp | 22 +-- .../org_mozilla_dom_events_UIEventImpl.cpp | 6 +- 31 files changed, 838 insertions(+), 301 deletions(-) diff --git a/mozilla/java/dom/classes/org/mozilla/dom/AttrImpl.java b/mozilla/java/dom/classes/org/mozilla/dom/AttrImpl.java index e7a50beeea0..5cd2b3aa1bd 100644 --- a/mozilla/java/dom/classes/org/mozilla/dom/AttrImpl.java +++ b/mozilla/java/dom/classes/org/mozilla/dom/AttrImpl.java @@ -31,17 +31,36 @@ public class AttrImpl extends NodeImpl implements Attr { // instantiated from JNI or Document.createAttribute() private AttrImpl() {} - public native String getName(); - public native boolean getSpecified(); - public native String getValue(); - public native void setValue(String value); + public String getName() { + return nativeGetName(); + } + native String nativeGetName(); + + public boolean getSpecified() { + return nativeGetSpecified(); + } + native boolean nativeGetSpecified(); + + public String getValue() { + return nativeGetValue(); + } + native String nativeGetValue(); + + public void setValue(String value) { + nativeSetValue(value); + } + native void nativeSetValue(String value); /** * The Element node this attribute is attached to or * null if this attribute is not in use. * @since DOM Level 2 */ - public native Element getOwnerElement(); + public Element getOwnerElement() { + return nativeGetOwnerElement(); + } + native Element nativeGetOwnerElement(); + public boolean isId() { throw new UnsupportedOperationException(); diff --git a/mozilla/java/dom/classes/org/mozilla/dom/CharacterDataImpl.java b/mozilla/java/dom/classes/org/mozilla/dom/CharacterDataImpl.java index a64e768a2e9..d153bc23193 100644 --- a/mozilla/java/dom/classes/org/mozilla/dom/CharacterDataImpl.java +++ b/mozilla/java/dom/classes/org/mozilla/dom/CharacterDataImpl.java @@ -28,12 +28,44 @@ public class CharacterDataImpl extends NodeImpl implements CharacterData { // instantiated from JNI only protected CharacterDataImpl() {} - public native void appendData(String arg); - public native void deleteData(int offset, int count); - public native String getData(); - public native int getLength(); - public native void insertData(int offset, String arg); - public native void replaceData(int offset, int count, String arg); - public native void setData(String data); - public native String substringData(int offset, int count); + public void appendData(String arg) { + nativeAppendData(arg); + } + native void nativeAppendData(String arg); + + public void deleteData(int offset, int count) { + nativeDeleteData(offset, count); + } + native void nativeDeleteData(int offset, int count); + + + public String getData() { + return nativeGetData(); + } + native String nativeGetData(); + + public int getLength() { + return nativeGetLength(); + } + native int nativeGetLength(); + + public void insertData(int offset, String arg) { + nativeInsertData(offset, arg); + } + native void nativeInsertData(int offset, String arg); + + public void replaceData(int offset, int count, String arg) { + nativeReplaceData(offset, count, arg); + } + native void nativeReplaceData(int offset, int count, String arg); + + public void setData(String data) { + nativeSetData(data); + } + native void nativeSetData(String data); + + public String substringData(int offset, int count) { + return nativeSubstringData(offset, count); + } + native String nativeSubstringData(int offset, int count); } diff --git a/mozilla/java/dom/classes/org/mozilla/dom/DOMAccessor.java b/mozilla/java/dom/classes/org/mozilla/dom/DOMAccessor.java index a7b3a35dfbd..2e669b54100 100644 --- a/mozilla/java/dom/classes/org/mozilla/dom/DOMAccessor.java +++ b/mozilla/java/dom/classes/org/mozilla/dom/DOMAccessor.java @@ -97,12 +97,30 @@ public final class DOMAccessor { private void DOMAccessorImpl() {} - private static native void register(); - private static native void unregister(); - public static native Node getNodeByHandle(long p); - private static native void doGC(); + private static void register() { + nativeRegister(); + } + private static native void nativeRegister(); - public static native void initialize(); + private static void unregister() { + nativeUnregister(); + } + private static native void nativeUnregister(); + + public static Node getNodeByHandle(long p) { + return nativeGetNodeByHandle(p); + } + static native Node nativeGetNodeByHandle(long p); + + private static void doGC() { + nativeDoGC(); + } + private static native void nativeDoGC(); + + public static void initialize() { + nativeInitialize(); + } + public static native void nativeInitialize(); public static synchronized void addDocumentLoadListener(DocumentLoadListener listener) { diff --git a/mozilla/java/dom/classes/org/mozilla/dom/DOMImplementationImpl.java b/mozilla/java/dom/classes/org/mozilla/dom/DOMImplementationImpl.java index e3d255d8315..6b00c21e1be 100644 --- a/mozilla/java/dom/classes/org/mozilla/dom/DOMImplementationImpl.java +++ b/mozilla/java/dom/classes/org/mozilla/dom/DOMImplementationImpl.java @@ -44,21 +44,37 @@ public class DOMImplementationImpl implements DOMImplementation { return XPCOM_hashCode(); } - public native boolean hasFeature(String feature, String version); + public boolean hasFeature(String feature, String version) { + return nativeHasFeature(feature, version); + } + native boolean nativeHasFeature(String feature, String version); - protected native void finalize(); + protected void finalize() { + nativeFinalize(); + } - private native boolean XPCOM_equals(Object o); - private native int XPCOM_hashCode(); + protected native void nativeFinalize(); + + private boolean XPCOM_equals(Object o) { + return nativeXPCOM_equals(o); + } + native boolean nativeXPCOM_equals(Object o); + + private int XPCOM_hashCode() { + return nativeXPCOM_hashCode(); + } + private native int nativeXPCOM_hashCode(); //since DOM2 - public native DocumentType createDocumentType(String qualifiedName, - String publicID, - String systemID); + public DocumentType createDocumentType(String qualifiedName, String publicID, String systemID) { + return nativeCreateDocumentType(qualifiedName, publicID, systemID); + } + native DocumentType nativeCreateDocumentType(String qualifiedName, String publicID, String systemID); - public native Document createDocument(String namespaceURI, - String qualifiedName, - DocumentType doctype); + public Document createDocument(String namespaceURI, String qualifiedName, DocumentType doctype) { + return nativeCreateDocument(namespaceURI, qualifiedName, doctype); + } + native Document nativeCreateDocument(String namespaceURI, String qualifiedName, DocumentType doctype); public Object getFeature(String feature, String version) { throw new UnsupportedOperationException(); diff --git a/mozilla/java/dom/classes/org/mozilla/dom/DocumentImpl.java b/mozilla/java/dom/classes/org/mozilla/dom/DocumentImpl.java index 45e2a8dd78b..78780fec4b6 100644 --- a/mozilla/java/dom/classes/org/mozilla/dom/DocumentImpl.java +++ b/mozilla/java/dom/classes/org/mozilla/dom/DocumentImpl.java @@ -44,25 +44,84 @@ public class DocumentImpl extends NodeImpl implements Document, DocumentEvent { // instantiated from JNI only private DocumentImpl() {} - public native Attr createAttribute(String name); - public native CDATASection createCDATASection(String data); - public native Comment createComment(String data); - public native DocumentFragment createDocumentFragment(); - public native Element createElement(String tagName); - public native EntityReference createEntityReference(String name); - public native ProcessingInstruction - createProcessingInstruction(String target, - String data); - public native Text createTextNode(String data); + public Attr createAttribute(String name) { + return nativeCreateAttribute(name); + } + native Attr nativeCreateAttribute(String name); + + public CDATASection createCDATASection(String data) { + return nativeCreateCDATASection(data); + } + native CDATASection nativeCreateCDATASection(String data); + + public Comment createComment(String data) { + return nativeCreateComment(data); + } + native Comment nativeCreateComment(String data); + + public DocumentFragment createDocumentFragment() { + return nativeCreateDocumentFragment(); + } + native DocumentFragment nativeCreateDocumentFragment(); + + public Element createElement(String tagName) { + return nativeCreateElement(tagName); + } + native Element nativeCreateElement(String tagName); + + public EntityReference createEntityReference(String name) { + return nativeCreateEntityReference(name); + } + native EntityReference nativeCreateEntityReference(String name); + + public ProcessingInstruction createProcessingInstruction(String target, String data) { + return nativeCreateProcessingInstruction(target, data); + } + native ProcessingInstruction nativeCreateProcessingInstruction(String target, String data); + public Text createTextNode(String data) { + return nativeCreateTextNode(data); + } + native Text nativeCreateTextNode(String data); + + public DocumentType getDoctype() { + return nativeGetDoctype(); + } + native DocumentType nativeGetDoctype(); + + public Element getDocumentElement() { + return nativeGetDocumentElement(); + } + native Element nativeGetDocumentElement(); + + public NodeList getElementsByTagName(String tagName) { + return nativeGetElementsByTagName(tagName); + } + native NodeList nativeGetElementsByTagName(String tagName); + + public DOMImplementation getImplementation() { + return nativeGetImplementation(); + } + native DOMImplementation nativeGetImplementation(); + + public Event createEvent(String type) { + return nativeCreateEvent(type); + } + native Event nativeCreateEvent(String type); + + public NodeList getElementsByTagNameNS(String namespaceURI, String localName) { + return nativeGetElementsByTagNameNS(namespaceURI, localName); + } + native NodeList nativeGetElementsByTagNameNS(String namespaceURI, String localName); + public Element getElementById(String elementId) { + return nativeGetElementById(elementId); + } + native Element nativeGetElementById(String elementId); + + public String getDocumentURI() { + return nativeGetDocumentURI(); + } + native String nativeGetDocumentURI(); - public native DocumentType getDoctype(); - public native Element getDocumentElement(); - public native NodeList getElementsByTagName(String tagName); - public native DOMImplementation getImplementation(); - public native Event createEvent(String type); - public native NodeList getElementsByTagNameNS(String namespaceURI, String localName); - public native Element getElementById(String elementId); - public native String getDocumentURI(); public Node importNode(Node importedNode, boolean deep) throws DOMException { throw new UnsupportedOperationException(); diff --git a/mozilla/java/dom/classes/org/mozilla/dom/DocumentTypeImpl.java b/mozilla/java/dom/classes/org/mozilla/dom/DocumentTypeImpl.java index 341d31f4fed..e3a358952a0 100644 --- a/mozilla/java/dom/classes/org/mozilla/dom/DocumentTypeImpl.java +++ b/mozilla/java/dom/classes/org/mozilla/dom/DocumentTypeImpl.java @@ -29,12 +29,36 @@ public class DocumentTypeImpl extends NodeImpl implements DocumentType { // instantiated from JNI only private DocumentTypeImpl() {} - public native String getName(); - public native NamedNodeMap getEntities(); - public native NamedNodeMap getNotations(); + public String getName() { + return nativeGetName(); + } + native String nativeGetName(); + + public NamedNodeMap getEntities() { + return nativeGetEntities(); + } + native NamedNodeMap nativeGetEntities(); + + public NamedNodeMap getNotations() { + return nativeGetNotations(); + } + native NamedNodeMap nativeGetNotations(); + //since DOM level 2 - public native String getPublicId(); - public native String getSystemId(); - public native String getInternalSubset(); + public String getPublicId() { + return nativeGetPublicId(); + } + native String nativeGetPublicId(); + + public String getSystemId() { + return nativeGetSystemId(); + } + native String nativeGetSystemId(); + + public String getInternalSubset() { + return nativeGetInternalSubset(); + } + native String nativeGetInternalSubset(); + } diff --git a/mozilla/java/dom/classes/org/mozilla/dom/ElementImpl.java b/mozilla/java/dom/classes/org/mozilla/dom/ElementImpl.java index 2dbc8edcb7d..41d5004743f 100644 --- a/mozilla/java/dom/classes/org/mozilla/dom/ElementImpl.java +++ b/mozilla/java/dom/classes/org/mozilla/dom/ElementImpl.java @@ -32,25 +32,92 @@ public class ElementImpl extends NodeImpl implements Element { // instantiated from JNI or Document.createElement() private ElementImpl() {} - public native String getAttribute(String name); - public native Attr getAttributeNode(String name); - public native NodeList getElementsByTagName(String name); - public native String getTagName(); - public native void normalize(); - public native void removeAttribute(String name); - public native Attr removeAttributeNode(Attr oldAttr); - public native void setAttribute(String name, String value); - public native Attr setAttributeNode(Attr newAttr); + public String getAttribute(String name) { + return nativeGetAttribute(name); + } + native String nativeGetAttribute(String name); + + public Attr getAttributeNode(String name) { + return nativeGetAttributeNode(name); + } + native Attr nativeGetAttributeNode(String name); + + public NodeList getElementsByTagName(String name) { + return nativeGetElementsByTagName(name); + } + native NodeList nativeGetElementsByTagName(String name); + + public String getTagName() { + return nativeGetTagName(); + } + native String nativeGetTagName(); + + public void normalize() { + nativeNormalize(); + } + native void nativeNormalize(); + + public void removeAttribute(String name) { + nativeRemoveAttribute(name); + } + native void nativeRemoveAttribute(String name); + + public Attr removeAttributeNode(Attr oldAttr) { + return nativeRemoveAttributeNode(oldAttr); + } + native Attr nativeRemoveAttributeNode(Attr oldAttr); + + public void setAttribute(String name, String value) { + nativeSetAttribute(name, value); + } + native void nativeSetAttribute(String name, String value); + + public Attr setAttributeNode(Attr newAttr) { + return nativeSetAttributeNode(newAttr); + } + native Attr nativeSetAttributeNode(Attr newAttr); + //since DOM2 - public native String getAttributeNS(String namespaceURI, String localName); - public native void setAttributeNS(String namespaceURI, String qualifiedName, String value); - public native void removeAttributeNS(String namespacURI, String localName); - public native Attr getAttributeNodeNS(String namespaceURI, String localName); - public native Attr setAttributeNodeNS(Attr newAttr); - public native NodeList getElementsByTagNameNS(String namespaceURI, String localName); - public native boolean hasAttribute(String name); - public native boolean hasAttributeNS(String namespaceURI, String localName); + public String getAttributeNS(String namespaceURI, String localName) { + return nativeGetAttributeNS(namespaceURI, localName); + } + native String nativeGetAttributeNS(String namespaceURI, String localName); + + public void setAttributeNS(String namespaceURI, String qualifiedName, String value) { + nativeSetAttributeNS(namespaceURI, qualifiedName, value); + } + native void nativeSetAttributeNS(String namespaceURI, String qualifiedName, String value); + + public void removeAttributeNS(String namespacURI, String localName) { + nativeRemoveAttributeNS(namespacURI, localName); + } + native void nativeRemoveAttributeNS(String namespacURI, String localName); + + public Attr getAttributeNodeNS(String namespaceURI, String localName) { + return nativeGetAttributeNodeNS(namespaceURI, localName); + } + native Attr nativeGetAttributeNodeNS(String namespaceURI, String localName); + + public Attr setAttributeNodeNS(Attr newAttr) { + return nativeSetAttributeNodeNS(newAttr); + } + native Attr nativeSetAttributeNodeNS(Attr newAttr); + + public NodeList getElementsByTagNameNS(String namespaceURI, String localName) { + return nativeGetElementsByTagNameNS(namespaceURI, localName); + } + native NodeList nativeGetElementsByTagNameNS(String namespaceURI, String localName); + + public boolean hasAttribute(String name) { + return nativeHasAttribute(name); + } + native boolean nativeHasAttribute(String name); + + public boolean hasAttributeNS(String namespaceURI, String localName) { + return nativeHasAttributeNS(namespaceURI, localName); + } + native boolean nativeHasAttributeNS(String namespaceURI, String localName); public TypeInfo getSchemaTypeInfo() { throw new UnsupportedOperationException(); diff --git a/mozilla/java/dom/classes/org/mozilla/dom/EntityImpl.java b/mozilla/java/dom/classes/org/mozilla/dom/EntityImpl.java index 691a6963020..892e95bf9d7 100644 --- a/mozilla/java/dom/classes/org/mozilla/dom/EntityImpl.java +++ b/mozilla/java/dom/classes/org/mozilla/dom/EntityImpl.java @@ -28,9 +28,21 @@ public class EntityImpl extends NodeImpl implements Entity { // instantiated from JNI only private EntityImpl() {} - public native String getPublicId(); - public native String getSystemId(); - public native String getNotationName(); + public String getPublicId() { + return nativeGetPublicId(); + } + native String nativeGetPublicId(); + + public String getSystemId() { + return nativeGetSystemId(); + } + native String nativeGetSystemId(); + + public String getNotationName() { + return nativeGetNotationName(); + } + native String nativeGetNotationName(); + public String getXmlVersion() { throw new UnsupportedOperationException(); diff --git a/mozilla/java/dom/classes/org/mozilla/dom/NamedNodeMapImpl.java b/mozilla/java/dom/classes/org/mozilla/dom/NamedNodeMapImpl.java index c57cd9f543a..8348c62e387 100644 --- a/mozilla/java/dom/classes/org/mozilla/dom/NamedNodeMapImpl.java +++ b/mozilla/java/dom/classes/org/mozilla/dom/NamedNodeMapImpl.java @@ -31,11 +31,31 @@ public class NamedNodeMapImpl implements NamedNodeMap { // instantiated from JNI only private NamedNodeMapImpl() {} - public native int getLength(); - public native Node getNamedItem(String name); - public native Node item(int index); - public native Node removeNamedItem(String name); - public native Node setNamedItem(Node arg); + public int getLength() { + return nativeGetLength(); + } + native int nativeGetLength(); + + public Node getNamedItem(String name) { + return nativeGetNamedItem(name); + } + native Node nativeGetNamedItem(String name); + + public Node item(int index) { + return nativeItem(index); + } + native Node nativeItem(int index); + + public Node removeNamedItem(String name) { + return nativeRemoveNamedItem(name); + } + native Node nativeRemoveNamedItem(String name); + + public Node setNamedItem(Node arg) { + return nativeSetNamedItem(arg); + } + native Node nativeSetNamedItem(Node arg); + public Node getNamedItemNS(String namespaceURI, String localName) { diff --git a/mozilla/java/dom/classes/org/mozilla/dom/NodeImpl.java b/mozilla/java/dom/classes/org/mozilla/dom/NodeImpl.java index 3cfd239897b..1dae37df2a8 100644 --- a/mozilla/java/dom/classes/org/mozilla/dom/NodeImpl.java +++ b/mozilla/java/dom/classes/org/mozilla/dom/NodeImpl.java @@ -117,39 +117,148 @@ public class NodeImpl implements Node, EventTarget { return "ERROR"; } - public native boolean isSupported(String feature, String version); - public native boolean hasAttributes(); - public native Node appendChild(Node newChild) throws DOMException; - public native Node cloneNode(boolean deep); - public native NamedNodeMap getAttributes(); - public native NodeList getChildNodes(); - public native Node getFirstChild(); - public native Node getLastChild(); - public native Node getNextSibling(); - public native String getNodeName(); - public native short getNodeType(); - public native String getNodeValue(); - public native Document getOwnerDocument(); - public native Node getParentNode(); - public native Node getPreviousSibling(); - public native boolean hasChildNodes(); - public native Node insertBefore(Node newChild, Node refChild) throws DOMException; - public native Node removeChild(Node oldChild) throws DOMException; - public native Node replaceChild(Node newChild, Node oldChild) throws DOMException; - public native void setNodeValue(String nodeValue); - public native String getTextContent() throws DOMException; + public boolean isSupported(String feature, String version) { + return nativeIsSupported(feature, version); + } + native boolean nativeIsSupported(String feature, String version); + public boolean hasAttributes() { + return nativeHasAttributes(); + } + native boolean nativeHasAttributes(); - protected native void finalize(); + public Node appendChild(Node newChild) throws DOMException { + return nativeAppendChild(newChild); + } + native Node nativeAppendChild(Node newChild) throws DOMException; - private native boolean XPCOM_equals(Object o); - private native int XPCOM_hashCode(); + public Node cloneNode(boolean deep) { + return nativeCloneNode(deep); + } + native Node nativeCloneNode(boolean deep); + + public NamedNodeMap getAttributes() { + return nativeGetAttributes(); + } + native NamedNodeMap nativeGetAttributes(); + + public NodeList getChildNodes() { + return nativeGetChildNodes(); + } + native NodeList nativeGetChildNodes(); + + public Node getFirstChild() { + return nativeGetFirstChild(); + } + native Node nativeGetFirstChild(); + + public Node getLastChild() { + return nativeGetLastChild(); + } + native Node nativeGetLastChild(); + + public Node getNextSibling() { + return nativeGetNextSibling(); + } + native Node nativeGetNextSibling(); + + public String getNodeName() { + return nativeGetNodeName(); + } + native String nativeGetNodeName(); + + public short getNodeType() { + return nativeGetNodeType(); + } + native short nativeGetNodeType(); + + public String getNodeValue() { + return nativeGetNodeValue(); + } + native String nativeGetNodeValue(); + + public Document getOwnerDocument() { + return nativeGetOwnerDocument(); + } + native Document nativeGetOwnerDocument(); + + public Node getParentNode() { + return nativeGetParentNode(); + } + native Node nativeGetParentNode(); + + public Node getPreviousSibling() { + return nativeGetPreviousSibling(); + } + native Node nativeGetPreviousSibling(); + + public boolean hasChildNodes() { + return nativeHasChildNodes(); + } + native boolean nativeHasChildNodes(); + + public Node insertBefore(Node newChild, Node refChild) throws DOMException { + return nativeInsertBefore(newChild, refChild); + } + native Node nativeInsertBefore(Node newChild, Node refChild) throws DOMException; + public Node removeChild(Node oldChild) throws DOMException { + return nativeRemoveChild(oldChild); + } + native Node nativeRemoveChild(Node oldChild) throws DOMException; + + public Node replaceChild(Node newChild, Node oldChild) throws DOMException { + return nativeReplaceChild(newChild, oldChild); + } + native Node nativeReplaceChild(Node newChild, Node oldChild) throws DOMException; + public void setNodeValue(String nodeValue) { + nativeSetNodeValue(nodeValue); + } + native void nativeSetNodeValue(String nodeValue); + + public String getTextContent() throws DOMException { + return nativeGetTextContent(); + } + native String nativeGetTextContent() throws DOMException; + + protected void finalize() { + nativeFinalize(); + } + protected native void nativeFinalize(); + + private boolean XPCOM_equals(Object o) { + return nativeXPCOM_equals(o); + } + native boolean nativeXPCOM_equals(Object o); + + private int XPCOM_hashCode() { + return nativeXPCOM_hashCode(); + } + private native int nativeXPCOM_hashCode(); //since DOM level 2 - public native boolean supports(String feature, String version); - public native String getNamespaceURI(); - public native String getPrefix(); - public native void setPrefix(String prefix); - public native String getLocalName(); + public boolean supports(String feature, String version) { + return nativeSupports(feature, version); + } + native boolean nativeSupports(String feature, String version); + public String getNamespaceURI() { + return nativeGetNamespaceURI(); + } + native String nativeGetNamespaceURI(); + + public String getPrefix() { + return nativeGetPrefix(); + } + native String nativeGetPrefix(); + + public void setPrefix(String prefix) { + nativeSetPrefix(prefix); + } + native void nativeSetPrefix(String prefix); + + public String getLocalName() { + return nativeGetLocalName(); + } + native String nativeGetLocalName(); + public void addEventListener(String type, EventListener listener, @@ -209,13 +318,15 @@ public class NodeImpl implements Node, EventTarget { throw new UnsupportedOperationException(); } - private native long addNativeEventListener(String type, - EventListener listener, - boolean useCapture); + private long addNativeEventListener(String type, EventListener listener, boolean useCapture) { + return nativeAddNativeEventListener(type, listener, useCapture); + } + private native long nativeAddNativeEventListener(String type, EventListener listener, boolean useCapture); - private native void removeNativeEventListener(String type, - long nativeListener, - boolean useCapture); + private void removeNativeEventListener(String type, long nativeListener, boolean useCapture) { + nativeRemoveNativeEventListener(type, nativeListener, useCapture); + } + private native void nativeRemoveNativeEventListener(String type, long nativeListener, boolean useCapture); public void normalize() { throw new UnsupportedOperationException(); diff --git a/mozilla/java/dom/classes/org/mozilla/dom/NodeListImpl.java b/mozilla/java/dom/classes/org/mozilla/dom/NodeListImpl.java index f46e03e1115..3dc62226649 100644 --- a/mozilla/java/dom/classes/org/mozilla/dom/NodeListImpl.java +++ b/mozilla/java/dom/classes/org/mozilla/dom/NodeListImpl.java @@ -42,11 +42,28 @@ public class NodeListImpl implements NodeList { return XPCOM_hashCode(); } - public native int getLength(); - public native Node item(int index); + public int getLength() { + return nativeGetLength(); + } + native int nativeGetLength(); - protected native void finalize(); + public Node item(int index) { + return nativeItem(index); + } + native Node nativeItem(int index); - private native boolean XPCOM_equals(Object o); - private native int XPCOM_hashCode(); + protected void finalize() { + nativeFinalize(); + } + protected native void nativeFinalize(); + + private boolean XPCOM_equals(Object o) { + return nativeXPCOM_equals(o); + } + native boolean nativeXPCOM_equals(Object o); + + private int XPCOM_hashCode() { + return nativeXPCOM_hashCode(); + } + private native int nativeXPCOM_hashCode(); } diff --git a/mozilla/java/dom/classes/org/mozilla/dom/NotationImpl.java b/mozilla/java/dom/classes/org/mozilla/dom/NotationImpl.java index 461fe5c563a..d90f67be88a 100644 --- a/mozilla/java/dom/classes/org/mozilla/dom/NotationImpl.java +++ b/mozilla/java/dom/classes/org/mozilla/dom/NotationImpl.java @@ -28,6 +28,14 @@ public class NotationImpl extends NodeImpl implements Notation { // instantiated from JNI only private NotationImpl() {} - public native String getPublicId(); - public native String getSystemId(); + public String getPublicId() { + return nativeGetPublicId(); + } + native String nativeGetPublicId(); + + public String getSystemId() { + return nativeGetSystemId(); + } + native String nativeGetSystemId(); + } diff --git a/mozilla/java/dom/classes/org/mozilla/dom/ProcessingInstructionImpl.java b/mozilla/java/dom/classes/org/mozilla/dom/ProcessingInstructionImpl.java index a46deefcab7..62b43515d9a 100644 --- a/mozilla/java/dom/classes/org/mozilla/dom/ProcessingInstructionImpl.java +++ b/mozilla/java/dom/classes/org/mozilla/dom/ProcessingInstructionImpl.java @@ -28,7 +28,19 @@ public class ProcessingInstructionImpl extends NodeImpl implements ProcessingIns // instantiated from JNI or Document.createProcessingInstruction() private ProcessingInstructionImpl() {} - public native String getData(); - public native String getTarget(); - public native void setData(String data); + public String getData() { + return nativeGetData(); + } + native String nativeGetData(); + + public String getTarget() { + return nativeGetTarget(); + } + native String nativeGetTarget(); + + public void setData(String data) { + nativeSetData(data); + } + native void nativeSetData(String data); + } diff --git a/mozilla/java/dom/classes/org/mozilla/dom/events/EventImpl.java b/mozilla/java/dom/classes/org/mozilla/dom/events/EventImpl.java index 3e480898005..9d53c507243 100644 --- a/mozilla/java/dom/classes/org/mozilla/dom/events/EventImpl.java +++ b/mozilla/java/dom/classes/org/mozilla/dom/events/EventImpl.java @@ -54,40 +54,64 @@ public class EventImpl implements Event { * The type property represents the event name as a string * property. */ - public native String getType(); + public String getType() { + return nativeGetType(); + } + native String nativeGetType(); + /** * The target property indicates the EventTarget * to which the event was originally dispatched. */ - public native EventTarget getTarget(); + public EventTarget getTarget() { + return nativeGetTarget(); + } + native EventTarget nativeGetTarget(); + /** * The currentNode property indicates the Node * whose EventListeners are currently being processed. This * is particularly useful during capturing and bubbling. */ - public native EventTarget getCurrentTarget(); + public EventTarget getCurrentTarget() { + return nativeGetCurrentTarget(); + } + native EventTarget nativeGetCurrentTarget(); + /** * The eventPhase property indicates which phase of event flow * is currently being evaluated. */ - public native short getEventPhase(); + public short getEventPhase() { + return nativeGetEventPhase(); + } + native short nativeGetEventPhase(); + /** * The bubbles property indicates whether or not an event is a * bubbling event. If the event can bubble the value is true, else the * value is false. */ - public native boolean getBubbles(); + public boolean getBubbles() { + return nativeGetBubbles(); + } + native boolean nativeGetBubbles(); + /** * The cancelable property indicates whether or not an event * can have its default action prevented. If the default action can be * prevented the value is true, else the value is false. */ - public native boolean getCancelable(); + public boolean getCancelable() { + return nativeGetCancelable(); + } + native boolean nativeGetCancelable(); + /** * The preventBubble method is used to end the bubbling phase @@ -97,7 +121,11 @@ public class EventImpl implements Event { * at that level and the event will not be propagated upward within the * tree. */ - public native void preventBubble(); + public void preventBubble() { + nativePreventBubble(); + } + native void nativePreventBubble(); + /** * The preventCapture method is used to end the capturing phase @@ -107,7 +135,11 @@ public class EventImpl implements Event { * cease at that level and the event will not be propagated any further * down. */ - public native void preventCapture(); + public void preventCapture() { + nativePreventCapture(); + } + native void nativePreventCapture(); + /** * If an event is cancelable, the preventCapture method is used @@ -120,7 +152,11 @@ public class EventImpl implements Event { * preventDefault has been called it will remain in effect * throughout the remainder of the event's propagation. */ - public native void preventDefault(); + public void preventDefault() { + nativePreventDefault(); + } + native void nativePreventDefault(); + /** * The stopPropagation method is used prevent further @@ -130,7 +166,11 @@ public class EventImpl implements Event { * on the current EventTarget before event flow stops. This * method may be used during any stage of event flow. */ - public native void stopPropagation(); + public void stopPropagation() { + nativeStopPropagation(); + } + native void nativeStopPropagation(); + /** * @@ -143,9 +183,14 @@ public class EventImpl implements Event { * @param cancelableArg Specifies whether or not the event's default action * can be prevented. */ - public native void initEvent(String eventTypeArg, - boolean canBubbleArg, - boolean cancelableArg); + public void initEvent(String eventTypeArg, boolean canBubbleArg, boolean cancelableArg) { + nativeInitEvent(eventTypeArg, canBubbleArg, cancelableArg); + } + native void nativeInitEvent(String eventTypeArg, boolean canBubbleArg, boolean cancelableArg); - public native long getTimeStamp(); + public long getTimeStamp() { + return nativeGetTimeStamp(); + } + native long nativeGetTimeStamp(); + } diff --git a/mozilla/java/dom/classes/org/mozilla/dom/events/MouseEventImpl.java b/mozilla/java/dom/classes/org/mozilla/dom/events/MouseEventImpl.java index 49f36bc2a03..9042636fc0f 100644 --- a/mozilla/java/dom/classes/org/mozilla/dom/events/MouseEventImpl.java +++ b/mozilla/java/dom/classes/org/mozilla/dom/events/MouseEventImpl.java @@ -58,64 +58,104 @@ public class MouseEventImpl extends UIEventImpl implements MouseEvent { * screenX indicates the horizontal coordinate at which the * event occurred in relative to the origin of the screen coordinate system. */ - public native int getScreenX(); + public int getScreenX() { + return nativeGetScreenX(); + } + native int nativeGetScreenX(); + /** * screenY indicates the vertical coordinate at which the event * occurred relative to the origin of the screen coordinate system. */ - public native int getScreenY(); + public int getScreenY() { + return nativeGetScreenY(); + } + native int nativeGetScreenY(); + /** * clientX indicates the horizontal coordinate at which the * event occurred relative to the DOM implementation's client area. */ - public native int getClientX(); + public int getClientX() { + return nativeGetClientX(); + } + native int nativeGetClientX(); + /** * clientY indicates the vertical coordinate at which the event * occurred relative to the DOM implementation's client area. */ - public native int getClientY(); + public int getClientY() { + return nativeGetClientY(); + } + native int nativeGetClientY(); + /** * ctrlKey indicates whether the 'ctrl' key was depressed * during the firing of the event. */ - public native boolean getCtrlKey(); + public boolean getCtrlKey() { + return nativeGetCtrlKey(); + } + native boolean nativeGetCtrlKey(); + /** * shiftKey indicates whether the 'shift' key was depressed * during the firing of the event. */ - public native boolean getShiftKey(); + public boolean getShiftKey() { + return nativeGetShiftKey(); + } + native boolean nativeGetShiftKey(); + /** * altKey indicates whether the 'alt' key was depressed during * the firing of the event. On some platforms this key may map to an * alternative key name. */ - public native boolean getAltKey(); + public boolean getAltKey() { + return nativeGetAltKey(); + } + native boolean nativeGetAltKey(); + /** * metaKey indicates whether the 'meta' key was depressed * during the firing of the event. On some platforms this key may map to * an alternative key name. */ - public native boolean getMetaKey(); + public boolean getMetaKey() { + return nativeGetMetaKey(); + } + native boolean nativeGetMetaKey(); + /** * During mouse events caused by the depression or release of a mouse * button, button is used to indicate which mouse button * changed state. */ - public native short getButton(); + public short getButton() { + return nativeGetButton(); + } + native short nativeGetButton(); + /** * relatedNode is used to identify a secondary node related to * a UI event. */ - public native EventTarget getRelatedTarget(); + public EventTarget getRelatedTarget() { + return nativeGetRelatedTarget(); + } + native EventTarget nativeGetRelatedTarget(); + /** * @@ -141,20 +181,40 @@ public class MouseEventImpl extends UIEventImpl implements MouseEvent { * @param buttonArg Specifies the Event's mouse button. * @param relatedTargetArg Specifies the Event's related Node. */ - public native void initMouseEvent(String typeArg, - boolean canBubbleArg, - boolean cancelableArg, - AbstractView viewArg, - int detailArg, - int screenXArg, - int screenYArg, - int clientXArg, - int clientYArg, - boolean ctrlKeyArg, - boolean altKeyArg, - boolean shiftKeyArg, - boolean metaKeyArg, - short buttonArg, - EventTarget relatedTargetArg); + public void initMouseEvent(String typeArg, + boolean canBubbleArg, + boolean cancelableArg, + AbstractView viewArg, + int detailArg, + int screenXArg, + int screenYArg, + int clientXArg, + int clientYArg, + boolean ctrlKeyArg, + boolean altKeyArg, + boolean shiftKeyArg, + boolean metaKeyArg, + short buttonArg, + EventTarget relatedTargetArg) { + nativeInitMouseEvent(typeArg, canBubbleArg, cancelableArg, viewArg, + detailArg, screenXArg, screenYArg, clientXArg, + clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, + metaKeyArg, buttonArg, relatedTargetArg); + } + native void nativeInitMouseEvent(String typeArg, + boolean canBubbleArg, + boolean cancelableArg, + AbstractView viewArg, + int detailArg, + int screenXArg, + int screenYArg, + int clientXArg, + int clientYArg, + boolean ctrlKeyArg, + boolean altKeyArg, + boolean shiftKeyArg, + boolean metaKeyArg, + short buttonArg, + EventTarget relatedTargetArg); } diff --git a/mozilla/java/dom/classes/org/mozilla/dom/events/UIEventImpl.java b/mozilla/java/dom/classes/org/mozilla/dom/events/UIEventImpl.java index ab6ea77e4a3..c19efcbadf1 100644 --- a/mozilla/java/dom/classes/org/mozilla/dom/events/UIEventImpl.java +++ b/mozilla/java/dom/classes/org/mozilla/dom/events/UIEventImpl.java @@ -47,13 +47,21 @@ public class UIEventImpl extends EventImpl implements UIEvent { * The view attribute identifies the AbstractView * from which the event was generated. */ - public native AbstractView getView(); + public AbstractView getView() { + return nativeGetView(); + } + public native AbstractView nativeGetView(); + /** * Specifies some detail information about the Event, depending * on the type of event. */ - public native int getDetail(); + public int getDetail() { + return nativeGetDetail(); + } + public native int nativeGetDetail(); + /** * @@ -65,10 +73,19 @@ public class UIEventImpl extends EventImpl implements UIEvent { * AbstractView. * @param detailArg Specifies the Event's detail. */ - public native void initUIEvent(String typeArg, - boolean canBubbleArg, - boolean cancelableArg, - AbstractView viewArg, - int detailArg); + public void initUIEvent(String typeArg, + boolean canBubbleArg, + boolean cancelableArg, + AbstractView viewArg, + int detailArg) { + nativeInitUIEvent(typeArg, canBubbleArg, cancelableArg, viewArg, + detailArg); + } + native void nativeInitUIEvent(String typeArg, + boolean canBubbleArg, + boolean cancelableArg, + AbstractView viewArg, + int detailArg); + } diff --git a/mozilla/java/dom/jni/org_mozilla_dom_AttrImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_AttrImpl.cpp index 32c9821a7ab..ef8d809b198 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_AttrImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_AttrImpl.cpp @@ -29,7 +29,7 @@ * Method: getName * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_AttrImpl_getName +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_AttrImpl_nativeGetName (JNIEnv *env, jobject jthis) { nsIDOMAttr* attr = (nsIDOMAttr*) @@ -62,7 +62,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_AttrImpl_getName * Method: getSpecified * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_AttrImpl_getSpecified +JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_AttrImpl_nativeGetSpecified (JNIEnv *env, jobject jthis) { nsIDOMAttr* attr = (nsIDOMAttr*) @@ -89,7 +89,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_AttrImpl_getSpecified * Method: getValue * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_AttrImpl_getValue +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_AttrImpl_nativeGetValue (JNIEnv *env, jobject jthis) { nsIDOMAttr* attr = (nsIDOMAttr*) @@ -122,7 +122,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_AttrImpl_getValue * Method: setValue * Signature: (Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_AttrImpl_setValue +JNIEXPORT void JNICALL Java_org_mozilla_dom_AttrImpl_nativeSetValue (JNIEnv *env, jobject jthis, jstring jval) { nsIDOMAttr* attr = (nsIDOMAttr*) @@ -153,7 +153,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_AttrImpl_setValue * Method: getOwnerElement * Signature: ()Lorg/w3c/dom/Element; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_AttrImpl_getOwnerElement +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_AttrImpl_nativeGetOwnerElement (JNIEnv *env, jobject jthis) { nsIDOMAttr* attr = (nsIDOMAttr*) diff --git a/mozilla/java/dom/jni/org_mozilla_dom_CharacterDataImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_CharacterDataImpl.cpp index 5909feb1b50..efa4de33d97 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_CharacterDataImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_CharacterDataImpl.cpp @@ -30,7 +30,7 @@ * Method: appendData * Signature: (Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_appendData +JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_nativeAppendData (JNIEnv *env, jobject jthis, jstring jvalue) { nsIDOMCharacterData* data = (nsIDOMCharacterData*) @@ -64,7 +64,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_appendData * Method: deleteData * Signature: (II)V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_deleteData +JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_nativeDeleteData (JNIEnv *env, jobject jthis, jint offset, jint count) { if (offset < 0 || offset > JavaDOMGlobals::javaMaxInt || @@ -102,7 +102,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_deleteData * Method: getData * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_CharacterDataImpl_getData +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_CharacterDataImpl_nativeGetData (JNIEnv *env, jobject jthis) { nsIDOMCharacterData* data = (nsIDOMCharacterData*) @@ -139,7 +139,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_CharacterDataImpl_getData * Method: getLength * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_mozilla_dom_CharacterDataImpl_getLength +JNIEXPORT jint JNICALL Java_org_mozilla_dom_CharacterDataImpl_nativeGetLength (JNIEnv *env, jobject jthis) { nsIDOMCharacterData* data = (nsIDOMCharacterData*) @@ -166,7 +166,7 @@ JNIEXPORT jint JNICALL Java_org_mozilla_dom_CharacterDataImpl_getLength * Method: insertData * Signature: (ILjava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_insertData +JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_nativeInsertData (JNIEnv *env, jobject jthis, jint offset, jstring jvalue) { nsIDOMCharacterData* data = (nsIDOMCharacterData*) @@ -202,7 +202,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_insertData * Method: replaceData * Signature: (IILjava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_replaceData +JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_nativeReplaceData (JNIEnv *env, jobject jthis, jint offset, jint count, jstring jvalue) { if (offset < 0 || offset > JavaDOMGlobals::javaMaxInt || @@ -246,7 +246,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_replaceData * Method: setData * Signature: (Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_setData +JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_nativeSetData (JNIEnv *env, jobject jthis, jstring jvalue) { nsIDOMCharacterData* data = (nsIDOMCharacterData*) @@ -280,7 +280,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_setData * Method: substringData * Signature: (II)Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_CharacterDataImpl_substringData +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_CharacterDataImpl_nativeSubstringData (JNIEnv *env, jobject jthis, jint offset, jint count) { if (offset < 0 || offset > JavaDOMGlobals::javaMaxInt || diff --git a/mozilla/java/dom/jni/org_mozilla_dom_DOMAccessor.cpp b/mozilla/java/dom/jni/org_mozilla_dom_DOMAccessor.cpp index 4b12709f3e4..59eb358bad2 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_DOMAccessor.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_DOMAccessor.cpp @@ -17,7 +17,7 @@ static NS_DEFINE_IID(kJavaDOMCID, NS_JAVADOM_CID); * Method: register * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_register +JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_nativeRegister (JNIEnv *env, jclass jthis) { if (!JavaDOMGlobals::log) { @@ -62,7 +62,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_register * Method: unregister * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_unregister +JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_nativeUnregister (JNIEnv *, jclass jthis) { PR_LOG(JavaDOMGlobals::log, PR_LOG_DEBUG, @@ -107,7 +107,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_unregister * Method: createElement * Signature: (J)Lorg/w3c/dom/Element; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DOMAccessor_getNodeByHandle +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DOMAccessor_nativeGetNodeByHandle (JNIEnv *env, jclass jthis, jlong p) { if (!JavaDOMGlobals::log) { @@ -122,13 +122,13 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DOMAccessor_getNodeByHandle * Method: doGC * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_doGC +JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_nativeDoGC (JNIEnv *, jclass) { JavaDOMGlobals::TakeOutGarbage(); } -JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_initialize +JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_nativeInitialize (JNIEnv *env, jclass) { if (!JavaDOMGlobals::log) { diff --git a/mozilla/java/dom/jni/org_mozilla_dom_DOMImplementationImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_DOMImplementationImpl.cpp index 38bb2e41060..0ef8b6f01e6 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_DOMImplementationImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_DOMImplementationImpl.cpp @@ -32,7 +32,7 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); * Method: XPCOM_equals * Signature: (Ljava/lang/Object;)Z */ -JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_DOMImplementationImpl_XPCOM_1equals +JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_DOMImplementationImpl_nativeXPCOM_1equals (JNIEnv *env, jobject jthis, jobject jarg) { jboolean b_retFlag = JNI_FALSE; @@ -89,7 +89,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_DOMImplementationImpl_XPCOM_1equ * Method: XPCOM_hashCode * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_mozilla_dom_DOMImplementationImpl_XPCOM_1hashCode +JNIEXPORT jint JNICALL Java_org_mozilla_dom_DOMImplementationImpl_nativeXPCOM_1hashCode (JNIEnv *env, jobject jthis) { nsIDOMDOMImplementation* p_this = (nsIDOMDOMImplementation*) @@ -119,7 +119,7 @@ JNIEXPORT jint JNICALL Java_org_mozilla_dom_DOMImplementationImpl_XPCOM_1hashCod * Method: finalize * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMImplementationImpl_finalize +JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMImplementationImpl_nativeFinalize (JNIEnv *env, jobject jthis) { nsIDOMDOMImplementation* dom = (nsIDOMDOMImplementation*) @@ -138,7 +138,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMImplementationImpl_finalize * Method: hasFeature * Signature: (Ljava/lang/String;Ljava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_DOMImplementationImpl_hasFeature +JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_DOMImplementationImpl_nativeHasFeature (JNIEnv *env, jobject jthis, jstring jfeature, jstring jversion) { nsIDOMDOMImplementation* dom = (nsIDOMDOMImplementation*) @@ -182,7 +182,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_DOMImplementationImpl_hasFeature * Method: createDocumentType * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/DocumentType; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DOMImplementationImpl_createDocumentType +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DOMImplementationImpl_nativeCreateDocumentType (JNIEnv *env, jobject jthis, jstring jqualifiedName, jstring jpublicID, jstring jsystemID) { nsIDOMDOMImplementation* dom = (nsIDOMDOMImplementation*) @@ -236,7 +236,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DOMImplementationImpl_createDocum * Method: createDocument * Signature: (Ljava/lang/String;Ljava/lang/String;Lorg/w3c/dom/DocumentType;)Lorg/w3c/dom/Document; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DOMImplementationImpl_createDocument +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DOMImplementationImpl_nativeCreateDocument (JNIEnv *env, jobject jthis, jstring jnamespaceURI, jstring jqualifiedName, jobject jdoctype) { nsIDOMDOMImplementation* dom = (nsIDOMDOMImplementation*) diff --git a/mozilla/java/dom/jni/org_mozilla_dom_DocumentImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_DocumentImpl.cpp index 643b0a4067c..a2de3f82b89 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_DocumentImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_DocumentImpl.cpp @@ -51,7 +51,7 @@ static NS_DEFINE_IID(kIDOMDocumentEventIID, NS_IDOMDOCUMENTEVENT_IID); * Method: createAttribute * Signature: (Ljava/lang/String;)Lorg/w3c/dom/Attr; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createAttribute +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_nativeCreateAttribute (JNIEnv *env, jobject jthis, jstring jname) { nsIDOMDocument* doc = (nsIDOMDocument*) @@ -104,7 +104,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createAttribute * Method: createCDATASection * Signature: (Ljava/lang/String;)Lorg/w3c/dom/CDATASection; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createCDATASection +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_nativeCreateCDATASection (JNIEnv *env, jobject jthis, jstring jdata) { nsIDOMDocument* doc = (nsIDOMDocument*) @@ -156,7 +156,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createCDATASection * Method: createComment * Signature: (Ljava/lang/String;)Lorg/w3c/dom/Comment; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createComment +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_nativeCreateComment (JNIEnv *env, jobject jthis, jstring jdata) { nsIDOMDocument* doc = (nsIDOMDocument*) @@ -204,7 +204,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createComment * Method: createDocumentFragment * Signature: ()Lorg/w3c/dom/DocumentFragment; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createDocumentFragment +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_nativeCreateDocumentFragment (JNIEnv *env, jobject jthis) { nsIDOMDocument* doc = (nsIDOMDocument*) @@ -246,7 +246,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createDocumentFragme * Method: createElement * Signature: (Ljava/lang/String;)Lorg/w3c/dom/Element; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createElement +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_nativeCreateElement (JNIEnv *env, jobject jthis, jstring jtagName) { nsIDOMDocument* doc = (nsIDOMDocument*) @@ -298,7 +298,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createElement * Method: createEntityReference * Signature: (Ljava/lang/String;)Lorg/w3c/dom/EntityReference; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createEntityReference +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_nativeCreateEntityReference (JNIEnv *env, jobject jthis, jstring jname) { nsIDOMDocument* doc = (nsIDOMDocument*) @@ -352,7 +352,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createEntityReferenc * Method: createProcessingInstruction * Signature: (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/ProcessingInstruction; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createProcessingInstruction +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_nativeCreateProcessingInstruction (JNIEnv *env, jobject jthis, jstring jtarget, jstring jdata) { nsIDOMDocument* doc = (nsIDOMDocument*) @@ -414,7 +414,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createProcessingInst * Method: createTextNode * Signature: (Ljava/lang/String;)Lorg/w3c/dom/Text; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createTextNode +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_nativeCreateTextNode (JNIEnv *env, jobject jthis, jstring jdata) { nsIDOMDocument* doc = (nsIDOMDocument*) @@ -462,7 +462,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createTextNode * Method: getDoctype * Signature: ()Lorg/w3c/dom/DocumentType; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_getDoctype +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_nativeGetDoctype (JNIEnv *env, jobject jthis) { nsIDOMDocument* doc = (nsIDOMDocument*) @@ -503,7 +503,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_getDoctype * Method: getDocumentElement * Signature: ()Lorg/w3c/dom/Element; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_getDocumentElement +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_nativeGetDocumentElement (JNIEnv *env, jobject jthis) { nsIDOMDocument* doc = (nsIDOMDocument*) @@ -545,7 +545,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_getDocumentElement * Method: getElementsByTagName * Signature: (Ljava/lang/String;)Lorg/w3c/dom/NodeList; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_getElementsByTagName +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_nativeGetElementsByTagName (JNIEnv *env, jobject jthis, jstring jtagName) { nsIDOMDocument* doc = (nsIDOMDocument*) @@ -593,7 +593,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_getElementsByTagName * Method: getImplementation * Signature: ()Lorg/w3c/dom/DOMImplementation; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_getImplementation +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_nativeGetImplementation (JNIEnv *env, jobject jthis) { nsIDOMDocument* doc = (nsIDOMDocument*) @@ -635,7 +635,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_getImplementation * Method: createEvent * Signature: (Ljava/lang/String;)Lorg/w3c/dom/events/Event; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createEvent +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_nativeCreateEvent (JNIEnv *env, jobject jthis, jstring jtype) { nsISupports *doc = (nsISupports*) @@ -676,7 +676,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createEvent * Method: getElementsByTagNameNS * Signature: (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/NodeList; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_getElementsByTagNameNS +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_nativeGetElementsByTagNameNS (JNIEnv *env, jobject jthis, jstring jnamespaceURI, jstring jlocalName) { nsIDOMDocument* doc = (nsIDOMDocument*) @@ -732,7 +732,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_getElementsByTagName * Method: getElementById * Signature: (Ljava/lang/String;)Lorg/w3c/dom/Element; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_getElementById +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_nativeGetElementById (JNIEnv *env, jobject jthis, jstring jelementId) { nsIDOMDocument* doc = (nsIDOMDocument*) @@ -765,7 +765,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_getElementById * Method: getDocumentURI * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_DocumentImpl_getDocumentURI +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_DocumentImpl_nativeGetDocumentURI (JNIEnv *env, jobject jthis) { nsIDOMDocument* doc = (nsIDOMDocument*) diff --git a/mozilla/java/dom/jni/org_mozilla_dom_ElementImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_ElementImpl.cpp index 4a5db867b82..94cb0c5d3c4 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_ElementImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_ElementImpl.cpp @@ -42,7 +42,7 @@ static jstring handleInterceptableAttr(nsIDOMElement *element, * Method: getAttribute * Signature: (Ljava/lang/String;)Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ElementImpl_getAttribute +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ElementImpl_nativeGetAttribute (JNIEnv *env, jobject jthis, jstring jname) { jstring jattr = nsnull; @@ -90,7 +90,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ElementImpl_getAttribute * Method: getAttributeNode * Signature: (Ljava/lang/String;)Lorg/w3c/dom/Attr; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_getAttributeNode +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_nativeGetAttributeNode (JNIEnv *env, jobject jthis, jstring jname) { nsIDOMElement* element = (nsIDOMElement*) @@ -140,7 +140,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_getAttributeNode * Method: getElementsByTagName * Signature: (Ljava/lang/String;)Lorg/w3c/dom/NodeList; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_getElementsByTagName +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_nativeGetElementsByTagName (JNIEnv *env, jobject jthis, jstring jname) { nsIDOMElement* element = (nsIDOMElement*) @@ -188,7 +188,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_getElementsByTagName * Method: getTagName * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ElementImpl_getTagName +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ElementImpl_nativeGetTagName (JNIEnv *env, jobject jthis) { nsIDOMElement* element = (nsIDOMElement*) @@ -222,7 +222,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ElementImpl_getTagName * Method: normalize * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_normalize +JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_nativeNormalize (JNIEnv *env, jobject jthis) { nsIDOMElement* element = (nsIDOMElement*) @@ -246,7 +246,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_normalize * Method: removeAttribute * Signature: (Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_removeAttribute +JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_nativeRemoveAttribute (JNIEnv *env, jobject jthis, jstring jname) { nsIDOMElement* element = (nsIDOMElement*) @@ -280,7 +280,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_removeAttribute * Method: removeAttributeNode * Signature: (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_removeAttributeNode +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_nativeRemoveAttributeNode (JNIEnv *env, jobject jthis, jobject joldAttr) { nsIDOMElement* element = (nsIDOMElement*) @@ -336,7 +336,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_removeAttributeNode * Method: setAttribute * Signature: (Ljava/lang/String;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_setAttribute +JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_nativeSetAttribute (JNIEnv *env, jobject jthis, jstring jname, jstring jvalue) { nsIDOMElement* element = (nsIDOMElement*) @@ -379,7 +379,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_setAttribute * Method: setAttributeNode * Signature: (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_setAttributeNode +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_nativeSetAttributeNode (JNIEnv *env, jobject jthis, jobject jnewAttr) { nsIDOMElement* element = (nsIDOMElement*) @@ -438,7 +438,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_setAttributeNode * Method: getAttributeNS * Signature: (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ElementImpl_getAttributeNS +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ElementImpl_nativeGetAttributeNS (JNIEnv *env, jobject jthis, jstring jnamespaceURI, jstring jlocalName) { nsIDOMElement* element = (nsIDOMElement*) @@ -484,7 +484,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ElementImpl_getAttributeNS * Method: setAttributeNS * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_setAttributeNS +JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_nativeSetAttributeNS (JNIEnv *env, jobject jthis, jstring jnamespaceURI, jstring jqualifiedName, jstring jvalue) { nsIDOMElement* element = (nsIDOMElement*) @@ -535,7 +535,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_setAttributeNS * Method: removeAttributeNS * Signature: (Ljava/lang/String;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_removeAttributeNS +JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_nativeRemoveAttributeNS (JNIEnv *env, jobject jthis, jstring jnamespaceURI, jstring jlocalName) { nsIDOMElement* element = (nsIDOMElement*) @@ -575,10 +575,10 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_removeAttributeNS * Method: getAttributeNodeNS * Signature: (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/Attr; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_getAttributeNodeNS +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_nativeGetAttributeNodeNS (JNIEnv *env, jobject jthis, jstring jnamespaceURI, jstring jlocalName) { - nsIDOMElement* element = (nsIDOMElement*) + nsIDOMElement* element = (nsIDOMElement*) env->GetLongField(jthis, JavaDOMGlobals::nodePtrFID); if (!element || !jnamespaceURI || !jlocalName) { JavaDOMGlobals::ThrowException(env, @@ -618,7 +618,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_getAttributeNodeNS * Method: setAttributeNodeNS * Signature: (Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_setAttributeNodeNS +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_nativeSetAttributeNodeNS (JNIEnv *env, jobject jthis, jobject jnewAttr) { nsIDOMElement* element = (nsIDOMElement*) @@ -662,7 +662,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_setAttributeNodeNS * Method: getElementsByTagNameNS * Signature: (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/NodeList; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_getElementsByTagNameNS +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_nativeGetElementsByTagNameNS (JNIEnv *env, jobject jthis, jstring jnamespaceURI, jstring jlocalName) { nsIDOMElement* element = (nsIDOMElement*) @@ -717,7 +717,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_ElementImpl_getElementsByTagNameN * Method: hasAttribute * Signature: (Ljava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_ElementImpl_hasAttribute +JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_ElementImpl_nativeHasAttribute (JNIEnv *env, jobject jthis, jstring jname) { nsIDOMElement* element = (nsIDOMElement*) @@ -751,7 +751,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_ElementImpl_hasAttribute * Method: hasAttributeNS * Signature: (Ljava/lang/String;Ljava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_ElementImpl_hasAttributeNS +JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_ElementImpl_nativeHasAttributeNS (JNIEnv *env, jobject jthis, jstring jnamespaceURI, jstring jlocalName) { nsIDOMElement* element = (nsIDOMElement*) diff --git a/mozilla/java/dom/jni/org_mozilla_dom_EntityImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_EntityImpl.cpp index 5fa01b1695f..435a275a694 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_EntityImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_EntityImpl.cpp @@ -30,7 +30,7 @@ * Method: getNotationName * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_EntityImpl_getNotationName +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_EntityImpl_nativeGetNotationName (JNIEnv *env, jobject jthis) { nsIDOMEntity* entity = (nsIDOMEntity*) @@ -64,7 +64,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_EntityImpl_getNotationName * Method: getPublicId * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_EntityImpl_getPublicId +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_EntityImpl_nativeGetPublicId (JNIEnv *env, jobject jthis) { nsIDOMEntity* entity = (nsIDOMEntity*) @@ -98,7 +98,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_EntityImpl_getPublicId * Method: getSystemId * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_EntityImpl_getSystemId +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_EntityImpl_nativeGetSystemId (JNIEnv *env, jobject jthis) { nsIDOMEntity* entity = (nsIDOMEntity*) diff --git a/mozilla/java/dom/jni/org_mozilla_dom_NamedNodeMapImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_NamedNodeMapImpl.cpp index fd290b06828..5808afb3253 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_NamedNodeMapImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_NamedNodeMapImpl.cpp @@ -32,7 +32,7 @@ * Method: getLength * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_mozilla_dom_NamedNodeMapImpl_getLength +JNIEXPORT jint JNICALL Java_org_mozilla_dom_NamedNodeMapImpl_nativeGetLength (JNIEnv *env, jobject jthis) { nsIDOMNamedNodeMap* map = (nsIDOMNamedNodeMap*) @@ -59,7 +59,7 @@ JNIEXPORT jint JNICALL Java_org_mozilla_dom_NamedNodeMapImpl_getLength * Method: getNamedItem * Signature: (Ljava/lang/String;)Lorg/w3c/dom/Node; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NamedNodeMapImpl_getNamedItem +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NamedNodeMapImpl_nativeGetNamedItem (JNIEnv *env, jobject jthis, jstring jname) { nsIDOMNamedNodeMap* map = (nsIDOMNamedNodeMap*) @@ -94,7 +94,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NamedNodeMapImpl_getNamedItem * Method: item * Signature: (I)Lorg/w3c/dom/Node; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NamedNodeMapImpl_item +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NamedNodeMapImpl_nativeItem (JNIEnv *env, jobject jthis, jint jindex) { if (jindex < 0 || jindex > JavaDOMGlobals::javaMaxInt) { @@ -129,7 +129,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NamedNodeMapImpl_item * Method: removeNamedItem * Signature: (Ljava/lang/String;)Lorg/w3c/dom/Node; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NamedNodeMapImpl_removeNamedItem +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NamedNodeMapImpl_nativeRemoveNamedItem (JNIEnv *env, jobject jthis, jstring jname) { nsIDOMNamedNodeMap* map = (nsIDOMNamedNodeMap*) @@ -166,7 +166,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NamedNodeMapImpl_removeNamedItem * Method: setNamedItem * Signature: (Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NamedNodeMapImpl_setNamedItem +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NamedNodeMapImpl_nativeSetNamedItem (JNIEnv *env, jobject jthis, jobject jarg) { nsIDOMNamedNodeMap* map = (nsIDOMNamedNodeMap*) diff --git a/mozilla/java/dom/jni/org_mozilla_dom_NodeImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_NodeImpl.cpp index 05804f784a0..81884fe3ab7 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_NodeImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_NodeImpl.cpp @@ -129,7 +129,7 @@ static NS_DEFINE_IID(kIDOMEventTargetIID, NS_IDOMEVENTTARGET_IID); OMDNI_didCall = PR_FALSE; \ } -JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_NodeImpl_XPCOM_1equals +JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_NodeImpl_nativeXPCOM_1equals (JNIEnv *env, jobject jthis, jobject nodeArg) { jboolean b_retFlag = JNI_FALSE; @@ -182,7 +182,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_NodeImpl_XPCOM_1equals return b_retFlag; } -JNIEXPORT jint JNICALL Java_org_mozilla_dom_NodeImpl_XPCOM_1hashCode +JNIEXPORT jint JNICALL Java_org_mozilla_dom_NodeImpl_nativeXPCOM_1hashCode (JNIEnv *env, jobject jthis) { nsIDOMNode* p_thisNode = @@ -211,7 +211,7 @@ JNIEXPORT jint JNICALL Java_org_mozilla_dom_NodeImpl_XPCOM_1hashCode * Method: isSupported * Signature: (Ljava/lang/String;Ljava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_NodeImpl_isSupported +JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_NodeImpl_nativeIsSupported (JNIEnv *env, jobject jthis, jstring jfeature, jstring jversion) { nsIDOMNode* node = (nsIDOMNode*) @@ -256,7 +256,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_NodeImpl_isSupported * Method: hasAttributes * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_NodeImpl_hasAttributes +JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_NodeImpl_nativeHasAttributes (JNIEnv *env, jobject jthis) { nsIDOMNode* node = (nsIDOMNode*) @@ -284,7 +284,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_NodeImpl_hasAttributes * Method: finalize * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_NodeImpl_finalize +JNIEXPORT void JNICALL Java_org_mozilla_dom_NodeImpl_nativeFinalize (JNIEnv *env, jobject jthis) { nsIDOMNode* node = (nsIDOMNode*) @@ -303,7 +303,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_NodeImpl_finalize * Method: appendChild * Signature: (Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_appendChild +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_nativeAppendChild (JNIEnv *env, jobject jthis, jobject jchild) { nsIDOMNode* node = (nsIDOMNode*) @@ -345,7 +345,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_appendChild * Method: cloneNode * Signature: (Z)Lorg/w3c/dom/Node; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_cloneNode +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_nativeCloneNode (JNIEnv *env, jobject jthis, jboolean jdeep) { nsIDOMNode* node = (nsIDOMNode*) @@ -373,7 +373,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_cloneNode * Method: getAttributes * Signature: ()Lorg/w3c/dom/NamedNodeMap; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_getAttributes +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_nativeGetAttributes (JNIEnv *env, jobject jthis) { nsIDOMNode* node = (nsIDOMNode*) @@ -417,7 +417,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_getAttributes * Method: getChildNodes * Signature: ()Lorg/w3c/dom/NodeList; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_getChildNodes +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_nativeGetChildNodes (JNIEnv *env, jobject jthis) { nsIDOMNode* node = (nsIDOMNode*) @@ -459,7 +459,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_getChildNodes * Method: getFirstChild * Signature: ()Lorg/w3c/dom/Node; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_getFirstChild +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_nativeGetFirstChild (JNIEnv *env, jobject jthis) { nsIDOMNode* node = (nsIDOMNode*) @@ -488,7 +488,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_getFirstChild * Method: getLastChild * Signature: ()Lorg/w3c/dom/Node; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_getLastChild +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_nativeGetLastChild (JNIEnv *env, jobject jthis) { nsIDOMNode* node = (nsIDOMNode*) @@ -517,7 +517,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_getLastChild * Method: getNextSibling * Signature: ()Lorg/w3c/dom/Node; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_getNextSibling +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_nativeGetNextSibling (JNIEnv *env, jobject jthis) { nsIDOMNode* node = (nsIDOMNode*) @@ -543,7 +543,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_getNextSibling * Method: getNodeName * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getNodeName +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_nativeGetNodeName (JNIEnv *env, jobject jthis) { nsIDOMNode* node = (nsIDOMNode*) @@ -577,7 +577,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getNodeName * Method: getNodeType * Signature: ()S */ -JNIEXPORT jshort JNICALL Java_org_mozilla_dom_NodeImpl_getNodeType +JNIEXPORT jshort JNICALL Java_org_mozilla_dom_NodeImpl_nativeGetNodeType (JNIEnv *env, jobject jthis) { nsIDOMNode* node = (nsIDOMNode*) @@ -675,7 +675,7 @@ JNIEXPORT jshort JNICALL Java_org_mozilla_dom_NodeImpl_getNodeType * Method: getNodeValue * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getNodeValue +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_nativeGetNodeValue (JNIEnv *env, jobject jthis) { nsIDOMNode* node = (nsIDOMNode*) @@ -733,7 +733,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getNodeValue * Method: getTextContent * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getTextContent +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_nativeGetTextContent (JNIEnv *env, jobject jthis) { nsCOMPtr node = (nsIDOMNode*) @@ -775,7 +775,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getTextContent * Method: getOwnerDocument * Signature: ()Lorg/w3c/dom/Document; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_getOwnerDocument +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_nativeGetOwnerDocument (JNIEnv *env, jobject jthis) { nsIDOMNode* node = (nsIDOMNode*) @@ -816,7 +816,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_getOwnerDocument * Method: getParentNode * Signature: ()Lorg/w3c/dom/Node; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_getParentNode +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_nativeGetParentNode (JNIEnv *env, jobject jthis) { nsIDOMNode* node = (nsIDOMNode*) @@ -842,7 +842,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_getParentNode * Method: getPreviousSibling * Signature: ()Lorg/w3c/dom/Node; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_getPreviousSibling +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_nativeGetPreviousSibling (JNIEnv *env, jobject jthis) { nsIDOMNode* node = (nsIDOMNode*) @@ -871,7 +871,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_getPreviousSibling * Method: hasChildNodes * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_NodeImpl_hasChildNodes +JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_NodeImpl_nativeHasChildNodes (JNIEnv *env, jobject jthis) { nsIDOMNode* node = (nsIDOMNode*) @@ -898,7 +898,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_NodeImpl_hasChildNodes * Method: insertBefore * Signature: (Lorg/w3c/dom/Node;Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_insertBefore +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_nativeInsertBefore (JNIEnv *env, jobject jthis, jobject jnewChild, jobject jrefChild) { nsIDOMNode* node = (nsIDOMNode*) @@ -952,7 +952,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_insertBefore * Method: removeChild * Signature: (Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_removeChild +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_nativeRemoveChild (JNIEnv *env, jobject jthis, jobject joldChild) { nsIDOMNode* node = (nsIDOMNode*) @@ -993,7 +993,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_removeChild * Method: replaceChild * Signature: (Lorg/w3c/dom/Node;Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_replaceChild +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_nativeReplaceChild (JNIEnv *env, jobject jthis, jobject jnewChild, jobject joldChild) { nsIDOMNode* node = (nsIDOMNode*) @@ -1044,7 +1044,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeImpl_replaceChild * Method: setNodeValue * Signature: (Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_NodeImpl_setNodeValue +JNIEXPORT void JNICALL Java_org_mozilla_dom_NodeImpl_nativeSetNodeValue (JNIEnv *env, jobject jthis, jstring jvalue) { nsIDOMNode* node = (nsIDOMNode*) @@ -1100,7 +1100,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_NodeImpl_setNodeValue * Method: addNativeEventListener * Signature: (Ljava/lang/String;Lorg/w3c/dom/events/EventListener;Z)J */ -JNIEXPORT jlong JNICALL Java_org_mozilla_dom_NodeImpl_addNativeEventListener +JNIEXPORT jlong JNICALL Java_org_mozilla_dom_NodeImpl_nativeAddNativeEventListener (JNIEnv *env, jobject jthis, jstring jtype, jobject jlistener, jboolean juseCapture) { nsIDOMEventListener *listener = NULL; @@ -1148,7 +1148,7 @@ JNIEXPORT jlong JNICALL Java_org_mozilla_dom_NodeImpl_addNativeEventListener * Method: removeNativeEventListener * Signature: (Ljava/lang/String;JZ)V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_NodeImpl_removeNativeEventListener +JNIEXPORT void JNICALL Java_org_mozilla_dom_NodeImpl_nativeRemoveNativeEventListener (JNIEnv *env, jobject jthis, jstring jtype, jlong jlistener, jboolean juseCapture) { PRBool useCapture; @@ -1193,7 +1193,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_NodeImpl_removeNativeEventListener * Method: supports * Signature: (Ljava/lang/String;Ljava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_NodeImpl_supports +JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_NodeImpl_nativeSupports (JNIEnv *env, jobject jthis, jstring jfeature, jstring jversion) { nsIDOMNode* node = (nsIDOMNode*) @@ -1237,7 +1237,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_NodeImpl_supports * Method: getNamespaceURI * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getNamespaceURI +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_nativeGetNamespaceURI (JNIEnv *env, jobject jthis) { nsIDOMNode* node = (nsIDOMNode*) @@ -1271,7 +1271,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getNamespaceURI * Method: getPrefix * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getPrefix +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_nativeGetPrefix (JNIEnv *env, jobject jthis) { nsIDOMNode* node = (nsIDOMNode*) @@ -1305,7 +1305,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getPrefix * Method: setPrefix * Signature: (Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_NodeImpl_setPrefix +JNIEXPORT void JNICALL Java_org_mozilla_dom_NodeImpl_nativeSetPrefix (JNIEnv *env, jobject jthis, jstring jprefix) { nsIDOMNode* node = (nsIDOMNode*) @@ -1341,7 +1341,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_NodeImpl_setPrefix * Method: getLocalName * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getLocalName +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_nativeGetLocalName (JNIEnv *env, jobject jthis) { nsIDOMNode* node = (nsIDOMNode*) diff --git a/mozilla/java/dom/jni/org_mozilla_dom_NodeListImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_NodeListImpl.cpp index af0127e9d64..ad512ef1a57 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_NodeListImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_NodeListImpl.cpp @@ -32,7 +32,7 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); * Method: XPCOM_equals * Signature: (Ljava/lang/Object;)Z */ -JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_NodeListImpl_XPCOM_1equals +JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_NodeListImpl_nativeXPCOM_1equals (JNIEnv *env, jobject jthis, jobject jarg) { jboolean b_retFlag = JNI_FALSE; @@ -87,7 +87,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_NodeListImpl_XPCOM_1equals * Method: XPCOM_hashCode * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_mozilla_dom_NodeListImpl_XPCOM_1hashCode +JNIEXPORT jint JNICALL Java_org_mozilla_dom_NodeListImpl_nativeXPCOM_1hashCode (JNIEnv *env, jobject jthis) { nsIDOMNodeList* p_this = @@ -116,7 +116,7 @@ JNIEXPORT jint JNICALL Java_org_mozilla_dom_NodeListImpl_XPCOM_1hashCode * Method: finalize * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_NodeListImpl_finalize +JNIEXPORT void JNICALL Java_org_mozilla_dom_NodeListImpl_nativeFinalize (JNIEnv *env, jobject jthis) { nsIDOMNodeList* nodes = (nsIDOMNodeList*) @@ -135,7 +135,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_NodeListImpl_finalize * Method: getLength * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_mozilla_dom_NodeListImpl_getLength +JNIEXPORT jint JNICALL Java_org_mozilla_dom_NodeListImpl_nativeGetLength (JNIEnv *env, jobject jthis) { nsIDOMNodeList* nodes = (nsIDOMNodeList*) @@ -162,7 +162,7 @@ JNIEXPORT jint JNICALL Java_org_mozilla_dom_NodeListImpl_getLength * Method: item * Signature: (I)Lorg/w3c/dom/Node; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeListImpl_item +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_NodeListImpl_nativeItem (JNIEnv *env, jobject jthis, jint jindex) { if (jindex < 0 || jindex > JavaDOMGlobals::javaMaxInt) { diff --git a/mozilla/java/dom/jni/org_mozilla_dom_NotationImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_NotationImpl.cpp index a20ab504bdd..690e946fbb7 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_NotationImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_NotationImpl.cpp @@ -30,7 +30,7 @@ * Method: getPublicId * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NotationImpl_getPublicId +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NotationImpl_nativeGetPublicId (JNIEnv *env, jobject jthis) { nsIDOMNotation* notation = (nsIDOMNotation*) @@ -64,7 +64,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NotationImpl_getPublicId * Method: getSystemId * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NotationImpl_getSystemId +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NotationImpl_nativeGetSystemId (JNIEnv *env, jobject jthis) { nsIDOMNotation* notation = (nsIDOMNotation*) diff --git a/mozilla/java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.cpp index 1fa444d0083..077d58d7711 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.cpp @@ -31,7 +31,7 @@ * Method: getData * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ProcessingInstructionImpl_getData +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ProcessingInstructionImpl_nativeGetData (JNIEnv *env, jobject jthis) { nsIDOMProcessingInstruction* pi = (nsIDOMProcessingInstruction*) @@ -65,7 +65,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ProcessingInstructionImpl_getData * Method: getTarget * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ProcessingInstructionImpl_getTarget +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ProcessingInstructionImpl_nativeGetTarget (JNIEnv *env, jobject jthis) { nsIDOMProcessingInstruction* pi = (nsIDOMProcessingInstruction*) @@ -99,7 +99,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ProcessingInstructionImpl_getTarg * Method: setData * Signature: (Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_ProcessingInstructionImpl_setData +JNIEXPORT void JNICALL Java_org_mozilla_dom_ProcessingInstructionImpl_nativeSetData (JNIEnv *env, jobject jthis, jstring jdata) { nsIDOMProcessingInstruction* pi = (nsIDOMProcessingInstruction*) diff --git a/mozilla/java/dom/jni/org_mozilla_dom_events_EventImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_events_EventImpl.cpp index e23f07e041e..aa5fa340fec 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_events_EventImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_events_EventImpl.cpp @@ -35,7 +35,7 @@ * Method: getCurrentTarget * Signature: ()Lorg/w3c/dom/events/EventTarget; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_events_EventImpl_getCurrentTarget +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_events_EventImpl_nativeGetCurrentTarget (JNIEnv *env, jobject jthis) { nsIDOMEvent* event = (nsIDOMEvent*) @@ -66,7 +66,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_events_EventImpl_getCurrentTarget * Method: getEventPhase * Signature: ()S */ -JNIEXPORT jshort JNICALL Java_org_mozilla_dom_events_EventImpl_getEventPhase +JNIEXPORT jshort JNICALL Java_org_mozilla_dom_events_EventImpl_nativeGetEventPhase (JNIEnv *env, jobject jthis) { nsIDOMEvent* event = (nsIDOMEvent*) @@ -120,7 +120,7 @@ JNIEXPORT jshort JNICALL Java_org_mozilla_dom_events_EventImpl_getEventPhase * Method: getBubbles * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_events_EventImpl_getBubbles +JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_events_EventImpl_nativeGetBubbles (JNIEnv *env, jobject jthis) { nsIDOMEvent* event = (nsIDOMEvent*) @@ -147,7 +147,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_events_EventImpl_getBubbles * Method: getCancelable * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_events_EventImpl_getCancelable +JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_events_EventImpl_nativeGetCancelable (JNIEnv *env, jobject jthis) { nsIDOMEvent* event = (nsIDOMEvent*) @@ -174,7 +174,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_events_EventImpl_getCancelable * Method: getTarget * Signature: ()Lorg/w3c/dom/events/EventTarget; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_events_EventImpl_getTarget +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_events_EventImpl_nativeGetTarget (JNIEnv *env, jobject jthis) { nsIDOMEvent* event = (nsIDOMEvent*) @@ -204,7 +204,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_events_EventImpl_getTarget * Method: getType * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_mozilla_dom_events_EventImpl_getType +JNIEXPORT jstring JNICALL Java_org_mozilla_dom_events_EventImpl_nativeGetType (JNIEnv *env, jobject jthis) { nsIDOMEvent* event = (nsIDOMEvent*) @@ -238,7 +238,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_events_EventImpl_getType * Method: preventBubble * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_events_EventImpl_preventBubble +JNIEXPORT void JNICALL Java_org_mozilla_dom_events_EventImpl_nativePreventBubble (JNIEnv *env, jobject jthis) { nsIDOMEvent* domEvent = (nsIDOMEvent*) @@ -267,7 +267,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_events_EventImpl_preventBubble * Method: preventCapture * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_events_EventImpl_preventCapture +JNIEXPORT void JNICALL Java_org_mozilla_dom_events_EventImpl_nativePreventCapture (JNIEnv *env, jobject jthis) { nsIDOMEvent* domEvent = (nsIDOMEvent*) @@ -296,7 +296,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_events_EventImpl_preventCapture * Method: preventDefault * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_events_EventImpl_preventDefault +JNIEXPORT void JNICALL Java_org_mozilla_dom_events_EventImpl_nativePreventDefault (JNIEnv *env, jobject jthis) { nsIDOMEvent* event = (nsIDOMEvent*) @@ -319,7 +319,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_events_EventImpl_preventDefault * Method: initEvent * Signature: (Ljava/lang/String;ZZ)V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_events_EventImpl_initEvent +JNIEXPORT void JNICALL Java_org_mozilla_dom_events_EventImpl_nativeInitEvent (JNIEnv *env, jobject jthis, jstring jeventTypeArg, jboolean jcanBubbleArg, jboolean jcancelableArg) { nsIDOMEvent* event = (nsIDOMEvent*) @@ -351,7 +351,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_events_EventImpl_initEvent * Method: stopPropagation * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_events_EventImpl_stopPropagation +JNIEXPORT void JNICALL Java_org_mozilla_dom_events_EventImpl_nativeStopPropagation (JNIEnv *env, jobject jthis) { nsIDOMEvent* event = (nsIDOMEvent*) @@ -374,7 +374,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_events_EventImpl_stopPropagation * Method: getTimeStamp * Signature: ()J */ -JNIEXPORT jlong JNICALL Java_org_mozilla_dom_events_EventImpl_getTimeStamp +JNIEXPORT jlong JNICALL Java_org_mozilla_dom_events_EventImpl_nativeGetTimeStamp (JNIEnv *env, jobject jthis) { nsIDOMEvent* event = (nsIDOMEvent*) diff --git a/mozilla/java/dom/jni/org_mozilla_dom_events_MouseEventImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_events_MouseEventImpl.cpp index 8a107af3d2c..297ec48d40b 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_events_MouseEventImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_events_MouseEventImpl.cpp @@ -31,7 +31,7 @@ * Method: getAltKey * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getAltKey +JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_events_MouseEventImpl_nativeGetAltKey (JNIEnv *env, jobject jthis) { nsIDOMMouseEvent* event = (nsIDOMMouseEvent*) @@ -60,7 +60,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getAltKey * Method: getButton * Signature: ()S */ -JNIEXPORT jshort JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getButton +JNIEXPORT jshort JNICALL Java_org_mozilla_dom_events_MouseEventImpl_nativeGetButton (JNIEnv *env, jobject jthis) { nsIDOMMouseEvent* event = (nsIDOMMouseEvent*) @@ -87,7 +87,7 @@ JNIEXPORT jshort JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getButton * Method: getClientX * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getClientX +JNIEXPORT jint JNICALL Java_org_mozilla_dom_events_MouseEventImpl_nativeGetClientX (JNIEnv *env, jobject jthis) { nsIDOMMouseEvent* event = (nsIDOMMouseEvent*) @@ -114,7 +114,7 @@ JNIEXPORT jint JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getClientX * Method: getClientY * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getClientY +JNIEXPORT jint JNICALL Java_org_mozilla_dom_events_MouseEventImpl_nativeGetClientY (JNIEnv *env, jobject jthis) { nsIDOMMouseEvent* event = (nsIDOMMouseEvent*) @@ -142,7 +142,7 @@ JNIEXPORT jint JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getClientY * Method: getCtrlKey * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getCtrlKey +JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_events_MouseEventImpl_nativeGetCtrlKey (JNIEnv *env, jobject jthis) { nsIDOMMouseEvent* event = (nsIDOMMouseEvent*) @@ -170,7 +170,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getCtrlKey * Method: getMetaKey * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getMetaKey +JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_events_MouseEventImpl_nativeGetMetaKey (JNIEnv *env, jobject jthis) { nsIDOMMouseEvent* event = (nsIDOMMouseEvent*) @@ -198,7 +198,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getMetaKey * Method: getScreenX * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getScreenX +JNIEXPORT jint JNICALL Java_org_mozilla_dom_events_MouseEventImpl_nativeGetScreenX (JNIEnv *env, jobject jthis) { nsIDOMMouseEvent* event = (nsIDOMMouseEvent*) @@ -225,7 +225,7 @@ JNIEXPORT jint JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getScreenX * Method: getScreenY * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getScreenY +JNIEXPORT jint JNICALL Java_org_mozilla_dom_events_MouseEventImpl_nativeGetScreenY (JNIEnv *env, jobject jthis) { nsIDOMMouseEvent* event = (nsIDOMMouseEvent*) @@ -253,7 +253,7 @@ JNIEXPORT jint JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getScreenY * Method: getShiftKey * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getShiftKey +JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_events_MouseEventImpl_nativeGetShiftKey (JNIEnv *env, jobject jthis) { nsIDOMMouseEvent* event = (nsIDOMMouseEvent*) @@ -280,7 +280,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getShiftKe * Method: getRelatedTarget * Signature: ()Lorg/w3c/dom/events/EventTarget; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getRelatedTarget +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_events_MouseEventImpl_nativeGetRelatedTarget (JNIEnv *env, jobject jthis) { nsIDOMMouseEvent* event = (nsIDOMMouseEvent*) @@ -313,7 +313,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_events_MouseEventImpl_getRelatedT * Method: initMouseEvent * Signature: (Ljava/lang/String;ZZLorg/w3c/dom/views/AbstractView;IIIIIZZZZSLorg/w3c/dom/Node;)V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_events_MouseEventImpl_initMouseEvent +JNIEXPORT void JNICALL Java_org_mozilla_dom_events_MouseEventImpl_nativeInitMouseEvent (JNIEnv *env, jobject jthis, jstring jtypeArg, jboolean jcanBubbleArg, diff --git a/mozilla/java/dom/jni/org_mozilla_dom_events_UIEventImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_events_UIEventImpl.cpp index e8643c8b089..3ab4cc3f3b3 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_events_UIEventImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_events_UIEventImpl.cpp @@ -30,7 +30,7 @@ * Method: getView * Signature: ()Lorg/w3c/dom/views/AbstractView; */ -JNIEXPORT jobject JNICALL Java_org_mozilla_dom_events_UIEventImpl_getView +JNIEXPORT jobject JNICALL Java_org_mozilla_dom_events_UIEventImpl_nativeGetView (JNIEnv *env, jobject jthis) { nsIDOMUIEvent* event = (nsIDOMUIEvent*) @@ -58,7 +58,7 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_events_UIEventImpl_getView * Method: getDetail * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_mozilla_dom_events_UIEventImpl_getDetail +JNIEXPORT jint JNICALL Java_org_mozilla_dom_events_UIEventImpl_nativeGetDetail (JNIEnv *env, jobject jthis) { nsIDOMUIEvent* event = (nsIDOMUIEvent*) @@ -85,7 +85,7 @@ JNIEXPORT jint JNICALL Java_org_mozilla_dom_events_UIEventImpl_getDetail * Method: initUIEvent * Signature: (Ljava/lang/String;ZZLorg/w3c/dom/views/AbstractView;I)V */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_events_UIEventImpl_initUIEvent +JNIEXPORT void JNICALL Java_org_mozilla_dom_events_UIEventImpl_nativeInitUIEvent (JNIEnv *env, jobject jthis, jstring jtypeArg, jboolean jcanBubbleArg,