You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/08/11 22:24:46 UTC
svn commit: r984568 - in
/subversion/trunk/subversion/bindings/javahl/native: ProgressListener.cpp
org_apache_subversion_javahl_SVNClient.cpp
Author: hwright
Date: Wed Aug 11 20:24:46 2010
New Revision: 984568
URL: http://svn.apache.org/viewvc?rev=984568&view=rev
Log:
JavaHL: Fix setting the progress callback by correctly naming a native
function, and updating package references.
* subversion/bindings/javahl/native/ProgressListener.cpp
(makeCProgressListener): Refer to the new Apache class.
* subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_setProgressListener):
Moved from here...
(Java_org_apache_subversion_javahl_SVNClient_setProgressCallback):
...to here.
Modified:
subversion/trunk/subversion/bindings/javahl/native/ProgressListener.cpp
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
Modified: subversion/trunk/subversion/bindings/javahl/native/ProgressListener.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ProgressListener.cpp?rev=984568&r1=984567&r2=984568&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ProgressListener.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ProgressListener.cpp Wed Aug 11 20:24:46 2010
@@ -51,7 +51,7 @@ ProgressListener::makeCProgressListener(
// Sanity check that the object implements the ProgressListener
// Java interface.
- jclass clazz = env->FindClass(JAVA_PACKAGE"/ProgressListener");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/ProgressCallback");
if (JNIUtil::isJavaExceptionThrown())
return NULL;
@@ -96,7 +96,7 @@ ProgressListener::onProgress(apr_off_t p
if (mid == 0)
{
// Initialize the method ID.
- jclass clazz = env->FindClass(JAVA_PACKAGE"/ProgressListener");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/ProgressCallback");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NOTHING();
Modified: subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=984568&r1=984567&r2=984568&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp Wed Aug 11 20:24:46 2010
@@ -382,10 +382,10 @@ Java_org_apache_subversion_javahl_SVNCli
}
JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNClient_setProgressListener
+Java_org_apache_subversion_javahl_SVNClient_setProgressCallback
(JNIEnv *env, jobject jthis, jobject jprogressListener)
{
- JNIEntry(SVNClient, setProgressListener);
+ JNIEntry(SVNClient, setProgressCallback);
SVNClient *cl = SVNClient::getCppObject(jthis);
if (cl == NULL)
{