a=edburns
r=ashuk
This change creates a new directory, java/webclient/src_share, that
contains the code that will be used in both src_moz and src_ie, and any
other native browser wrapping implementations.
Here are the steps I followed to implement this change.
1. Create a new directory java/webclient/src_share
2. Move all jni_util*.* files from src_moz into src_share
3. Make it so src_share compiles into a new .lib
src_share has no netscape dependencies. Any functionality that
depended on ns dependencies was kept in src_moz. In this case, we
have a function prototype only in src_share, with the implementation
in src_moz. We did this for nsHashtable. The other trick was for
things in WebShellInitContext that had nothing to do with Netscape.
This case was accomodated by creating a new struct, ShareInitContext,
that contains all WebShellInitContext members that have nothing to do
with Netscape. Currently this is just jobject propertiesClass. I
modified the WebShellInitContext struct to contain a ShareContext
struct as its last member. There are two new methods in jni_util.h
that allow for the initialization and deallocation of the members of
the ShareContext struct.
4. Make it so src_moz uses the new .lib to provide the jni_util behavior
a. Create ns_util* files that include ../src_share/jni_util* files
appropriately.
The only tricky part was for things in jni_util.h that
Here's the list of files in this change.
cvs -z3 -n update (in directory D:\Projects\mozilla\java\webclient)
cvs server: Updating .
M Makefile.win // added src_share to DIRS
M src_moz/BookmarksImpl.cpp // include ns_util instead of jni_util
M src_moz/CBrowserContainer.cpp // include ns_util instead of jni_util
M src_moz/CBrowserContainer.h // include ns_util instead of jni_util
M src_moz/CurrentPageImpl.cpp // include ns_util instead of jni_util
M src_moz/HistoryImpl.cpp // include ns_util instead of jni_util
M src_moz/Makefile.win // include ns_util instead of jni_util
M src_moz/NativeEventThread.cpp // include ns_util instead of jni_util
M src_moz/NavigationImpl.cpp // include ns_util instead of jni_util
M src_moz/RDFEnumeration.cpp // include ns_util instead of jni_util
M src_moz/RDFTreeNode.cpp // include ns_util instead of jni_util
M src_moz/WindowControlImpl.cpp // include ns_util instead of jni_util
// also use new util_InitShareContext
// function
M src_moz/WrapperFactoryImpl.cpp // include ns_util instead of jni_util
R src_moz/jni_util.cpp // moved to ../src_share
R src_moz/jni_util.h // moved to ../src_share
R src_moz/jni_util_export.cpp // moved to ../src_share
R src_moz/jni_util_export.h // moved to ../src_share
M src_moz/nsActions.cpp // include ns_util instead of jni_util
// also use new
util_DeallocateShareContext
M src_moz/nsActions.h // include ns_util instead of jni_util
A src_moz/ns_util.cpp // include jni_util.h
A src_moz/ns_util.h // include jni_util.h, changes to
// WebshellInitContext struct
A src_moz/ns_util_export.cpp // provide impls for methods in
// jni_util_export.h
A src_share/Makefile.win
A src_share/bal_util.cpp
A src_share/bal_util.h
A src_share/jni_util.cpp
A src_share/jni_util.h
A src_share/jni_util_export.cpp
A src_share/jni_util_export.h
*****CVS exited normally with code 0*****
git-svn-id: svn://10.0.0.236/trunk@75504 18797224-902f-48f8-a5cc-f745e15eee43
228 lines
6.0 KiB
C++
228 lines
6.0 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
|
*
|
|
* The contents of this file are subject to the Mozilla Public
|
|
* License Version 1.1 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.mozilla.org/MPL/
|
|
*
|
|
* Software distributed under the License is distributed on an "AS
|
|
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
|
* implied. See the License for the specific language governing
|
|
* rights and limitations under the License.
|
|
*
|
|
* The Original Code is RaptorCanvas.
|
|
*
|
|
* The Initial Developer of the Original Code is Kirk Baker and
|
|
* Ian Wilkinson. Portions created by Kirk Baker and Ian Wilkinson are
|
|
* Copyright (C) 1999 Kirk Baker and Ian Wilkinson. All
|
|
* Rights Reserved.
|
|
*
|
|
* Contributor(s): Ed Burns <edburns@acm.org>
|
|
*
|
|
*/
|
|
|
|
#include "jni_util_export.h"
|
|
#include "jni_util.h"
|
|
|
|
#include "bal_util.h"
|
|
|
|
fpEventOccurredType externalEventOccurred = nsnull; // jni_util_export.h
|
|
|
|
fpInstanceOfType externalInstanceOf = nsnull; // jni_util_export.h
|
|
|
|
fpInitializeEventMaskType externalInitializeEventMask = nsnull; // jni_util_export.h
|
|
|
|
fpCreatePropertiesObjectType externalCreatePropertiesObject = nsnull; // jni_util_export.h
|
|
|
|
fpDestroyPropertiesObjectType externalDestroyPropertiesObject = nsnull; // jni_util_export.h
|
|
|
|
fpClearPropertiesObjectType externalClearPropertiesObject = nsnull; // jni_util_export.h
|
|
|
|
fpStoreIntoPropertiesObjectType externalStoreIntoPropertiesObject = nsnull; // jni_util_export.h
|
|
|
|
JNIEXPORT const char * JNICALL util_GetStringUTFChars(JNIEnv *env,
|
|
jstring inString)
|
|
{
|
|
const char *result = nsnull;
|
|
|
|
#ifdef BAL_INTERFACE
|
|
char *nonConstResult;
|
|
bal_str_newFromJstring(&nonConstResult, inString);
|
|
result = (const char *)nonConstResult;
|
|
#else
|
|
result = (const char *) env->GetStringUTFChars(inString, 0);
|
|
#endif
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL util_ReleaseStringUTFChars(JNIEnv *env,
|
|
jstring inString,
|
|
const char *stringFromGet)
|
|
{
|
|
|
|
#ifdef BAL_INTERFACE
|
|
bal_str_release(stringFromGet);
|
|
#else
|
|
env->ReleaseStringUTFChars(inString, stringFromGet);
|
|
#endif
|
|
|
|
}
|
|
|
|
JNIEXPORT const jchar * JNICALL util_GetStringChars(JNIEnv *env,
|
|
jstring inString)
|
|
{
|
|
const jchar *result = nsnull;
|
|
|
|
#ifdef BAL_INTERFACE
|
|
// ASSUMES typedef wchar_t jchar;
|
|
// ASSUMES typedef wchar_t *jstring;
|
|
result = (const jchar *) inString;
|
|
#else
|
|
result = (const jchar *) env->GetStringChars(inString, 0);
|
|
#endif
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL util_ReleaseStringChars(JNIEnv *env, jstring inString,
|
|
const jchar *stringFromGet)
|
|
{
|
|
|
|
#ifdef BAL_INTERFACE
|
|
// NO action necessary, see NewStringChars
|
|
#else
|
|
env->ReleaseStringChars(inString, stringFromGet);
|
|
#endif
|
|
|
|
}
|
|
|
|
JNIEXPORT jstring JNICALL util_NewStringUTF(JNIEnv *env, const char *inString)
|
|
{
|
|
jstring result = nsnull;
|
|
#ifdef BAL_INTERFACE
|
|
bal_jstring_newFromAscii(&result, inString);
|
|
#else
|
|
result = env->NewStringUTF(inString);
|
|
#endif
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL util_DeleteStringUTF(JNIEnv *env, jstring toDelete)
|
|
{
|
|
#ifdef BAL_INTERFACE
|
|
util_DeleteString(env, toDelete);
|
|
#else
|
|
// do nothing, java takes care of it
|
|
#endif
|
|
|
|
}
|
|
|
|
JNIEXPORT jstring JNICALL util_NewString(JNIEnv *env, const jchar *inString,
|
|
jsize len)
|
|
{
|
|
jstring result = nsnull;
|
|
#ifdef BAL_INTERFACE
|
|
bal_jstring_newFromJcharArray(&result, inString, len);
|
|
#else
|
|
result = env->NewString(inString, len);
|
|
#endif
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL util_DeleteString(JNIEnv *env, jstring toDelete)
|
|
{
|
|
#ifdef BAL_INTERFACE
|
|
bal_jstring_release(toDelete);
|
|
#else
|
|
// do nothing, java takes care of it
|
|
#endif
|
|
|
|
}
|
|
|
|
JNIEXPORT void JNICALL util_SetEventOccurredFunction(fpEventOccurredType fp)
|
|
{
|
|
externalEventOccurred = fp;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL util_SetInstanceOfFunction(fpInstanceOfType fp)
|
|
{
|
|
externalInstanceOf = fp;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL util_SetInitializeEventMaskFunction(fpInitializeEventMaskType fp)
|
|
{
|
|
externalInitializeEventMask = fp;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL util_SetCreatePropertiesObjectFunction(fpCreatePropertiesObjectType fp)
|
|
{
|
|
externalCreatePropertiesObject = fp;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL util_SetDestroyPropertiesObjectFunction(fpDestroyPropertiesObjectType fp)
|
|
{
|
|
externalDestroyPropertiesObject = fp;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL util_SetClearPropertiesObjectFunction(fpClearPropertiesObjectType fp)
|
|
{
|
|
externalClearPropertiesObject = fp;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL util_SetStoreIntoPropertiesObjectFunction(fpStoreIntoPropertiesObjectType fp)
|
|
{
|
|
externalStoreIntoPropertiesObject = fp;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
util_InitializeEventMaskValuesFromClass(const char *className,
|
|
char *maskNames[],
|
|
jlong maskValues[])
|
|
{
|
|
int i = 0;
|
|
JNIEnv *env = nsnull;
|
|
if (nsnull == className) {
|
|
return;
|
|
}
|
|
|
|
if (nsnull != gVm) {
|
|
env = (JNIEnv *) JNU_GetEnv(gVm, JNI_VERSION_1_2);
|
|
}
|
|
|
|
jclass clazz = ::util_FindClass(env, className);
|
|
|
|
if (nsnull == clazz) {
|
|
return;
|
|
}
|
|
|
|
#ifdef BAL_INTERFACE
|
|
if (nsnull != externalInitializeEventMask) {
|
|
externalInitializeEventMask(env, clazz,
|
|
(const char **) maskNames, maskValues);
|
|
}
|
|
#else
|
|
if (nsnull == env) {
|
|
return;
|
|
}
|
|
|
|
jfieldID fieldID;
|
|
|
|
while (nsnull != maskNames[i]) {
|
|
fieldID = ::util_GetStaticFieldID(env, clazz,
|
|
maskNames[i], "J");
|
|
|
|
if (nsnull == fieldID) {
|
|
return;
|
|
}
|
|
|
|
maskValues[i] = ::util_GetStaticLongField(env, clazz,
|
|
fieldID);
|
|
i++;
|
|
}
|
|
|
|
#endif
|
|
}
|