doesn't run, but several unit tests for webclient do.
I'll be proceeding through the rest of the webclient interfaces,
building junit tests as I go, in the coming months. I hope to flesh out
the basic framework, then publish build instructions, and hopefully I
can get some contributions from the community.
M util/classes/org/mozilla/util/Utilities.java
new method: getImplFromServices:
+ *
+ * <p>This method tries to load the resource
+ * <code>META-INF/services/>interfaceClassName></code>, where
+ * <code>>interfaceClassName<</code> is the argument to this
+ * method. If the resource is found, interpret it as a
+ * <code>Properties</code> file and read out its first line.
+ * Interpret the first line as the fully qualified class name of a
+ * class that implements <code></code>. The named class must have a
+ * public no-arg constructor.</p>
M webclient/build-tests.xml
- junit testcases for Webclient APIs, developed using test-first.
M webclient/build.xml
- changes for new package name structure:
packages org.mozilla.webclient.{wrapper_native, wrapper_non_native} have gone away. Replaced with org.mozilla.webclient.impl.{wrapper_native, wrapper_non_native}
- changes to accomodate "Services" based approach for pluggable
webclient implementation.
- don't bother re-naming the javah generated files, just let javah pick
the names.
- pass debugging args from build.properties
- changed name of junit test target to "test".
M webclient/classes_spec/org/mozilla/webclient/BrowserControl.java
- got rid of BROWSER_TYPE. No longer necessary due to the new
pluggability mechanism.
M webclient/classes_spec/org/mozilla/webclient/BrowserControlFactory.java
- Leverage the org.mozilla.util.Utilities.getImplFromServices()
mechanism to allow a vendor-pluggable webclient implementation of the
new "WebclientFactory" interface, which is method for method
compatible with BrowserControlFactory. Make all BrowserControlFactory
methods call through to methods on the vendor provided
WebclientFactory implementation.
R webclient/classes_spec/org/mozilla/webclient/BrowserControlFactoryInterface.java
A webclient/classes_spec/org/mozilla/webclient/BrowserControlICE.java
R webclient/classes_spec/org/mozilla/webclient/BrowserControlImpl.java
R webclient/classes_spec/org/mozilla/webclient/BrowserType.java
- move all implementation specific classe to the impl package.
M webclient/classes_spec/org/mozilla/webclient/ImplObject.java
- ImplObject shouldn't depend on vendor private classes.
M webclient/classes_spec/org/mozilla/webclient/Preferences.java
- new method
+ public void unregisterPrefChangedCallback(PrefChangedCallback cb,
+ String prefName, Object closure);
M webclient/classes_spec/org/mozilla/webclient/ProfileManager.java
- properly specify this interface.
A webclient/classes_spec/org/mozilla/webclient/WebclientFactory.java
* <p>This interface allows a pluggable webclient API implementation.
* The static methods in {@link BrowserControlFactory} call through to
* methods on this interface. Please see {@link BrowserControlFactory}
* for information on how to hook up your <code>WebclientFactory</code>
* implementation to the <code>BrowserControlFactory</code></p>
R webclient/classes_spec/org/mozilla/webclient/WrapperFactory.java
R webclient/classes_spec/org/mozilla/webclient/impl/BrowserControlFactoryImpl.java
- moved these to the impl class
A webclient/classes_spec/org/mozilla/webclient/impl/BrowserControlImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/Service.java
A webclient/classes_spec/org/mozilla/webclient/impl/WebclientFactoryImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/WrapperFactory.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/BookmarkEntryImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/BookmarksImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CurrentPageImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/HistoryImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/ISupportsPeer.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/ImplObjectNative.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NativeEventThread.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NavigationImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/PreferencesImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/ProfileManagerImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/RDFEnumeration.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/RDFTreeNode.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/SelectionImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WCEventListenerWrapper.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WCMouseListenerImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WindowControlImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/gtk/GtkBrowserControlCanvas.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/win32/Win32BrowserControlCanvas.java
- copied from old package naming scheme.
- lots and lots of cleanup.
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/BookmarkEntryImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/BookmarksImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/CurrentPageImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/EventRegistrationImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/HistoryImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/ISupportsPeer.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/ImplObjectNative.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/NativeEventThread.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/NavigationImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/PreferencesImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/ProfileManagerImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/RDFEnumeration.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/RDFTreeNode.java
A webclient/classes_spec/org/mozilla/webclient/wrapper_native/README
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/SelectionImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/WCEventListenerWrapper.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/WCMouseListenerImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/WindowControlImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/WrapperFactoryImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/gtk/GtkBrowserControlCanvas.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/win32/Win32BrowserControlCanvas.java
- removed from old package naming scheme
M webclient/src_moz/BookmarksImpl.cpp
- remove dependency on RDFActionEvents by inlining all the code that
formerly was in the events.
- package name change
- JNI include file name change
M webclient/src_moz/CurrentPageImpl.cpp
M webclient/src_moz/HistoryImpl.cpp
M webclient/src_moz/ISupportsPeer.cpp
- package name change
- JNI include file name change
M webclient/src_moz/Makefile.in
- get rid of PreferencesActionEvents.cpp and RDFActionEvents.cpp
- add ProfileManagerImpl.cpp
M webclient/src_moz/NativeEventThread.cpp
- this file is not done yet. I've been pulling misplaced initialization
stuff out of here and putting it into WrapperFactoryImpl.cpp.
- got rid of gComponentManager, since we can use do_CreateInstance
instead.
- package name change
- JNI include file name change
M webclient/src_moz/NativeEventThreadActionEvents.h
- JNI include file name change
M webclient/src_moz/NavigationImpl.cpp
- package name change
- JNI include file name change
R webclient/src_moz/PreferencesActionEvents.cpp
R webclient/src_moz/PreferencesActionEvents.h
- don't need these anymore! woohoo!
M webclient/src_moz/PreferencesImpl.cpp
- remove dependency on PreferencesActionEvents by inlining code into the
methods that used to use the events.
A webclient/src_moz/ProfileManagerImpl.cpp
- new class, implementation of the ProfileManager interface.
M webclient/src_moz/PromptActionEvents.cpp
- change erroneous comment so my grep performed correctly.
R webclient/src_moz/RDFActionEvents.cpp
R webclient/src_moz/RDFActionEvents.h
- don't need these anymore! woohoo!
M webclient/src_moz/RDFEnumeration.cpp
M webclient/src_moz/RDFTreeNode.cpp
- remove dependency on RDFActionEvents by inlining code into the
methods that used to use the events.
M webclient/src_moz/WindowControlActionEvents.cpp
- deallocate shareInitiContext.
M webclient/src_moz/WindowControlImpl.cpp
- package name change
- JNI include file name change
- remove the "sleep so I can attach gdb" code. Moved to
WrapperFactoryImpl.cpp.
M webclient/src_moz/WrapperFactoryImpl.cpp
- lots of changes. This is now where the app initialization and
shutdown happens,
M webclient/src_moz/dom_util.cpp
- comment change
M webclient/src_moz/ns_globals.h
- get rid of inappropriate global usage.
M webclient/src_moz/ns_util.h
- new struct WebclientContext for singletons.
M webclient/src_moz/rdf_util.cpp
- new methods, rdf_startup and rdf_shutdown.
- replace calls to nsComponentManager::CreateInstance() with
do_CreateInstance().
M webclient/src_moz/rdf_util.h
- new methods, rdf_startup and rdf_shutdown.
M webclient/src_moz/gtk/GtkBrowserControlCanvas.cpp
- package name change
- JNI include file name change
M webclient/src_moz/gtk/GtkBrowserControlCanvasStub.cpp
- package name change
- JNI include file name change
- this file isn't needed anymore, thankfully! I'll remove it soon.
M webclient/src_moz/gtk/StubFunctions.h
- package name change
- JNI include file name change
- this file isn't needed anymore, thankfully! I'll remove it soon.
M webclient/src_moz/motif/BrowserControlNativeShimStub.cpp
M webclient/src_moz/motif/MotifBrowserControlCanvas.cpp
M webclient/src_moz/motif/MotifBrowserControlCanvasStub.cpp
M webclient/src_moz/motif/NativeLoaderStub.cpp
M webclient/src_moz/win32/Win32BrowserControlCanvas.cpp
- package name change
- JNI include file name change
M webclient/src_share/jni_util.cpp
M webclient/src_share/jni_util.h
- util_InitializeShareInitContext() takes a JNIEnv *.
- new methods
+void util_DeleteGlobalRef(JNIEnv *env, jobject toDeleteRef);
+void util_DeleteLocalRef(JNIEnv *env, jobject toDeleteRef);
+void util_getSystemProperty(JNIEnv *env,
+ const char *propName,
+ char *propValue,
+ jint propValueLen);
M webclient/src_share/jni_util_export.cpp
M webclient/src_share/jni_util_export.h
+JNIEXPORT jobjectArray util_GetJstringArrayFromJcharArray(JNIEnv *env,
+ jint len,
+ jchar **strings,
+ jint *stringLengths)
A webclient/test/automated/src/classes/org/mozilla/webclient/BookmarksTest.java
R webclient/test/automated/src/classes/org/mozilla/webclient/BrowserControlFactoryTest.java
A webclient/test/automated/src/classes/org/mozilla/webclient/PreferencesTest.java
A webclient/test/automated/src/classes/org/mozilla/webclient/ProfileManagerTest.java
A webclient/test/automated/src/classes/org/mozilla/webclient/impl/WebclientFactoryImplTest.java
A webclient/test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImplTest.java
A webclient/test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/gtk/TestGtkBrowserControlCanvas.java
R webclient/test/automated/src/classes/org/mozilla/webclient/wrapper_native/gtk/TestGtkBrowserControlCanvas.java
A webclient/test/automated/src/test/BrowserControlFactoryTest_correct
- junit tests! TEST FIRST!
git-svn-id: svn://10.0.0.236/trunk@147393 18797224-902f-48f8-a5cc-f745e15eee43
273 lines
7.4 KiB
C++
273 lines
7.4 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>
|
|
* Jason Mawdsley <jason@macadamian.com>
|
|
* Louis-Philippe Gagnon <louisphilippe@macadamian.com>
|
|
*
|
|
*/
|
|
|
|
#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
|
|
|
|
fpGetFromPropertiesObjectType externalGetFromPropertiesObject = 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 jsize JNICALL util_GetStringLength(JNIEnv *env,
|
|
jstring inString)
|
|
{
|
|
jsize result = 0;
|
|
#ifdef BAL_INTERFACE
|
|
result = bal_jstring_getLength(inString);
|
|
#else
|
|
result = env->GetStringLength(inString);
|
|
#endif
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jobjectArray util_GetJstringArrayFromJcharArray(JNIEnv *env,
|
|
jint len,
|
|
jchar **strings,
|
|
jint *stringLengths)
|
|
{
|
|
jobjectArray result = nsnull;
|
|
jclass clazz = nsnull;
|
|
jstring curString = nsnull;
|
|
jint i = 0;
|
|
#ifdef BAL_INTERFACE
|
|
#else
|
|
clazz = ::util_FindClass(env, "java/lang/String");
|
|
result = env->NewObjectArray(len, clazz, nsnull);
|
|
for (i = 0; i < len; i++) {
|
|
curString = ::util_NewString(env, strings[i],
|
|
stringLengths[i]);
|
|
env->SetObjectArrayElement(result, i, curString);
|
|
::util_DeleteLocalRef(env, curString);
|
|
}
|
|
#endif
|
|
return result;
|
|
}
|
|
|
|
|
|
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_SetGetFromPropertiesObjectFunction(fpGetFromPropertiesObjectType fp)
|
|
{
|
|
externalGetFromPropertiesObject = 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);
|
|
}
|
|
|
|
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
|
|
}
|