mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

bug: 119680 

Changes to make webclient compile and minimally run with
Netscape 6.2.1.
This commit is contained in:
edburns%acm.org 2002-01-14 18:04:48 +00:00
Родитель 78c8b14e8b
Коммит 4932a8c19e
23 изменённых файлов: 81 добавлений и 67 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

36
java/build/Makefile.win
Просмотреть файл

@ -41,9 +41,9 @@ buildRunems:
-mkdir $(PACKAGE_EXAMPLE)
-mkdir $(DIST)\..\java\build\org
-mkdir $(DIST)\..\java\build\org\mozilla
xcopy /E $(DIST)\..\classes\org\mozilla\dom $(DIST)\..\java\build\org\mozilla
xcopy /E $(DIST)\..\classes\org\mozilla\util $(DIST)\..\java\build\org\mozilla
xcopy /E $(DIST)\..\classes\org\w3c $(DIST)\..\java\build\org
xcopy /E /Y $(DIST)\..\classes\org\mozilla\dom $(DIST)\..\java\build\org\mozilla
xcopy /E /Y $(DIST)\..\classes\org\mozilla\util $(DIST)\..\java\build\org\mozilla
xcopy /E /Y $(DIST)\..\classes\org\w3c $(DIST)\..\java\build\org
cd $(DIST)\..\java\build
jar -cvfM0 JavaDOM_$(PACKAGE_VER)_win32.jar org
copy JavaDOM_$(PACKAGE_VER)_win32.jar ..\..\javadev\lib\JavaDOM_$(PACKAGE_VER)_win32.jar
@ -66,10 +66,10 @@ buildRunems:
-mkdir $(PACKAGE_EXAMPLE)
-mkdir $(DIST)\..\java\build\org
-mkdir $(DIST)\..\java\build\org\mozilla
xcopy /E $(DIST)\..\classes\org\mozilla\util $(DIST)\..\java\build\org\mozilla
xcopy /E $(DIST)\..\classes\org\mozilla\dom $(DIST)\..\java\build\org\mozilla
xcopy /E $(DIST)\..\classes\org\mozilla\plugins $(DIST)\..\java\build\org\mozilla
xcopy /E $(DIST)\..\classes\org\w3c $(DIST)\..\java\build\org
xcopy /E /Y $(DIST)\..\classes\org\mozilla\util $(DIST)\..\java\build\org\mozilla
xcopy /E /Y $(DIST)\..\classes\org\mozilla\dom $(DIST)\..\java\build\org\mozilla
xcopy /E /Y $(DIST)\..\classes\org\mozilla\plugins $(DIST)\..\java\build\org\mozilla
xcopy /E /Y $(DIST)\..\classes\org\w3c $(DIST)\..\java\build\org
cd $(DIST)\..\java\build
jar -cvfM0 Pluglet_$(PACKAGE_VER)_win32.jar org
copy Pluglet_$(PACKAGE_VER)_win32.jar ..\..\javadev\lib\Pluglet_$(PACKAGE_VER)_win32.jar
@ -96,11 +96,11 @@ buildRunems:
-mkdir $(PACKAGE_EXAMPLE)
-mkdir $(DIST)\..\java\build\org
-mkdir $(DIST)\..\java\build\org\mozilla
xcopy /E $(DIST)\..\classes\org\mozilla\util $(DIST)\..\java\build\org\mozilla
xcopy /E $(DIST)\..\classes\org\mozilla\dom $(DIST)\..\java\build\org\mozilla
xcopy /E $(DIST)\..\classes\org\mozilla\webclient $(DIST)\..\java\build\org\mozilla
xcopy /E $(DIST)\..\classes\org\mozilla\xpcom $(DIST)\..\java\build\org\mozilla
xcopy /E $(DIST)\..\classes\org\w3c $(DIST)\..\java\build\org
xcopy /E /Y $(DIST)\..\classes\org\mozilla\util $(DIST)\..\java\build\org\mozilla
xcopy /E /Y $(DIST)\..\classes\org\mozilla\dom $(DIST)\..\java\build\org\mozilla
xcopy /E /Y $(DIST)\..\classes\org\mozilla\webclient $(DIST)\..\java\build\org\mozilla
xcopy /E /Y $(DIST)\..\classes\org\mozilla\xpcom $(DIST)\..\java\build\org\mozilla
xcopy /E /Y $(DIST)\..\classes\org\w3c $(DIST)\..\java\build\org
cd $(DIST)\..\java\build
jar -cvfM0 Webclient_$(PACKAGE_VER)_win32.jar org
copy Webclient_$(PACKAGE_VER)_win32.jar ..\..\javadev\lib\Webclient_$(PACKAGE_VER)_win32.jar
@ -126,7 +126,7 @@ buildRunems:
chmod 775 $(PACKAGE_LIB)\webclient.dll
chmod 775 $(PACKAGE_LIB)\wc_share.lib
@echo +++ Creating Commercial Package. Use runem.bat to run the test browser.
del /Q runem_win_commercial.bat
rm -f runem_win_commercial.bat
@echo set CLASSPATH=..\lib\Webclient_$(PACKAGE_VER)_win32.jar > runem_win_commercial.bat
@echo $(PERL) .\runem.pl org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) %1% >> runem_win_commercial.bat
copy runem_win_commercial.bat $(PACKAGE_EXAMPLE)\runem.bat
@ -145,8 +145,8 @@ buildRunems:
-mkdir $(PACKAGE_EXAMPLE)
-mkdir $(DIST)\..\java\build\org
-mkdir $(DIST)\..\java\build\org\mozilla
xcopy /E $(DIST)\..\classes\org\mozilla\util $(DIST)\..\java\build\org\mozilla
xcopy /E $(DIST)\..\classes\org\mozilla\xpcom $(DIST)\..\java\build\org\mozilla
xcopy /E /Y $(DIST)\..\classes\org\mozilla\util $(DIST)\..\java\build\org\mozilla
xcopy /E /Y $(DIST)\..\classes\org\mozilla\xpcom $(DIST)\..\java\build\org\mozilla
cd $(DIST)\..\java\build
jar -cvfM0 Blackconnect_$(PACKAGE_VER)_win32.jar org
copy Blackconnect_$(PACKAGE_VER)_win32.jar ..\..\javadev\lib\Blackconnect_$(PACKAGE_VER)_win32.jar
@ -175,8 +175,8 @@ buildRunems:
-mkdir $(PACKAGE_EXAMPLE)
-mkdir $(DIST)\..\java\build\org
-mkdir $(DIST)\..\java\build\org\mozilla
xcopy /E $(DIST)\..\classes\org\mozilla\* $(DIST)\..\java\build\org
xcopy /E $(DIST)\..\classes\org\w3c $(DIST)\..\java\build\org
xcopy /E /Y $(DIST)\..\classes\org\mozilla\* $(DIST)\..\java\build\org
xcopy /E /Y $(DIST)\..\classes\org\w3c $(DIST)\..\java\build\org
cd $(DIST)\..\java\build
jar -cvfM0 Blackwood_$(PACKAGE_VER)_win32.jar org
copy Blackwood_$(PACKAGE_VER)_win32.jar ..\..\javadev\lib\Blackwood_$(PACKAGE_VER)_win32.jar
@ -206,7 +206,7 @@ buildRunems:
chmod 775 $(PACKAGE_LIB)\bcxpcomstubs.dll
chmod 775 $(PACKAGE_LIB)\regxpcom.exe
@echo +++ Creating Commercial Package. Use runem.bat to run the test browser.
del /Q runem_win_commercial.bat
rm -f runem_win_commercial.bat
@echo set CLASSPATH=..\lib\Blackwood_$(PACKAGE_VER)_win32.jar > runem_win_commercial.bat
@echo $(PERL) .\runem.pl org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) %1% >> runem_win_commercial.bat
copy runem_win_commercial.bat $(PACKAGE_EXAMPLE)\runem.bat

