From 6230647e6f2726b32735f7dbb987ef1655c7496e Mon Sep 17 00:00:00 2001 From: "akhil.arora%sun.com" Date: Fri, 10 Sep 1999 20:11:45 +0000 Subject: [PATCH] Denis Sharypov eliminated redundant finalize methods git-svn-id: svn://10.0.0.236/trunk@46837 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/java/dom/jni/AttrImpl.java | 2 -- mozilla/java/dom/jni/CharacterDataImpl.java | 2 -- mozilla/java/dom/jni/DocumentImpl.java | 1 - mozilla/java/dom/jni/DocumentTypeImpl.java | 2 -- mozilla/java/dom/jni/ElementImpl.java | 2 -- mozilla/java/dom/jni/EntityImpl.java | 2 -- mozilla/java/dom/jni/NamedNodeMapImpl.java | 2 -- mozilla/java/dom/jni/NotationImpl.java | 2 -- .../dom/jni/ProcessingInstructionImpl.java | 2 -- mozilla/java/dom/jni/TextImpl.java | 2 -- .../java/dom/jni/org_mozilla_dom_AttrImpl.cpp | 18 ------------------ .../java/dom/jni/org_mozilla_dom_AttrImpl.h | 8 -------- .../jni/org_mozilla_dom_CharacterDataImpl.cpp | 19 ------------------- .../jni/org_mozilla_dom_CharacterDataImpl.h | 8 -------- .../dom/jni/org_mozilla_dom_DocumentImpl.cpp | 19 ------------------- .../dom/jni/org_mozilla_dom_DocumentImpl.h | 7 ------- .../jni/org_mozilla_dom_DocumentTypeImpl.cpp | 18 ------------------ .../jni/org_mozilla_dom_DocumentTypeImpl.h | 9 --------- .../dom/jni/org_mozilla_dom_ElementImpl.cpp | 18 ------------------ .../dom/jni/org_mozilla_dom_ElementImpl.h | 7 ------- .../dom/jni/org_mozilla_dom_EntityImpl.cpp | 18 ------------------ .../java/dom/jni/org_mozilla_dom_EntityImpl.h | 7 ------- .../jni/org_mozilla_dom_NamedNodeMapImpl.cpp | 18 ------------------ .../jni/org_mozilla_dom_NamedNodeMapImpl.h | 7 ------- .../dom/jni/org_mozilla_dom_NotationImpl.cpp | 18 ------------------ .../dom/jni/org_mozilla_dom_NotationImpl.h | 7 ------- ..._mozilla_dom_ProcessingInstructionImpl.cpp | 18 ------------------ ...rg_mozilla_dom_ProcessingInstructionImpl.h | 7 ------- .../java/dom/jni/org_mozilla_dom_TextImpl.cpp | 18 ------------------ .../java/dom/jni/org_mozilla_dom_TextImpl.h | 7 ------- 30 files changed, 275 deletions(-) diff --git a/mozilla/java/dom/jni/AttrImpl.java b/mozilla/java/dom/jni/AttrImpl.java index be59759d7c6..8a43dd251f2 100644 --- a/mozilla/java/dom/jni/AttrImpl.java +++ b/mozilla/java/dom/jni/AttrImpl.java @@ -27,6 +27,4 @@ public class AttrImpl extends NodeImpl implements Attr { public native boolean getSpecified(); public native String getValue(); public native void setValue(String value); - - protected native void finalize(); } diff --git a/mozilla/java/dom/jni/CharacterDataImpl.java b/mozilla/java/dom/jni/CharacterDataImpl.java index e314a3920be..84a9fa7f9ae 100644 --- a/mozilla/java/dom/jni/CharacterDataImpl.java +++ b/mozilla/java/dom/jni/CharacterDataImpl.java @@ -31,6 +31,4 @@ public class CharacterDataImpl extends NodeImpl implements CharacterData { public native void replaceData(int offset, int count, String arg); public native void setData(String data); public native String substringData(int offset, int count); - - protected native void finalize(); } diff --git a/mozilla/java/dom/jni/DocumentImpl.java b/mozilla/java/dom/jni/DocumentImpl.java index 716e24c9c3b..8eb29c25cf7 100644 --- a/mozilla/java/dom/jni/DocumentImpl.java +++ b/mozilla/java/dom/jni/DocumentImpl.java @@ -50,7 +50,6 @@ public class DocumentImpl extends NodeImpl implements Document { public native NodeList getElementsByTagName(String tagName); public native DOMImplementation getImplementation(); - protected native void finalize(); private static native void initialize(); static { diff --git a/mozilla/java/dom/jni/DocumentTypeImpl.java b/mozilla/java/dom/jni/DocumentTypeImpl.java index 67eb47f9ae2..5cb50cd56ec 100644 --- a/mozilla/java/dom/jni/DocumentTypeImpl.java +++ b/mozilla/java/dom/jni/DocumentTypeImpl.java @@ -27,6 +27,4 @@ public class DocumentTypeImpl extends NodeImpl implements DocumentType { public native String getName(); public native NamedNodeMap getEntities(); public native NamedNodeMap getNotations(); - - protected native void finalize(); } diff --git a/mozilla/java/dom/jni/ElementImpl.java b/mozilla/java/dom/jni/ElementImpl.java index b43bfb3ccd0..c81b14268b6 100644 --- a/mozilla/java/dom/jni/ElementImpl.java +++ b/mozilla/java/dom/jni/ElementImpl.java @@ -34,6 +34,4 @@ public class ElementImpl extends NodeImpl implements Element { public native Attr removeAttributeNode(Attr oldAttr); public native void setAttribute(String name, String value); public native Attr setAttributeNode(Attr newAttr); - - protected native void finalize(); } diff --git a/mozilla/java/dom/jni/EntityImpl.java b/mozilla/java/dom/jni/EntityImpl.java index 8e26a16c5a1..f4c45a3d076 100644 --- a/mozilla/java/dom/jni/EntityImpl.java +++ b/mozilla/java/dom/jni/EntityImpl.java @@ -26,6 +26,4 @@ public class EntityImpl extends NodeImpl implements Entity { public native String getPublicId(); public native String getSystemId(); public native String getNotationName(); - - protected native void finalize(); } diff --git a/mozilla/java/dom/jni/NamedNodeMapImpl.java b/mozilla/java/dom/jni/NamedNodeMapImpl.java index 916fb42ba0d..1ded3d18619 100644 --- a/mozilla/java/dom/jni/NamedNodeMapImpl.java +++ b/mozilla/java/dom/jni/NamedNodeMapImpl.java @@ -29,6 +29,4 @@ public class NamedNodeMapImpl extends NodeImpl implements NamedNodeMap { public native Node item(int index); public native Node removeNamedItem(String name); public native Node setNamedItem(Node arg); - - protected native void finalize(); } diff --git a/mozilla/java/dom/jni/NotationImpl.java b/mozilla/java/dom/jni/NotationImpl.java index efb31f4a1ae..e3109d049e5 100644 --- a/mozilla/java/dom/jni/NotationImpl.java +++ b/mozilla/java/dom/jni/NotationImpl.java @@ -25,6 +25,4 @@ public class NotationImpl extends NodeImpl implements Notation { public native String getPublicId(); public native String getSystemId(); - - protected native void finalize(); } diff --git a/mozilla/java/dom/jni/ProcessingInstructionImpl.java b/mozilla/java/dom/jni/ProcessingInstructionImpl.java index afc96143b50..a88c035b4de 100644 --- a/mozilla/java/dom/jni/ProcessingInstructionImpl.java +++ b/mozilla/java/dom/jni/ProcessingInstructionImpl.java @@ -26,6 +26,4 @@ public class ProcessingInstructionImpl extends NodeImpl implements ProcessingIns public native String getData(); public native String getTarget(); public native void setData(String data); - - protected native void finalize(); } diff --git a/mozilla/java/dom/jni/TextImpl.java b/mozilla/java/dom/jni/TextImpl.java index 09e8343925d..9ee1e94eb0b 100644 --- a/mozilla/java/dom/jni/TextImpl.java +++ b/mozilla/java/dom/jni/TextImpl.java @@ -24,7 +24,5 @@ public class TextImpl extends CharacterDataImpl implements Text { protected TextImpl() {} public native Text splitText(int offset); - - protected native void finalize(); } diff --git a/mozilla/java/dom/jni/org_mozilla_dom_AttrImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_AttrImpl.cpp index 27b6c8d8d2c..ebb4afa4551 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_AttrImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_AttrImpl.cpp @@ -150,22 +150,4 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_AttrImpl_setValue } } -/* - * Class: org_mozilla_dom_AttrImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_AttrImpl_finalize - (JNIEnv *env, jobject jthis) -{ - nsIDOMAttr* attr = (nsIDOMAttr*) - env->GetLongField(jthis, JavaDOMGlobals::nodePtrFID); - if (!attr) { - PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, - ("Attr.finalize: NULL pointer\n")); - return; - } - - JavaDOMGlobals::AddToGarbage(attr); -} diff --git a/mozilla/java/dom/jni/org_mozilla_dom_AttrImpl.h b/mozilla/java/dom/jni/org_mozilla_dom_AttrImpl.h index 21372e028a9..1e6b3541f4c 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_AttrImpl.h +++ b/mozilla/java/dom/jni/org_mozilla_dom_AttrImpl.h @@ -7,14 +7,6 @@ #ifdef __cplusplus extern "C" { #endif -/* - * Class: org_mozilla_dom_AttrImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_AttrImpl_finalize - (JNIEnv *, jobject); - /* * Class: org_mozilla_dom_AttrImpl * Method: getName diff --git a/mozilla/java/dom/jni/org_mozilla_dom_CharacterDataImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_CharacterDataImpl.cpp index d23d7cbe78e..e92dedb4cee 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_CharacterDataImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_CharacterDataImpl.cpp @@ -77,25 +77,6 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_deleteData } } -/* - * Class: org_mozilla_dom_CharacterDataImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_finalize - (JNIEnv *env, jobject jthis) -{ - nsIDOMCharacterData* data = (nsIDOMCharacterData*) - env->GetLongField(jthis, JavaDOMGlobals::nodePtrFID); - if (!data) { - PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, - ("CharacterData.finalize: NULL pointer\n")); - return; - } - - JavaDOMGlobals::AddToGarbage(data); -} - /* * Class: org_mozilla_dom_CharacterDataImpl * Method: getData diff --git a/mozilla/java/dom/jni/org_mozilla_dom_CharacterDataImpl.h b/mozilla/java/dom/jni/org_mozilla_dom_CharacterDataImpl.h index de815d0b6e9..b72b1e69cc0 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_CharacterDataImpl.h +++ b/mozilla/java/dom/jni/org_mozilla_dom_CharacterDataImpl.h @@ -23,14 +23,6 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_appendData JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_deleteData (JNIEnv *, jobject, jint, jint); -/* - * Class: org_mozilla_dom_CharacterDataImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_CharacterDataImpl_finalize - (JNIEnv *, jobject); - /* * Class: org_mozilla_dom_CharacterDataImpl * Method: getData diff --git a/mozilla/java/dom/jni/org_mozilla_dom_DocumentImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_DocumentImpl.cpp index 37b0b47362f..bcf65caaf47 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_DocumentImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_DocumentImpl.cpp @@ -43,25 +43,6 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_DocumentImpl_initialize } } -/* - * Class: org_mozilla_dom_DocumentImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_DocumentImpl_finalize - (JNIEnv *env, jobject jthis) -{ - nsIDOMDocument* doc = (nsIDOMDocument*) - env->GetLongField(jthis, JavaDOMGlobals::nodePtrFID); - if (!doc) { - PR_LOG(JavaDOMGlobals::log, PR_LOG_WARNING, - ("Document.finalize: NULL pointer\n")); - return; - } - - JavaDOMGlobals::AddToGarbage(doc); -} - /* * Class: org_mozilla_dom_DocumentImpl * Method: createAttribute diff --git a/mozilla/java/dom/jni/org_mozilla_dom_DocumentImpl.h b/mozilla/java/dom/jni/org_mozilla_dom_DocumentImpl.h index d3728f4ec1c..0e2edc32dba 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_DocumentImpl.h +++ b/mozilla/java/dom/jni/org_mozilla_dom_DocumentImpl.h @@ -71,13 +71,6 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createProcessingInst JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DocumentImpl_createTextNode (JNIEnv *, jobject, jstring); -/* - * Class: org_mozilla_dom_DocumentImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_DocumentImpl_finalize - (JNIEnv *, jobject); /* * Class: org_mozilla_dom_DocumentImpl diff --git a/mozilla/java/dom/jni/org_mozilla_dom_DocumentTypeImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_DocumentTypeImpl.cpp index 565a498baf5..58f418fc20b 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_DocumentTypeImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_DocumentTypeImpl.cpp @@ -20,24 +20,6 @@ Inc. All Rights Reserved. #include "javaDOMGlobals.h" #include "org_mozilla_dom_DocumentImpl.h" -/* - * Class: org_mozilla_dom_DocumentTypeImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_DocumentTypeImpl_finalize - (JNIEnv *env, jobject jthis) -{ - nsIDOMDocumentType* docType = (nsIDOMDocumentType*) - env->GetLongField(jthis, JavaDOMGlobals::nodePtrFID); - if (!docType) { - PR_LOG(JavaDOMGlobals::log, PR_LOG_WARNING, - ("DocumentType.finalize: NULL pointer\n")); - return; - } - - JavaDOMGlobals::AddToGarbage(docType); -} /* * Class: org_mozilla_dom_DocumentTypeImpl diff --git a/mozilla/java/dom/jni/org_mozilla_dom_DocumentTypeImpl.h b/mozilla/java/dom/jni/org_mozilla_dom_DocumentTypeImpl.h index e35861670ea..7eee70e8ea2 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_DocumentTypeImpl.h +++ b/mozilla/java/dom/jni/org_mozilla_dom_DocumentTypeImpl.h @@ -2,15 +2,6 @@ #include "javaDOMGlobals.h" #include "org_mozilla_dom_DocumentTypeImpl.h" -/* - * Class: org_mozilla_dom_DocumentTypeImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_DocumentTypeImpl_finalize - (JNIEnv *, jobject) -{ -} /* * Class: org_mozilla_dom_DocumentTypeImpl diff --git a/mozilla/java/dom/jni/org_mozilla_dom_ElementImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_ElementImpl.cpp index 3546a192c9f..dd8e53749d4 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_ElementImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_ElementImpl.cpp @@ -21,24 +21,6 @@ Inc. All Rights Reserved. #include "javaDOMGlobals.h" #include "org_mozilla_dom_ElementImpl.h" -/* - * Class: org_mozilla_dom_ElementImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_finalize - (JNIEnv *env, jobject jthis) -{ - nsIDOMElement* element = (nsIDOMElement*) - env->GetLongField(jthis, JavaDOMGlobals::nodePtrFID); - if (!element) { - PR_LOG(JavaDOMGlobals::log, PR_LOG_WARNING, - ("Element.finalize: NULL pointer\n")); - return; - } - - JavaDOMGlobals::AddToGarbage(element); -} /* * Class: org_mozilla_dom_ElementImpl diff --git a/mozilla/java/dom/jni/org_mozilla_dom_ElementImpl.h b/mozilla/java/dom/jni/org_mozilla_dom_ElementImpl.h index 1ea682cf3dd..2e37a847e50 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_ElementImpl.h +++ b/mozilla/java/dom/jni/org_mozilla_dom_ElementImpl.h @@ -7,13 +7,6 @@ #ifdef __cplusplus extern "C" { #endif -/* - * Class: org_mozilla_dom_ElementImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_ElementImpl_finalize - (JNIEnv *, jobject); /* * Class: org_mozilla_dom_ElementImpl diff --git a/mozilla/java/dom/jni/org_mozilla_dom_EntityImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_EntityImpl.cpp index 0a8ba121900..9e6924959b7 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_EntityImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_EntityImpl.cpp @@ -19,24 +19,6 @@ Inc. All Rights Reserved. #include "javaDOMGlobals.h" #include "org_mozilla_dom_EntityImpl.h" -/* - * Class: org_mozilla_dom_EntityImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_EntityImpl_finalize - (JNIEnv *env, jobject jthis) -{ - nsIDOMEntity* entity = (nsIDOMEntity*) - env->GetLongField(jthis, JavaDOMGlobals::nodePtrFID); - if (!entity) { - PR_LOG(JavaDOMGlobals::log, PR_LOG_WARNING, - ("Entity.finalize: NULL pointer\n")); - return; - } - - JavaDOMGlobals::AddToGarbage(entity); -} /* * Class: org_mozilla_dom_EntityImpl diff --git a/mozilla/java/dom/jni/org_mozilla_dom_EntityImpl.h b/mozilla/java/dom/jni/org_mozilla_dom_EntityImpl.h index 3d0c3470615..33a52f68745 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_EntityImpl.h +++ b/mozilla/java/dom/jni/org_mozilla_dom_EntityImpl.h @@ -7,13 +7,6 @@ #ifdef __cplusplus extern "C" { #endif -/* - * Class: org_mozilla_dom_EntityImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_EntityImpl_finalize - (JNIEnv *, jobject); /* * Class: org_mozilla_dom_EntityImpl diff --git a/mozilla/java/dom/jni/org_mozilla_dom_NamedNodeMapImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_NamedNodeMapImpl.cpp index 0a6c4d13d4c..3ecfe1cfc90 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_NamedNodeMapImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_NamedNodeMapImpl.cpp @@ -20,24 +20,6 @@ Inc. All Rights Reserved. #include "javaDOMGlobals.h" #include "org_mozilla_dom_NamedNodeMapImpl.h" -/* - * Class: org_mozilla_dom_NamedNodeMapImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_NamedNodeMapImpl_finalize - (JNIEnv *env, jobject jthis) -{ - nsIDOMNamedNodeMap* map = (nsIDOMNamedNodeMap*) - env->GetLongField(jthis, JavaDOMGlobals::nodePtrFID); - if (!map) { - PR_LOG(JavaDOMGlobals::log, PR_LOG_WARNING, - ("NodeMap.finalize: NULL pointer\n")); - return; - } - - JavaDOMGlobals::AddToGarbage(map); -} /* * Class: org_mozilla_dom_NamedNodeMapImpl diff --git a/mozilla/java/dom/jni/org_mozilla_dom_NamedNodeMapImpl.h b/mozilla/java/dom/jni/org_mozilla_dom_NamedNodeMapImpl.h index 7a207d630ae..da1af0887a9 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_NamedNodeMapImpl.h +++ b/mozilla/java/dom/jni/org_mozilla_dom_NamedNodeMapImpl.h @@ -7,13 +7,6 @@ #ifdef __cplusplus extern "C" { #endif -/* - * Class: org_mozilla_dom_NamedNodeMapImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_NamedNodeMapImpl_finalize - (JNIEnv *, jobject); /* * Class: org_mozilla_dom_NamedNodeMapImpl diff --git a/mozilla/java/dom/jni/org_mozilla_dom_NotationImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_NotationImpl.cpp index 4d512e7a442..400f7125f96 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_NotationImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_NotationImpl.cpp @@ -19,24 +19,6 @@ Inc. All Rights Reserved. #include "javaDOMGlobals.h" #include "org_mozilla_dom_NotationImpl.h" -/* - * Class: org_mozilla_dom_NotationImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_NotationImpl_finalize - (JNIEnv *env, jobject jthis) -{ - nsIDOMNotation* notation = (nsIDOMNotation*) - env->GetLongField(jthis, JavaDOMGlobals::nodePtrFID); - if (!notation) { - PR_LOG(JavaDOMGlobals::log, PR_LOG_WARNING, - ("Notation.finalize: NULL pointer\n")); - return; - } - - JavaDOMGlobals::AddToGarbage(notation); -} /* * Class: org_mozilla_dom_NotationImpl diff --git a/mozilla/java/dom/jni/org_mozilla_dom_NotationImpl.h b/mozilla/java/dom/jni/org_mozilla_dom_NotationImpl.h index 3ab397f9a2b..25857b83f7c 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_NotationImpl.h +++ b/mozilla/java/dom/jni/org_mozilla_dom_NotationImpl.h @@ -7,13 +7,6 @@ #ifdef __cplusplus extern "C" { #endif -/* - * Class: org_mozilla_dom_NotationImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_NotationImpl_finalize - (JNIEnv *, jobject); /* * Class: org_mozilla_dom_NotationImpl diff --git a/mozilla/java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.cpp index 45e34a25b16..0e7f4da9d5d 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.cpp @@ -19,24 +19,6 @@ Inc. All Rights Reserved. #include "javaDOMGlobals.h" #include "org_mozilla_dom_ProcessingInstructionImpl.h" -/* - * Class: org_mozilla_dom_ProcessingInstructionImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_ProcessingInstructionImpl_finalize - (JNIEnv *env, jobject jthis) -{ - nsIDOMProcessingInstruction* pi = (nsIDOMProcessingInstruction*) - env->GetLongField(jthis, JavaDOMGlobals::nodePtrFID); - if (!pi) { - PR_LOG(JavaDOMGlobals::log, PR_LOG_WARNING, - ("ProcessingInstruction.finalize: NULL pointer\n")); - return; - } - - JavaDOMGlobals::AddToGarbage(pi); -} /* * Class: org_mozilla_dom_ProcessingInstructionImpl diff --git a/mozilla/java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.h b/mozilla/java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.h index c320b7f0868..8ba262be624 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.h +++ b/mozilla/java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.h @@ -7,13 +7,6 @@ #ifdef __cplusplus extern "C" { #endif -/* - * Class: org_mozilla_dom_ProcessingInstructionImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_ProcessingInstructionImpl_finalize - (JNIEnv *, jobject); /* * Class: org_mozilla_dom_ProcessingInstructionImpl diff --git a/mozilla/java/dom/jni/org_mozilla_dom_TextImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_TextImpl.cpp index f9918f680c5..9fc5221cb22 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_TextImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_TextImpl.cpp @@ -19,24 +19,6 @@ Inc. All Rights Reserved. #include "javaDOMGlobals.h" #include "org_mozilla_dom_TextImpl.h" -/* - * Class: org_mozilla_dom_TextImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_TextImpl_finalize - (JNIEnv *env, jobject jthis) -{ - nsIDOMText* text = (nsIDOMText*) - env->GetLongField(jthis, JavaDOMGlobals::nodePtrFID); - if (!text) { - PR_LOG(JavaDOMGlobals::log, PR_LOG_WARNING, - ("Text.finalize: NULL pointer\n")); - return; - } - - JavaDOMGlobals::AddToGarbage(text); -} /* * Class: org_mozilla_dom_TextImpl diff --git a/mozilla/java/dom/jni/org_mozilla_dom_TextImpl.h b/mozilla/java/dom/jni/org_mozilla_dom_TextImpl.h index 44063e374c7..472bb9190e2 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_TextImpl.h +++ b/mozilla/java/dom/jni/org_mozilla_dom_TextImpl.h @@ -7,13 +7,6 @@ #ifdef __cplusplus extern "C" { #endif -/* - * Class: org_mozilla_dom_TextImpl - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_mozilla_dom_TextImpl_finalize - (JNIEnv *, jobject); /* * Class: org_mozilla_dom_TextImpl