Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug=32011

Browse Source 
r=ashuk
a=edburns
This set of changes replaces all occurrences of

env->Func(args...)

with

::util_Func(env, args...)

Except of course, for the implementations of the above mentioned
::util_Func() functions.

This is done to allow the JNI functions to be called from a non JNI
context, such as UNO.


git-svn-id: svn://10.0.0.236/trunk@63190 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2000-03-16 23:07:03 +00:00
parent 53322f1498
commit b233b02f87
13 changed files with 337 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/java/webclient/src_moz/NavigationImpl.cpp
View File

@@ -35,17 +35,19 @@ JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_NavigationImpl
(JNIEnv *env, jobject obj, jint webShellPtr, jstring urlString)
{
jobject jobj = obj;
const char * urlChars = (char *) env->GetStringUTFChars(urlString, 0);
const char * urlChars = (char *) ::util_GetStringUTFChars(env,
urlString);
printf("Native URL = \"%s\"\n", urlChars);
env->ReleaseStringUTFChars(urlString, urlChars);
::util_ReleaseStringUTFChars(env, urlString, urlChars);
PRUnichar * urlStringChars = (PRUnichar *) env->GetStringChars(urlString, 0);
PRUnichar * urlStringChars = (PRUnichar *) ::util_GetStringChars(env,
urlString);
if (env->ExceptionOccurred()) {
if (::util_ExceptionOccurred(env)) {
::util_ThrowExceptionToJava(env, "raptorWebShellLoadURL Exception: unable to extract Java string");
if (urlStringChars != nsnull)
env->ReleaseStringChars(urlString, urlStringChars);
::util_ReleaseStringChars(env, urlString, urlStringChars);
return;
}
@@ -54,7 +56,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_NavigationImpl
if (initContext == nsnull) {
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellLoadURL");
if (urlStringChars != nsnull)
env->ReleaseStringChars(urlString, urlStringChars);
::util_ReleaseStringChars(env, urlString, urlStringChars);
return;
}
@@ -65,7 +67,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_NavigationImpl
::util_PostEvent(initContext, event);
}
env->ReleaseStringChars(urlString, urlStringChars);
::util_ReleaseStringChars(env, urlString, urlStringChars);
}
JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_NavigationImpl_nativeRefresh