4
java/dom/jni/org_mozilla_dom_AttrImpl.cpp
Просмотреть файл

@ -48,7 +48,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_AttrImpl_getName
return NULL;
}
jstring jname = env->NewString((jchar*) name.GetUnicode(), name.Length());
jstring jname = env->NewString((jchar*) name.get(), name.Length());
if (!jname) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Attr.getName: NewString failed\n"));
@ -108,7 +108,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_AttrImpl_getValue
return NULL;
}
jstring jval = env->NewString((jchar*) value.GetUnicode(), value.Length());
jstring jval = env->NewString((jchar*) value.get(), value.Length());
if (!jval) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Attr.getValue: NewString failed\n"));

4
java/dom/jni/org_mozilla_dom_CharacterDataImpl.cpp
Просмотреть файл

@ -125,7 +125,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_CharacterDataImpl_getData
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
JavaDOMGlobals::ThrowException(env,
"CharacterData.getData: NewString failed");
@ -313,7 +313,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_CharacterDataImpl_substringData
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
JavaDOMGlobals::ThrowException(env,
"CharacterData.substringData: NewString failed");

6
java/dom/jni/org_mozilla_dom_DOMAccessor.cpp
Просмотреть файл

@ -33,7 +33,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_register
("DOMAccessor::register: GetService(JavaDOM) failed: %x\n",
rv));
} else {
NS_WITH_SERVICE(nsIWebProgressListener, javaDOM, kJavaDOMCID, &rv);
nsCOMPtr<nsIWebProgressListener> javaDOM;
javaDOM = do_GetService(kJavaDOMCID, &rv);
if (NS_FAILED(rv) || !javaDOM) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("DOMAccessor::register: GetService(JavaDOM) failed: %x\n",
@ -77,7 +78,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_DOMAccessor_unregister
("DOMAccessor::unregister: GetService(DocLoaderService) failed %x\n",
rv));
} else {
NS_WITH_SERVICE(nsIWebProgressListener, javaDOM, kJavaDOMCID, &rv);
nsCOMPtr<nsIWebProgressListener> javaDOM;
javaDOM = do_GetService(kJavaDOMCID, &rv);
if (NS_FAILED(rv) || !javaDOM) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("DOMAccessor::unregister: GetService(JavaDOM) failed %x\n",

8
java/dom/jni/org_mozilla_dom_DocumentTypeImpl.cpp
Просмотреть файл

@ -92,7 +92,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_DocumentTypeImpl_getName
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("DocumentType.getName: NewString failed\n"));
@ -167,7 +167,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_DocumentTypeImpl_getPublicId
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("DocumentType.getPublicId: NewString failed\n"));
@ -200,7 +200,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_DocumentTypeImpl_getSystemId
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("DocumentType.getSystemId: NewString failed\n"));
@ -233,7 +233,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_DocumentTypeImpl_getInternalSubse
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("DocumentType.getInternalSubset: NewString failed\n"));

