From 904f0a8db89fe540dbb05fd2548abbbc56f37e2b Mon Sep 17 00:00:00 2001 From: "sdv%sparc.spb.su" Date: Tue, 28 Mar 2000 04:55:38 +0000 Subject: [PATCH] keeping track with mozilla interface changes git-svn-id: svn://10.0.0.236/trunk@64325 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/java/dom/jni/makefile.win | 2 +- .../jni/org_mozilla_dom_DOMAccessorImpl.cpp | 2 - mozilla/java/dom/makefile.win | 9 ++--- mozilla/java/dom/nsJavaDOMImpl.cpp | 38 +++++++++++++++---- 4 files changed, 35 insertions(+), 16 deletions(-) diff --git a/mozilla/java/dom/jni/makefile.win b/mozilla/java/dom/jni/makefile.win index 7a7cef12420..35255e761cb 100755 --- a/mozilla/java/dom/jni/makefile.win +++ b/mozilla/java/dom/jni/makefile.win @@ -98,7 +98,7 @@ export:: classes #XXX - assume that DOM2 java-bindings are in CLASSPATH classes: @echo "Making java classes ..." - $(JAVAHOME)\bin\javac -d $(JAVA_DESTPATH) *.java + $(JDKHOME)\bin\javac -d $(JAVA_DESTPATH) *.java install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin diff --git a/mozilla/java/dom/jni/org_mozilla_dom_DOMAccessorImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_DOMAccessorImpl.cpp index 53bf5f302bd..60a31ddce8d 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_DOMAccessorImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_DOMAccessorImpl.cpp @@ -43,7 +43,6 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessorImpl_register rv)); } } - nsServiceManager::ReleaseService(kDocLoaderServiceCID, docLoaderService); } } @@ -78,7 +77,6 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessorImpl_unregister rv)); } } - nsServiceManager::ReleaseService(kDocLoaderServiceCID, docLoaderService); } } diff --git a/mozilla/java/dom/makefile.win b/mozilla/java/dom/makefile.win index f8be6b8ed2e..41a7a85a78b 100755 --- a/mozilla/java/dom/makefile.win +++ b/mozilla/java/dom/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\.. IGNORE_MANIFEST=1 DIRS = jni -JAVAHOME=$(JDKHOME) DEFINES=-D_IMPL_NS_WEB -DWIN32_LEAN_AND_MEAN !ifdef JAVA_DOM_OJI_ENABLE DEFINES=$(DEFINES) -DJAVA_DOM_OJI_ENABLE @@ -37,7 +36,6 @@ CPPSRCS= \ JavaDOMSecurityContext.cpp \ !endif nsJavaDOMImpl.cpp \ - nsJavaDOMModule.cpp \ $(NULL) CPP_OBJS= \ @@ -45,7 +43,6 @@ CPP_OBJS= \ .\$(OBJDIR)\JavaDOMSecurityContext.obj \ !endif .\$(OBJDIR)\nsJavaDOMImpl.obj \ - .\$(OBJDIR)\nsJavaDOMModule.obj \ $(NULL) EXPORTS = \ @@ -53,8 +50,8 @@ EXPORTS = \ !ifndef JAVA_DOM_OJI_ENABLE LINCS= \ - -I$(JAVAHOME)\include \ - -I$(JAVAHOME)\include\win32 + -I$(JDKHOME)\include \ + -I$(JDKHOME)\include\win32 !endif MAKE_OBJ_TYPE = DLL @@ -70,7 +67,7 @@ LLIBS= \ !ifdef JAVA_DOM_OJI_ENABLE $(DIST)\lib\oji.lib \ !else - $(JAVAHOME)\lib\jvm.lib \ + $(JDKHOME)\lib\jvm.lib \ !endif $(DIST)\lib\xpcom.lib \ $(LIBNSPR) diff --git a/mozilla/java/dom/nsJavaDOMImpl.cpp b/mozilla/java/dom/nsJavaDOMImpl.cpp index bc3467c5e67..72a215bcb94 100755 --- a/mozilla/java/dom/nsJavaDOMImpl.cpp +++ b/mozilla/java/dom/nsJavaDOMImpl.cpp @@ -22,14 +22,18 @@ #include "prenv.h" #include "nsISupportsUtils.h" #include "nsIURL.h" +#include "nsIChannel.h" #include "nsIDocument.h" #include "nsIDocumentLoader.h" #include "nsIDocumentLoaderObserver.h" #include "nsIDocumentViewer.h" #include "nsIDOMDocument.h" -#include "nsIWebShell.h" +#include "nsIDocShell.h" #include "nsJavaDOMImpl.h" +#include "nsIModule.h" +#include "nsIGenericFactory.h" + #ifdef JAVA_DOM_OJI_ENABLE #include "ProxyJNI.h" #include "nsIServiceManager.h" @@ -51,7 +55,7 @@ static const char* describe_type(int type); #ifdef JAVA_DOM_OJI_ENABLE static NS_DEFINE_CID(kJVMManagerCID,NS_JVMMANAGER_CID); #endif -static NS_DEFINE_IID(kIWebShellIID, NS_IWEB_SHELL_IID); +static NS_DEFINE_IID(kIDocShellIID, NS_IDOCSHELL_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIJavaDOMIID, NS_IJAVADOM_IID); static NS_DEFINE_IID(kIDocumentViewerIID, NS_IDOCUMENT_VIEWER_IID); @@ -61,6 +65,26 @@ static NS_DEFINE_IID(kIDocumentLoaderObserverIID, NS_IDOCUMENT_LOADER_OBSERVER_I NS_IMPL_ADDREF(nsJavaDOMImpl); NS_IMPL_RELEASE(nsJavaDOMImpl); + +#define NS_JAVADOM_PROGID \ +"component://netscape/blackwood/java-dom" + +NS_GENERIC_FACTORY_CONSTRUCTOR(nsJavaDOMImpl) + +static nsModuleComponentInfo components[] = +{ + { + "Java DOM", + NS_JAVADOM_CID, + NS_JAVADOM_PROGID, + nsJavaDOMImplConstructor + } +}; + +NS_IMPL_NSGETMODULE("JavaDOMModule",components); + + + NS_IMETHODIMP nsJavaDOMImpl::QueryInterface(REFNSIID aIID, void** aInstance) { if (NULL == aInstance) @@ -225,7 +249,7 @@ PRBool nsJavaDOMImpl::Cleanup(JNIEnv* env) nsIDOMDocument* nsJavaDOMImpl::GetDocument(nsIDocumentLoader* loader) { - nsIWebShell* webshell = nsnull; + nsIDocShell* docshell = nsnull; nsISupports* container = nsnull; nsIContentViewer* contentv = nsnull; nsIDocumentViewer* docv = nsnull; @@ -234,9 +258,9 @@ nsIDOMDocument* nsJavaDOMImpl::GetDocument(nsIDocumentLoader* loader) nsresult rv = loader->GetContainer(&container); if (NS_SUCCEEDED(rv) && container) - rv = container->QueryInterface(kIWebShellIID, (void**) &webshell); - if (NS_SUCCEEDED(rv) && webshell) - rv = webshell->GetContentViewer(&contentv); + rv = container->QueryInterface(kIDocShellIID, (void**) &docshell); + if (NS_SUCCEEDED(rv) && docshell) + rv = docshell->GetContentViewer(&contentv); if (NS_SUCCEEDED(rv) && contentv) { rv = contentv->QueryInterface(kIDocumentViewerIID, @@ -257,7 +281,7 @@ nsIDOMDocument* nsJavaDOMImpl::GetDocument(nsIDocumentLoader* loader) "documentViewer=%x, document=%x, " "domDocument=%x, error=%x\n", (unsigned) (void*) container, - (unsigned) (void*) webshell, + (unsigned) (void*) docshell, (unsigned) (void*) contentv, (unsigned) (void*) docv, (unsigned) (void*) document,