mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-08 20:47:44 +00:00
22af3b9709
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*****
293 lines
9.5 KiB
C++
293 lines
9.5 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 "RDFTreeNode.h"
|
|
|
|
#include "rdf_util.h"
|
|
#include "rdf_progids.h"
|
|
#include "ns_util.h"
|
|
|
|
#include "nsIServiceManager.h"
|
|
|
|
#include "prlog.h" // for PR_ASSERT
|
|
|
|
//
|
|
// Local function prototypes
|
|
//
|
|
|
|
//
|
|
// JNI methods
|
|
//
|
|
|
|
JNIEXPORT jboolean JNICALL Java_org_mozilla_webclient_wrapper_1native_RDFTreeNode_nativeIsLeaf
|
|
(JNIEnv *env, jobject obj, jint nativeRDFNode)
|
|
{
|
|
nsCOMPtr<nsIRDFNode> node = (nsIRDFNode *) nativeRDFNode;
|
|
nsCOMPtr<nsIRDFResource> nodeResource;
|
|
nsresult rv;
|
|
jboolean result = JNI_FALSE;
|
|
PRInt32 count;
|
|
|
|
rv = node->QueryInterface(NS_GET_IID(nsIRDFResource),
|
|
getter_AddRefs(nodeResource));
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: nativeIsLeaf: nativeRDFNode is not an RDFResource.");
|
|
return result;
|
|
}
|
|
rv = rdf_getChildCount(nodeResource, &count);
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: nativeIsLeaf: can't get child count from nativeRDFNode.");
|
|
return result;
|
|
}
|
|
result = (0 == count) ? JNI_TRUE : JNI_FALSE;
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jboolean JNICALL Java_org_mozilla_webclient_wrapper_1native_RDFTreeNode_nativeIsContainer
|
|
(JNIEnv *env, jobject obj, jint nativeRDFNode)
|
|
{
|
|
nsCOMPtr<nsIRDFNode> node = (nsIRDFNode *) nativeRDFNode;
|
|
nsCOMPtr<nsIRDFResource> nodeResource;
|
|
nsresult rv;
|
|
jboolean result = JNI_FALSE;
|
|
PRBool prBool;
|
|
|
|
rv = node->QueryInterface(NS_GET_IID(nsIRDFResource),
|
|
getter_AddRefs(nodeResource));
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: nativeIsContainer: nativeRDFNode is not an RDFResource.");
|
|
return result;
|
|
}
|
|
rv = gRDFCU->IsContainer(gBookmarksDataSource, nodeResource,
|
|
&prBool);
|
|
result = (prBool == PR_FALSE) ? JNI_FALSE : JNI_TRUE;
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
|
|
JNIEXPORT jint JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_RDFTreeNode_nativeGetChildAt
|
|
(JNIEnv *env, jobject obj, jint nativeRDFNode, jint childIndex)
|
|
{
|
|
jint result = -1;
|
|
nsresult rv;
|
|
// PENDING(edburns): assert rdf_InitRDFUtils()
|
|
nsCOMPtr<nsIRDFResource> parent = (nsIRDFResource *) nativeRDFNode;
|
|
nsCOMPtr<nsIRDFResource> child;
|
|
|
|
rv = rdf_getChildAt(childIndex, parent, getter_AddRefs(child));
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: nativeGetChildAt: Can't get child.");
|
|
return result;
|
|
}
|
|
result = (jint)child.get();
|
|
((nsISupports *)result)->AddRef();
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jint JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_RDFTreeNode_nativeGetChildCount
|
|
(JNIEnv *env, jobject obj, jint nativeRDFNode)
|
|
{
|
|
jint result = -1;
|
|
PRInt32 count;
|
|
nsresult rv;
|
|
// PENDING(edburns): assert rdf_InitRDFUtils()
|
|
nsCOMPtr<nsIRDFResource> parent = (nsIRDFResource *) nativeRDFNode;
|
|
|
|
rv = rdf_getChildCount(parent, &count);
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: nativeGetChildCount: Can't get child count.");
|
|
return result;
|
|
}
|
|
result = (jint)count;
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jint JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_RDFTreeNode_nativeGetIndex
|
|
(JNIEnv *env, jobject obj, jint nativeRDFNode, jint childRDFNode)
|
|
{
|
|
jint result = -1;
|
|
PRInt32 index;
|
|
nsresult rv;
|
|
// PENDING(edburns): assert rdf_InitRDFUtils()
|
|
nsCOMPtr<nsIRDFResource> parent = (nsIRDFResource *) nativeRDFNode;
|
|
nsCOMPtr<nsIRDFResource> child = (nsIRDFResource *) childRDFNode;
|
|
|
|
rv = rdf_getIndexOfChild(parent, child, &index);
|
|
result = (jint) index;
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jstring JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_RDFTreeNode_nativeToString
|
|
(JNIEnv *env, jobject obj, jint nativeRDFNode)
|
|
{
|
|
nsCOMPtr<nsIRDFResource> currentResource =
|
|
(nsIRDFResource *) nativeRDFNode;
|
|
nsCOMPtr<nsIRDFNode> node;
|
|
nsCOMPtr<nsIRDFLiteral> literal;
|
|
jstring result = nsnull;
|
|
PRBool isContainer = PR_FALSE;
|
|
nsresult rv;
|
|
const PRUnichar *textForNode = nsnull;
|
|
|
|
rv = gRDFCU->IsContainer(gBookmarksDataSource, currentResource,
|
|
&isContainer);
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: nativeToString: Can't tell if RDFResource is container.");
|
|
return result;
|
|
}
|
|
|
|
if (isContainer) {
|
|
// It's a bookmarks folder
|
|
rv = gBookmarksDataSource->GetTarget(currentResource,
|
|
kNC_Name, PR_TRUE,
|
|
getter_AddRefs(node));
|
|
// get the name of the folder
|
|
if (rv == 0) {
|
|
// if so, make sure it's an nsIRDFLiteral
|
|
rv = node->QueryInterface(NS_GET_IID(nsIRDFLiteral),
|
|
getter_AddRefs(literal));
|
|
if (NS_SUCCEEDED(rv)) {
|
|
rv = literal->GetValueConst(&textForNode);
|
|
}
|
|
else {
|
|
if (prLogModuleInfo) {
|
|
PR_LOG(prLogModuleInfo, 3,
|
|
("nativeToString: node is not an nsIRDFLiteral.\n"));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
// It's a bookmark or a Separator
|
|
rv = gBookmarksDataSource->GetTarget(currentResource,
|
|
kNC_URL, PR_TRUE,
|
|
getter_AddRefs(node));
|
|
// See if it has a Name
|
|
if (0 != rv) {
|
|
rv = gBookmarksDataSource->GetTarget(currentResource,
|
|
kNC_Name, PR_TRUE,
|
|
getter_AddRefs(node));
|
|
}
|
|
|
|
if (0 == rv) {
|
|
rv = node->QueryInterface(NS_GET_IID(nsIRDFLiteral),
|
|
getter_AddRefs(literal));
|
|
if (NS_SUCCEEDED(rv)) {
|
|
// get the value of the literal
|
|
rv = literal->GetValueConst(&textForNode);
|
|
if (NS_FAILED(rv)) {
|
|
if (prLogModuleInfo) {
|
|
PR_LOG(prLogModuleInfo, 3,
|
|
("nativeToString: node doesn't have a value.\n"));
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
rdf_printArcLabels(currentResource);
|
|
if (prLogModuleInfo) {
|
|
PR_LOG(prLogModuleInfo, 3,
|
|
("nativeToString: node is not an nsIRDFLiteral.\n"));
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
rdf_printArcLabels(currentResource);
|
|
if (prLogModuleInfo) {
|
|
PR_LOG(prLogModuleInfo, 3,
|
|
("nativeToString: node doesn't have a URL.\n"));
|
|
}
|
|
}
|
|
}
|
|
|
|
if (nsnull != textForNode) {
|
|
nsString * string = new nsString(textForNode);
|
|
int length = 0;
|
|
if (nsnull != string) {
|
|
length = string->Length();
|
|
}
|
|
|
|
result = ::util_NewString(env, (const jchar *) textForNode, length);
|
|
}
|
|
else {
|
|
result = ::util_NewStringUTF(env, "");
|
|
}
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_RDFTreeNode_nativeInsertElementAt
|
|
(JNIEnv *env, jobject obj, jint parentRDFNode,
|
|
jint childRDFNode, jint childIndex)
|
|
{
|
|
nsCOMPtr<nsIRDFResource> parent = (nsIRDFResource *) parentRDFNode;
|
|
nsCOMPtr<nsIRDFResource> newChild = (nsIRDFResource *) childRDFNode;
|
|
nsCOMPtr<nsIRDFContainer> container;
|
|
nsresult rv;
|
|
PRBool isContainer;
|
|
|
|
rv = gRDFCU->IsContainer(gBookmarksDataSource, parent,
|
|
&isContainer);
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: nativeNewRDFNode: RDFResource is not a container.");
|
|
return;
|
|
}
|
|
|
|
PR_ASSERT(gComponentManager);
|
|
|
|
// get a container in order to create a child
|
|
rv = gComponentManager->CreateInstanceByProgID(NS_RDFCONTAINER_PROGID,
|
|
nsnull,
|
|
NS_GET_IID(nsIRDFContainer),
|
|
getter_AddRefs(container));
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: nativeNewRDFNode: can't create container.");
|
|
return;
|
|
}
|
|
rv = container->Init(gBookmarksDataSource, parent);
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: nativeNewRDFNode: can't create container.");
|
|
return;
|
|
}
|
|
|
|
rv = container->InsertElementAt(newChild, childIndex, PR_TRUE);
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: nativeNewRDFNode: can't insert element into parent container.");
|
|
return;
|
|
}
|
|
return;
|
|
}
|
|
|
|
|
|
|
|
|
|
//
|
|
// Local functions
|
|
//
|