From 240b20481ff1142cbf996bf9ae86957ad6762b18 Mon Sep 17 00:00:00 2001
From: "edburns%acm.org" <edburns%acm.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 4 Jun 2000 20:25:20 +0000
Subject: [PATCH] a=drapeau author=edburns bug=41492

This change adds the following methods:

public static native void org.mozilla.dom.DOMAccessor.initialize();

The implementation of this method is:

JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_initialize
(JNIEnv *env, jclass)
{
  if (!JavaDOMGlobals::log) {
    JavaDOMGlobals::Initialize(env);
  }

}

This method is necessary for external clients that want to use JavaDOM,
but don't want to use the nsIDocumentLoaderObserver instance provided by
JavaDOM.

Please see http://bugzilla.mozilla.org/show_bug.cgi?id=41497 for an
additional bug for which there is a workaround.

Ed


git-svn-id: svn://10.0.0.236/trunk@71488 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../classes/org/mozilla/dom/DOMAccessor.java  |  2 +
 .../dom/jni/org_mozilla_dom_DOMAccessor.cpp   |  9 +++++
 .../dom/jni/org_mozilla_dom_DOMAccessor.h     | 40 +++++++++++--------
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/mozilla/java/dom/classes/org/mozilla/dom/DOMAccessor.java b/mozilla/java/dom/classes/org/mozilla/dom/DOMAccessor.java
index 7cb189b890a..a30676432dc 100644
--- a/mozilla/java/dom/classes/org/mozilla/dom/DOMAccessor.java
+++ b/mozilla/java/dom/classes/org/mozilla/dom/DOMAccessor.java
@@ -45,6 +45,8 @@ public final class DOMAccessor {
     private static native Node getNodeByHandle(long p);
     private static native void doGC();
 
+    public static native void initialize();
+
     public static synchronized void 
 	addDocumentLoadListener(DocumentLoadListener listener) {
 	if (documentLoadListeners.size() == 0) {
diff --git a/mozilla/java/dom/jni/org_mozilla_dom_DOMAccessor.cpp b/mozilla/java/dom/jni/org_mozilla_dom_DOMAccessor.cpp
index d7f17fdc57a..9ccf6f966bf 100644
--- a/mozilla/java/dom/jni/org_mozilla_dom_DOMAccessor.cpp
+++ b/mozilla/java/dom/jni/org_mozilla_dom_DOMAccessor.cpp
@@ -106,4 +106,13 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_doGC
   JavaDOMGlobals::TakeOutGarbage();
 }
 
+JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_initialize
+(JNIEnv *env, jclass)
+{
+  if (!JavaDOMGlobals::log) {
+    JavaDOMGlobals::Initialize(env);
+  }
+  
+}
+
 
diff --git a/mozilla/java/dom/jni/org_mozilla_dom_DOMAccessor.h b/mozilla/java/dom/jni/org_mozilla_dom_DOMAccessor.h
index 1484233941c..deb3d4ae944 100644
--- a/mozilla/java/dom/jni/org_mozilla_dom_DOMAccessor.h
+++ b/mozilla/java/dom/jni/org_mozilla_dom_DOMAccessor.h
@@ -9,6 +9,30 @@ extern "C" {
 #endif
 /* Inaccessible static: documentLoadListeners */
 /* Inaccessible static: permission */
+/*
+ * Class:     org_mozilla_dom_DOMAccessor
+ * Method:    doGC
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_doGC
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     org_mozilla_dom_DOMAccessor
+ * Method:    getNodeByHandle
+ * Signature: (J)Lorg/w3c/dom/Node;
+ */
+JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DOMAccessor_getNodeByHandle
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     org_mozilla_dom_DOMAccessor
+ * Method:    initialize
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_initialize
+  (JNIEnv *, jclass);
+
 /*
  * Class:     org_mozilla_dom_DOMAccessor
  * Method:    register
@@ -25,22 +49,6 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_register
 JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_unregister
   (JNIEnv *, jclass);
 
-/*
- * Class:     org_mozilla_dom_DOMAccessor
- * Method:    getNodeByHandle
- * Signature: (J)Lorg/w3c/dom/Node;
- */
-JNIEXPORT jobject JNICALL Java_org_mozilla_dom_DOMAccessor_getNodeByHandle
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     org_mozilla_dom_DOMAccessor
- * Method:    doGC
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_doGC
-  (JNIEnv *, jclass);
-
 #ifdef __cplusplus
 }
 #endif