bug 79278

This checkin migrates javaDOM to use the new nsIWebProgressListener interface, removing its dependency on the now non-existant nsIDocumentLoaderObserver. It has only been tested inside webclient. QA needs to do the standalone javaDOM tests. The following files are in this bugfix: dom/jni/org_mozilla_dom_DOMAccessor.cpp dom/src/nsIJavaDOM.h dom/src/nsJavaDOMImpl.cpp dom/src/nsJavaDOMImpl.h webclient/classes_spec/org/mozilla/webclient/test/EMWindow.java webclient/classes_spec/org/mozilla/webclient/wrapper_native/CurrentPageImpl.java git-svn-id: svn://10.0.0.236/trunk@94264 18797224-902f-48f8-a5cc-f745e15eee43
2001-05-08 20:34:31 +00:00
parent 687609c9ea
commit df9807ce08
6 changed files with 2259 additions and 2158 deletions
--- a/mozilla/java/dom/src/nsJavaDOMImpl.h
+++ b/mozilla/java/dom/src/nsJavaDOMImpl.h
@@ -1,77 +1,67 @@
-#ifndef __nsJavaDOMImpl_h__
-#define __nsJavaDOMImpl_h__
-
-#include "jni.h"
-#include "nsIJavaDOM.h"
-#ifdef JAVA_DOM_OJI_ENABLE
-#include "nsJVMManager.h"
-#include "JavaDOMSecurityContext.h"
-#endif 
-
-class nsIURI;
-class nsIDOMDocument;
-class nsIDocumentLoader;
-
-class nsJavaDOMImpl : public nsIJavaDOM {
-  NS_DECL_ISUPPORTS
-
- public:
-  nsJavaDOMImpl();
-  virtual ~nsJavaDOMImpl();
-
-  /* nsIDocumentLoaderObserver methods */
-  NS_IMETHOD OnStartDocumentLoad(nsIDocumentLoader* loader, 
-				 nsIURI* aURL, 
-				 const char* aCommand);
-
-  NS_IMETHOD OnEndDocumentLoad(nsIDocumentLoader* loader, 
-			       nsIRequest* request, 
-			       nsresult aStatus);
-
-  NS_IMETHOD OnStartURLLoad(nsIDocumentLoader* loader, 
-			    nsIRequest* channel); 
-
-  NS_IMETHOD OnProgressURLLoad(nsIDocumentLoader* loader,
-			       nsIRequest* request, 
-			       PRUint32 aProgress, 
-                               PRUint32 aProgressMax);
-
-  NS_IMETHOD OnStatusURLLoad(nsIDocumentLoader* loader, 
-			     nsIRequest* request, 
-			     nsString& aMsg);
-
-  NS_IMETHOD OnEndURLLoad(nsIDocumentLoader* loader, 
-			  nsIRequest* request, 
-			  nsresult aStatus);
-
-  NS_IMETHOD HandleUnknownContentType(nsIDocumentLoader* loader,
-				      nsIChannel* channel, 
-				      const char *aContentType,
-				      const char *aCommand);
-
- private:
-#ifdef JAVA_DOM_OJI_ENABLE
-  static nsJVMManager* jvmManager;
-  static JavaDOMSecurityContext* securityContext;
-#else
-  static JavaVM*        jvm;
-#endif
-
-  static jclass		domAccessorClass;
-
-  static jmethodID	startURLLoadMID;
-  static jmethodID	endURLLoadMID;
-  static jmethodID	progressURLLoadMID;
-  static jmethodID	statusURLLoadMID;
-  static jmethodID	startDocumentLoadMID;
-  static jmethodID	endDocumentLoadMID;
-
-  static JNIEnv* GetJNIEnv(void);
-  static void StartJVM(void);
-  static PRBool Init(JNIEnv**);
-  // cleanup after a JNI method invocation
-  static PRBool Cleanup(JNIEnv* env);
-  nsIDOMDocument* GetDocument(nsIDocumentLoader* loader);  
-};
-
-#endif /* __nsJavaDOMImpl_h__ */
+#ifndef __nsJavaDOMImpl_h__
+#define __nsJavaDOMImpl_h__
+
+#include "jni.h"
+#include "nsIJavaDOM.h"
+#ifdef JAVA_DOM_OJI_ENABLE
+#include "nsJVMManager.h"
+#include "JavaDOMSecurityContext.h"
+#endif 
+
+class nsIURI;
+class nsIDOMDocument;
+class nsIDocumentLoader;
+
+class nsJavaDOMImpl : public nsIJavaDOM {
+  NS_DECL_ISUPPORTS
+
+ public:
+  nsJavaDOMImpl();
+  virtual ~nsJavaDOMImpl();
+
+  NS_DECL_NSIWEBPROGRESSLISTENER
+
+  NS_IMETHOD HandleUnknownContentType(nsIDocumentLoader* loader,
+				      nsIChannel* channel, 
+				      const char *aContentType,
+				      const char *aCommand);
+
+ protected:
+
+ /**
+
+  * Called from our nsIWebProgressListener.OnStateChanged()
+  
+  */ 
+  
+  NS_IMETHOD doStartDocumentLoad(const PRUnichar *documentName);
+  NS_IMETHOD doStartUrlLoad(const PRUnichar *documentName);
+  NS_IMETHOD doEndDocumentLoad(nsIWebProgress *aWebProgress, 
+			       nsIRequest *aRequest, PRUint32 aStatus);
+
+ private:
+#ifdef JAVA_DOM_OJI_ENABLE
+  static nsJVMManager* jvmManager;
+  static JavaDOMSecurityContext* securityContext;
+#else
+  static JavaVM*        jvm;
+#endif
+
+  static jclass		domAccessorClass;
+
+  static jmethodID	startURLLoadMID;
+  static jmethodID	endURLLoadMID;
+  static jmethodID	progressURLLoadMID;
+  static jmethodID	statusURLLoadMID;
+  static jmethodID	startDocumentLoadMID;
+  static jmethodID	endDocumentLoadMID;
+
+  static JNIEnv* GetJNIEnv(void);
+  static void StartJVM(void);
+  static PRBool Init(JNIEnv**);
+  // cleanup after a JNI method invocation
+  static PRBool Cleanup(JNIEnv* env);
+  nsIDOMDocument* GetDocument(nsIDocumentLoader* loader);  
+};
+
+#endif /* __nsJavaDOMImpl_h__ */