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/03/02 03:52:15 UTC
svn commit: r917846 - in
/subversion/trunk/subversion/bindings/javahl/native: SVNClient.cpp
SVNClient.h org_apache_subversion_javahl_SVNClient.cpp
Author: hwright
Date: Tue Mar 2 02:52:15 2010
New Revision: 917846
URL: http://svn.apache.org/viewvc?rev=917846&view=rev
Log:
JavaHL: Remove some no-longer-needed parameters in the C++ layer of the library.
[ in subversion/bindings/javahl/ ]
* native/SVNClient.h,
native/SVNClient.cpp
(revProperties, revProperty, setRevProperty, propertyGet):
Don't take a jthis param.
* native/org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_revProperties,
Java_org_apache_subversion_javahl_SVNClient_revProperty,
Java_org_apache_subversion_javahl_SVNClient_setRevProperty,
Java_org_apache_subversion_javahl_SVNClient_propertyGet):
Adjust callers to above.
Modified:
subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=917846&r1=917845&r2=917846&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Tue Mar 2 02:52:15 2010
@@ -889,9 +889,8 @@
/**
* Get a property.
*/
-jbyteArray SVNClient::propertyGet(jobject jthis, const char *path,
- const char *name, Revision &revision,
- Revision &pegRevision)
+jbyteArray SVNClient::propertyGet(const char *path, const char *name,
+ Revision &revision, Revision &pegRevision)
{
SVN::Pool requestPool;
SVN_JNI_NULL_PTR_EX(path, "path", NULL);
@@ -1464,7 +1463,7 @@
return read_stream;
}
-jbyteArray SVNClient::revProperty(jobject jthis, const char *path,
+jbyteArray SVNClient::revProperty(const char *path,
const char *name, Revision &rev)
{
SVN::Pool requestPool;
@@ -1652,7 +1651,7 @@
SVN_JNI_ERR(svn_client_unlock((apr_array_header_t*)targetsApr, force,
ctx, requestPool.pool()), );
}
-void SVNClient::setRevProperty(jobject jthis, const char *path,
+void SVNClient::setRevProperty(const char *path,
const char *name, Revision &rev,
const char *value, const char *original_value,
bool force)
@@ -1885,8 +1884,7 @@
SVN_JNI_ERR(svn_client_upgrade(path, ctx, requestPool.pool()), );
}
-jobject SVNClient::revProperties(jobject jthis, const char *path,
- Revision &revision)
+jobject SVNClient::revProperties(const char *path, Revision &revision)
{
apr_hash_t *props;
SVN::Pool requestPool;
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.h?rev=917846&r1=917845&r2=917846&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.h Tue Mar 2 02:52:15 2010
@@ -65,7 +65,7 @@
InfoCallback *callback);
void unlock(Targets &targets, bool force);
void lock(Targets &targets, const char *comment, bool force);
- jobject revProperties(jobject jthis, const char *path, Revision &revision);
+ jobject revProperties(const char *path, Revision &revision);
void cancelOperation();
void commitMessageHandler(CommitMessage *commitMessage);
const char *getConfigDirectory();
@@ -174,15 +174,14 @@
void list(const char *url, Revision &revision, Revision &pegRevision,
svn_depth_t depth, int direntFields, bool fetchLocks,
ListCallback *callback);
- jbyteArray revProperty(jobject jthis, const char *path, const char *name,
- Revision &rev);
- void setRevProperty(jobject jthis, const char *path, const char *name,
+ jbyteArray revProperty(const char *path, const char *name, Revision &rev);
+ void setRevProperty(const char *path, const char *name,
Revision &rev, const char *value,
const char *original_value, bool force);
jstring getVersionInfo(const char *path, const char *trailUrl,
bool lastChanged);
void upgrade(const char *path);
- jbyteArray propertyGet(jobject jthis, const char *path, const char *name,
+ jbyteArray propertyGet(const char *path, const char *name,
Revision &revision, Revision &pegRevision);
void diff(const char *target1, Revision &revision1,
const char *target2, Revision &revision2,
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=917846&r1=917845&r2=917846&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 Tue Mar 2 02:52:15 2010
@@ -1043,7 +1043,7 @@
if (JNIUtil::isExceptionThrown())
return NULL;
- return cl->revProperty(jthis, path, name, revision);
+ return cl->revProperty(path, name, revision);
}
JNIEXPORT jobject JNICALL
@@ -1065,7 +1065,7 @@
if (JNIUtil::isExceptionThrown())
return NULL;
- return cl->revProperties(jthis, path, revision);
+ return cl->revProperties(path, revision);
}
JNIEXPORT void JNICALL
@@ -1100,7 +1100,7 @@
if (JNIUtil::isExceptionThrown())
return;
- cl->setRevProperty(jthis, path, name, revision, value, original_value,
+ cl->setRevProperty(path, name, revision, value, original_value,
jforce ? true: false);
}
@@ -1132,7 +1132,7 @@
if (JNIUtil::isExceptionThrown())
return NULL;
- return cl->propertyGet(jthis, path, name, revision, pegRevision);
+ return cl->propertyGet(path, name, revision, pegRevision);
}
JNIEXPORT jobject JNICALL