af2702d036
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
103 lines
3.0 KiB
C++
103 lines
3.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 "BookmarksImpl.h"
|
|
|
|
#include "rdf_util.h"
|
|
#include "ns_util.h"
|
|
|
|
|
|
#include "nsCOMPtr.h"
|
|
#include "nsISimpleEnumerator.h"
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_BookmarksImpl_nativeAddBookmark
|
|
(JNIEnv *, jobject, jint, jobject)
|
|
{
|
|
|
|
}
|
|
|
|
JNIEXPORT jint JNICALL Java_org_mozilla_webclient_wrapper_1native_BookmarksImpl_nativeGetBookmarks
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
nsresult rv;
|
|
jint result = -1;
|
|
|
|
rv = rdf_InitRDFUtils();
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: can't initialize RDF Utils");
|
|
return result;
|
|
}
|
|
|
|
result = (jint) kNC_BookmarksRoot.get();
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jint JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_BookmarksImpl_nativeNewRDFNode
|
|
(JNIEnv *env, jobject obj, jstring urlString, jboolean isFolder)
|
|
{
|
|
nsCOMPtr<nsIRDFResource> newNode;
|
|
nsresult rv;
|
|
jint result = -1;
|
|
nsCAutoString uri("NC:BookmarksRoot");
|
|
|
|
const char *url = ::util_GetStringUTFChars(env, urlString);
|
|
uri.Append("#$");
|
|
uri.Append(url);
|
|
PRUnichar *uriUni = uri.ToNewUnicode();
|
|
|
|
rv = gRDF->GetUnicodeResource(uriUni, getter_AddRefs(newNode));
|
|
nsCRT::free(uriUni);
|
|
::util_ReleaseStringUTFChars(env, urlString, url);
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: nativeNewRDFNode: can't create new nsIRDFResource.");
|
|
return result;
|
|
}
|
|
|
|
if (isFolder) {
|
|
rv = gRDFCU->MakeSeq(gBookmarksDataSource, newNode, nsnull);
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: unable to make new folder as a sequence.");
|
|
return result;
|
|
}
|
|
rv = gBookmarksDataSource->Assert(newNode, kRDF_type,
|
|
kNC_Folder, PR_TRUE);
|
|
if (rv != NS_OK) {
|
|
::util_ThrowExceptionToJava(env, "Exception: unable to mark new folder as folder.");
|
|
|
|
return result;
|
|
}
|
|
}
|
|
|
|
/*
|
|
|
|
* Do the AddRef here.
|
|
|
|
*/
|
|
|
|
result = (jint)newNode.get();
|
|
((nsISupports *)result)->AddRef();
|
|
|
|
return result;
|
|
}
|