6
java/dom/jni/org_mozilla_dom_ElementImpl.cpp
Просмотреть файл

@ -58,7 +58,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ElementImpl_getAttribute
return NULL;
}
jstring jattr = env->NewString((jchar*) attr.GetUnicode(), attr.Length());
jstring jattr = env->NewString((jchar*) attr.get(), attr.Length());
if (!jattr) {
JavaDOMGlobals::ThrowException(env,
"Element.getAttribute: NewString failed");
@ -190,7 +190,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ElementImpl_getTagName
return NULL;
}
jstring jTagName = env->NewString((jchar*) tagName.GetUnicode(), tagName.Length());
jstring jTagName = env->NewString((jchar*) tagName.get(), tagName.Length());
if (!jTagName) {
JavaDOMGlobals::ThrowException(env,
"Element.getTagName: NewString failed");
@ -453,7 +453,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ElementImpl_getAttributeNS
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Element.getAttributeNS: NewString failed\n"));

6
java/dom/jni/org_mozilla_dom_EntityImpl.cpp
Просмотреть файл

@ -49,7 +49,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_EntityImpl_getNotationName
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Entity.getNotationName: NewString failed\n"));
@ -83,7 +83,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_EntityImpl_getPublicId
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Entity.getPublicId: NewString failed\n"));
@ -117,7 +117,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_EntityImpl_getSystemId
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Entity.getSystemId: NewString failed\n"));

10
java/dom/jni/org_mozilla_dom_NodeImpl.cpp
Просмотреть файл

@ -561,7 +561,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getNodeName
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
JavaDOMGlobals::ThrowException(env,
"Node.getNodeName: NewString failed");
@ -717,7 +717,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getNodeValue
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
JavaDOMGlobals::ThrowException(env,
"Node.getNodeValue: NewString failed");
@ -1216,7 +1216,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getNamespaceURI
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Node.getNamespaceURI: NewString failed\n"));
@ -1250,7 +1250,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getPrefix
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Node.getPrefix: NewString failed\n"));
@ -1320,7 +1320,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getLocalName
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Node.getLocalName: NewString failed\n"));

4
java/dom/jni/org_mozilla_dom_NotationImpl.cpp
Просмотреть файл

@ -49,7 +49,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NotationImpl_getPublicId
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Notation.getPublicId: NewString failed\n"));
@ -83,7 +83,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NotationImpl_getSystemId
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Notation.getSystemId: NewString failed\n"));

4
java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.cpp
Просмотреть файл

@ -50,7 +50,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ProcessingInstructionImpl_getData
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
JavaDOMGlobals::ThrowException(env,
"ProcessingInstruction.getData: NewString failed");
@ -84,7 +84,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ProcessingInstructionImpl_getTarg
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
JavaDOMGlobals::ThrowException(env,
"ProcessingInstruction.getTarget: NewString failed");

2
java/dom/jni/org_mozilla_dom_events_EventImpl.cpp
Просмотреть файл

@ -221,7 +221,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_events_EventImpl_getType
return NULL;
}
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.get(), ret.Length());
if (!jret) {
JavaDOMGlobals::ThrowException(env,
"Event.getType: NewString failed");

5
java/dom/src/nsJavaDOMImpl.cpp
Просмотреть файл

@ -37,6 +37,7 @@
#include "nsIGenericFactory.h"
#include "nsXPIDLString.h"
#include "nsCOMPtr.h"
#if defined(DEBUG)
#include <stdio.h>
@ -632,8 +633,8 @@ static void dump_node(FILE* of, nsIDOMNode* node, int indent,
node->GetNodeValue(value);
node->GetNodeType(&type);
const PRUnichar* cname = name.GetUnicode();
const PRUnichar* cvalue = value.GetUnicode();
const PRUnichar* cname = name.get();
const PRUnichar* cvalue = value.get();
char* cnorm = strip_whitespace(cvalue, value.Length());
fprintf(of, "name=\"%s\" type=%s value=\"%s\"",
cname, describe_type(type), cnorm);

1
java/webclient/src_moz/BookmarksImpl.cpp
Просмотреть файл

@ -29,6 +29,7 @@
#include "nsCOMPtr.h"
#include "nsISimpleEnumerator.h"
#include "nsString.h"
JNIEXPORT void JNICALL
Java_org_mozilla_webclient_wrapper_1native_BookmarksImpl_nativeAddBookmark

16
java/webclient/src_moz/CBrowserContainer.cpp
Просмотреть файл

@ -664,7 +664,7 @@ NS_IMETHODIMP CBrowserContainer::OnProgressChange(nsIWebProgress *aWebProgress,
JNIEnv *env = (JNIEnv *) JNU_GetEnv(gVm, JNI_VERSION);
msgJStr = (jobject) ::util_NewString(env, autoName.GetUnicode(),
msgJStr = (jobject) ::util_NewString(env, autoName.get(),
autoName.Length());
util_SendEventToJava(mInitContext->env,
@ -704,7 +704,7 @@ NS_IMETHODIMP CBrowserContainer::OnStatusChange(nsIWebProgress *aWebProgress,
JNIEnv *env = (JNIEnv *) JNU_GetEnv(gVm, JNI_VERSION);
jstring statusMessage = ::util_NewString(env, (const jchar *)
aMsg.GetUnicode(), length);
aMsg.get(), length);
util_SendEventToJava(mInitContext->env, mInitContext->nativeEventThread,
mDocTarget,
@ -842,7 +842,7 @@ CBrowserContainer::doStartURLLoad(const PRUnichar *aDocumentName)
#endif
nsAutoString nameAutoStr(aDocumentName);
jstring nameJStr = ::util_NewString(env, (const jchar *)
nameAutoStr.GetUnicode(),
nameAutoStr.get(),
nameAutoStr.Length());
util_SendEventToJava(mInitContext->env,
@ -875,7 +875,7 @@ CBrowserContainer::doEndURLLoad(const PRUnichar *aDocumentName)
#endif
nsAutoString nameAutoStr(aDocumentName);
jstring nameJStr = ::util_NewString(env, (const jchar *)
nameAutoStr.GetUnicode(),
nameAutoStr.get(),
nameAutoStr.Length());
util_SendEventToJava(mInitContext->env,
@ -1745,9 +1745,9 @@ nsresult JNICALL CBrowserContainer::takeActionOnNode(nsCOMPtr<nsIDOMNode> curren
PR_LOG(prLogModuleInfo, 4, ("%s", (const char *)nodeInfoCStr));
}
jNodeName = ::util_NewString(env, nodeName.GetUnicode(),
jNodeName = ::util_NewString(env, nodeName.get(),
nodeName.Length());
jNodeValue = ::util_NewString(env, nodeValue.GetUnicode(),
jNodeValue = ::util_NewString(env, nodeValue.get(),
nodeValue.Length());
util_StoreIntoPropertiesObject(env, (jobject) curThis->properties,
@ -1809,9 +1809,9 @@ nsresult JNICALL CBrowserContainer::takeActionOnNode(nsCOMPtr<nsIDOMNode> curren
PR_LOG(prLogModuleInfo, 4,
("attribute[%d] %s", i,(const char *)nodeInfoCStr));
}
jNodeName = ::util_NewString(env, nodeName.GetUnicode(),
jNodeName = ::util_NewString(env, nodeName.get(),
nodeName.Length());
jNodeValue = ::util_NewString(env, nodeValue.GetUnicode(),
jNodeValue = ::util_NewString(env, nodeValue.get(),
nodeValue.Length());
util_StoreIntoPropertiesObject(env, (jobject) curThis->properties,

6
java/webclient/src_moz/CurrentPageActionEvents.cpp
Просмотреть файл

@ -40,7 +40,8 @@
#include "nsIContentViewer.h"
#include "nsIContentViewerEdit.h"
#include "nsIInterfaceRequestor.h"
#include "nsCOMPtr.h"
#include "nsIServiceManager.h"
wsCopySelectionEvent::wsCopySelectionEvent(WebShellInitContext *yourInitContext) :
nsActionEvent(),
@ -98,7 +99,8 @@ wsFindEvent::handleEvent ()
if (mInitContext) {
//First get the FindComponent object
NS_WITH_SERVICE(nsIFindComponent, findComponent, NS_IFINDCOMPONENT_CONTRACTID, &rv);
nsCOMPtr<nsIFindComponent> findComponent;
findComponent = do_GetService(NS_IFINDCOMPONENT_CONTRACTID, &rv);
if (NS_FAILED(rv) || nsnull == findComponent) {
return (void *) rv;

2
java/webclient/src_moz/HistoryImpl.cpp
Просмотреть файл

@ -31,6 +31,8 @@
#include "ns_util.h"
#include "nsCRT.h"
JNIEXPORT void JNICALL
Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeBack

8
java/webclient/src_moz/NavigationActionEvents.cpp
Просмотреть файл

@ -67,7 +67,7 @@ wsLoadURLEvent::handleEvent ()
printf ("+++++++++++++++++++++ Thread Id ---- %p\n\n", threadId);
if (mWebNavigation && mURL) {
nsresult rv = mWebNavigation->LoadURI(mURL->GetUnicode(), nsIWebNavigation::LOAD_FLAGS_NONE);
nsresult rv = mWebNavigation->LoadURI(mURL->get(), nsIWebNavigation::LOAD_FLAGS_NONE);
}
return nsnull;
} // handleEvent()
@ -317,8 +317,8 @@ wsPostEvent::handleEvent ()
rv = lh->OnLinkClick(content,
eLinkVerb_Replace,
mAbsoluteURL->GetUnicode(),
((mTarget != nsnull) ? mTarget->GetUnicode() : nsnull),
mAbsoluteURL->get(),
((mTarget != nsnull) ? mTarget->get() : nsnull),
postDataStream,
headersDataStream);
@ -352,7 +352,7 @@ void *
wsStopEvent::handleEvent ()
{
if (mWebNavigation) {
nsresult rv = mWebNavigation->Stop();
nsresult rv = mWebNavigation->Stop(nsIWebNavigation::STOP_ALL);
}
return nsnull;
} // handleEvent()

3
java/webclient/src_moz/PreferencesActionEvents.cpp
Просмотреть файл

@ -28,6 +28,9 @@
#include "nsIPref.h"
#include "nsCRT.h" // for memset
#include "nsString2.h" // for nsAutoString
#include "nsIServiceManager.h" // for do_GetService
static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);

2
java/webclient/src_moz/PromptActionEvents.cpp
Просмотреть файл

@ -27,7 +27,7 @@
#include "PromptActionEvents.h"
#include "ns_util.h"
#include "nsString2.h" // for nsAutoString
wsPromptUsernameAndPasswordEvent::wsPromptUsernameAndPasswordEvent(WebShellInitContext *yourInitContext,
jobject yourPromptGlobalRef,

1
java/webclient/src_moz/RDFActionEvents.cpp
Просмотреть файл

@ -45,6 +45,7 @@
#include "nsRDFCID.h" // for NS_RDFCONTAINER_CID
#include "wsRDFObserver.h"
#include "nsString.h" // for nsCAutoString
static NS_DEFINE_CID(kRDFContainerCID, NS_RDFCONTAINER_CID);
static NS_DEFINE_CID(kSupportsArrayCID, NS_SUPPORTSARRAY_CID);

8
java/webclient/src_moz/ns_util.cpp
Просмотреть файл

@ -33,6 +33,8 @@
#include "nsIStringBundle.h"
#include "nsIServiceManager.h"
#include "nsString2.h"
static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
#define kCommonDialogsProperties "chrome://global/locale/commonDialogs.properties"
@ -86,9 +88,9 @@ nsresult util_CreateJstringsFromUnichars(wsStringStruct *strings,
for (i = 0; i < arrayLen; i++) {
autoStr = strings[i].uniStr;
strings[i].jStr = nsnull;
if (autoStr.GetUnicode()) {
if (autoStr.get()) {
strings[i].jStr = ::util_NewString(env, (const jchar *)
autoStr.GetUnicode(),
autoStr.get(),
autoStr.Length());
if (nsnull == strings[i].jStr) {
return NS_ERROR_NULL_POINTER;
@ -166,7 +168,7 @@ nsresult util_GetLocaleString(const char *aKey, PRUnichar **aResult)
rv = stringService->CreateBundle(kCommonDialogsProperties, getter_AddRefs(stringBundle));
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
rv = stringBundle->GetStringFromName(NS_ConvertASCIItoUCS2(aKey).GetUnicode(), aResult);
rv = stringBundle->GetStringFromName(NS_ConvertASCIItoUCS2(aKey).get(), aResult);
return rv;

2
java/xpcom/java/import/makefile.win
Просмотреть файл

@ -48,7 +48,7 @@ $(JAVAXPIDLSRCS) :
#idk@eng.sun.com (04/02/2001)
exclude:
del nsISupportsPRTime.java
rm -f nsISupportsPRTime.java
java2class:
if not exist $(DEPTH)\dist\classes mkdir $(DEPTH)\dist\classes

4
java/xpcom/java/loader/bcJavaComponentLoader.cpp
Просмотреть файл

@ -289,7 +289,7 @@ nsresult bcJavaComponentLoader::SetRegistryInfo(const char *registryLocation,
PRInt64 modDate;
if (NS_FAILED(rv = component->GetLastModifiedTime(&modDate)) ||
if (NS_FAILED(rv = component->GetLastModificationDate(&modDate)) ||
NS_FAILED(rv = mRegistry->SetLongLong(key, lastModValueName, &modDate)))
return rv;
@ -317,7 +317,7 @@ PRBool bcJavaComponentLoader::HasChanged(const char *registryLocation, nsIFile *
if (NS_FAILED(mRegistry->GetLongLong(key, lastModValueName, &regTime)))
return PR_TRUE;
if (NS_FAILED(component->GetLastModifiedTime(&lastTime)) || LL_NE(lastTime, regTime))
if (NS_FAILED(component->GetLastModificationDate(&lastTime)) || LL_NE(lastTime, regTime))
return PR_TRUE;
/* check file size */