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
325 lines
9.7 KiB
C++
325 lines
9.7 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): Kirk Baker <kbaker@eb.com>
|
|
* Ian Wilkinson <iw@ennoble.com>
|
|
* Mark Lin <mark.lin@eng.sun.com>
|
|
* Mark Goddard
|
|
* Ed Burns <edburns@acm.org>
|
|
* Ashutosh Kulkarni <ashuk@eng.sun.com>
|
|
*/
|
|
|
|
#include "HistoryImpl.h"
|
|
|
|
#include "ns_util.h"
|
|
|
|
#include "nsActions.h"
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeBack
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
JNIEnv * pEnv = env;
|
|
jobject jobj = obj;
|
|
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellBack");
|
|
return;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsBackEvent * actionEvent =
|
|
new wsBackEvent(initContext->webNavigation);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
::util_PostSynchronousEvent(initContext, event);
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
JNIEXPORT jboolean
|
|
JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeCanBack
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
jboolean result = JNI_FALSE;
|
|
JNIEnv * pEnv = env;
|
|
jobject jobj = obj;
|
|
void * voidResult;
|
|
// PRBool voidResult;
|
|
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellCanBack");
|
|
return result;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsCanBackEvent * actionEvent =
|
|
new wsCanBackEvent(initContext->webNavigation);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
voidResult = ::util_PostSynchronousEvent(initContext, event);
|
|
|
|
result = (PR_FALSE == ((PRBool) voidResult)) ? JNI_FALSE : JNI_TRUE;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jobjectArray JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeGetBackList
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
jobjectArray result = nsnull;
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeClearHistory
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
|
|
}
|
|
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeForward
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
JNIEnv * pEnv = env;
|
|
jobject jobj = obj;
|
|
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellForward");
|
|
return;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsForwardEvent * actionEvent =
|
|
new wsForwardEvent(initContext->webNavigation);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
::util_PostSynchronousEvent(initContext, event);
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
JNIEXPORT jboolean JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeCanForward
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
jboolean result = JNI_FALSE;
|
|
JNIEnv * pEnv = env;
|
|
jobject jobj = obj;
|
|
void * voidResult;
|
|
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellCanForward");
|
|
return result;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsCanForwardEvent * actionEvent =
|
|
new wsCanForwardEvent(initContext->webNavigation);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
voidResult = ::util_PostSynchronousEvent(initContext, event);
|
|
|
|
result = (PR_FALSE == ((PRBool) voidResult)) ? JNI_FALSE : JNI_TRUE;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jobjectArray JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeGetForwardList
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
jobjectArray result = nsnull;
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jobjectArray JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeGetHistory
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
jobjectArray result = nsnull;
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jobject JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeGetHistoryEntry
|
|
(JNIEnv *env, jobject obj, jint webShellPtr, jint historyIndex)
|
|
{
|
|
jobject result = nsnull;
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jint JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeGetCurrentHistoryIndex
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
JNIEnv * pEnv = env;
|
|
jobject jobj = obj;
|
|
void * voidResult = nsnull;
|
|
jint result = -1;
|
|
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellGetHistoryIndex");
|
|
return result;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
nsISHistory* sHistory;
|
|
nsresult rv = initContext->webNavigation->GetSessionHistory(&sHistory);
|
|
|
|
if ( NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: couldn't get History for passing to raptorWebShellGetHistoryIndex");
|
|
return result;
|
|
}
|
|
|
|
wsGetHistoryIndexEvent * actionEvent =
|
|
new wsGetHistoryIndexEvent(sHistory);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
voidResult = ::util_PostSynchronousEvent(initContext, event);
|
|
|
|
result = (jint) voidResult;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeSetCurrentHistoryIndex
|
|
(JNIEnv *env, jobject obj, jint webShellPtr, jint historyIndex)
|
|
{
|
|
JNIEnv * pEnv = env;
|
|
jobject jobj = obj;
|
|
void * voidResult = nsnull;
|
|
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to nativeSetCurrentHistoryIndex");
|
|
return;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsGoToEvent * actionEvent =
|
|
new wsGoToEvent(initContext->webNavigation, historyIndex);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
voidResult = ::util_PostSynchronousEvent(initContext, event);
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
JNIEXPORT jint JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeGetHistoryLength
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
JNIEnv * pEnv = env;
|
|
jobject jobj = obj;
|
|
void * voidResult = nsnull;
|
|
jint result = -1;
|
|
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellGetHistoryLength");
|
|
return result;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
nsISHistory* sHistory;
|
|
nsresult rv = initContext->webNavigation->GetSessionHistory(&sHistory);
|
|
|
|
if ( NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: couldn't get History for passing to raptorWebShellGetHistoryIndex");
|
|
return result;
|
|
}
|
|
|
|
wsGetHistoryLengthEvent * actionEvent =
|
|
new wsGetHistoryLengthEvent(sHistory);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
voidResult = ::util_PostSynchronousEvent(initContext, event);
|
|
|
|
result = (jint) voidResult;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jstring JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeGetURLForIndex
|
|
(JNIEnv *env, jobject obj, jint webShellPtr, jint historyIndex)
|
|
{
|
|
JNIEnv * pEnv = env;
|
|
jobject jobj = obj;
|
|
char * charResult = nsnull;
|
|
jstring urlString = nsnull;
|
|
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellGetURL");
|
|
return nsnull;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
nsISHistory* sHistory;
|
|
nsresult rv = initContext->webNavigation->GetSessionHistory(&sHistory);
|
|
|
|
if ( NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: couldn't get History for passing to raptorWebShellGetHistoryIndex");
|
|
return nsnull;
|
|
}
|
|
|
|
wsGetURLForIndexEvent * actionEvent =
|
|
new wsGetURLForIndexEvent(initContext->sHistory,
|
|
historyIndex);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
charResult = (char *) ::util_PostSynchronousEvent(initContext, event);
|
|
|
|
if (charResult != nsnull) {
|
|
urlString = ::util_NewStringUTF(env, (const char *) charResult);
|
|
}
|
|
else {
|
|
::util_ThrowExceptionToJava(env, "raptorWebShellGetURL Exception: GetURL() returned nsnull");
|
|
return nsnull;
|
|
}
|
|
|
|
nsCRT::free(charResult);
|
|
}
|
|
|
|
return urlString;
|
|
}
|