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/09 22:32:08 UTC
svn commit: r921134 - in /subversion/trunk/subversion/bindings/javahl:
native/org_apache_subversion_javahl_SVNClient.cpp
src/org/apache/subversion/javahl/SVNClient.java
Author: hwright
Date: Tue Mar 9 21:32:08 2010
New Revision: 921134
URL: http://svn.apache.org/viewvc?rev=921134&view=rev
Log:
JavaHL: More native Set handling, this time with the two methods which took
revprop arrays.
[ in subversion/bindings/javahl/ ]
* native/org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_logMesssages,
Java_org_apache_subversion_javahl_SVNClient_getMergeinfoLog):
Update the param type.
* src/org/apache/subversion/javahl/SVNClient.java
(logMessages, getMergeinfoLog): Use revprops Sets in place of arrays, and
remove wrappers as needed.
Modified:
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
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=921134&r1=921133&r2=921134&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 9 21:32:08 2010
@@ -263,7 +263,7 @@ Java_org_apache_subversion_javahl_SVNCli
(JNIEnv *env, jobject jthis, jstring jpath, jobject jpegRevision,
jobjectArray jranges, jboolean jstopOnCopy,
jboolean jdisoverPaths, jboolean jincludeMergedRevisions,
- jobjectArray jrevProps, jlong jlimit, jobject jlogMessageCallback)
+ jobject jrevProps, jlong jlimit, jobject jlogMessageCallback)
{
JNIEntry(SVNClient, logMessages);
SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -1162,7 +1162,7 @@ Java_org_apache_subversion_javahl_SVNCli
JNIEXPORT void JNICALL Java_org_apache_subversion_javahl_SVNClient_getMergeinfoLog
(JNIEnv *env, jobject jthis, jint jkind, jstring jpathOrUrl,
jobject jpegRevision, jstring jmergeSourceUrl, jobject jsrcPegRevision,
- jboolean jdiscoverChangedPaths, jint jdepth, jobjectArray jrevProps,
+ jboolean jdiscoverChangedPaths, jint jdepth, jobject jrevProps,
jobject jlogMessageCallback)
{
JNIEntry(SVNClient, getMergeinfoLog);
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=921134&r1=921133&r2=921134&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java Tue Mar 9 21:32:08 2010
@@ -170,9 +170,7 @@ public class SVNClient implements ISVNCl
: revisionRanges.toArray(new RevisionRange[
revisionRanges.size()]),
stopOnCopy, discoverPath, includeMergedRevisions,
- revProps == null ? null
- : revProps.toArray(new String[revProps.size()]),
- limit, callback);
+ revProps, limit, callback);
}
private native void logMessages(String path,
@@ -181,7 +179,7 @@ public class SVNClient implements ISVNCl
boolean stopOnCopy,
boolean discoverPath,
boolean includeMergedRevisions,
- String[] revProps,
+ Set<String> revProps,
long limit,
LogMessageCallback callback)
throws ClientException;
@@ -390,31 +388,13 @@ public class SVNClient implements ISVNCl
/**
* @since 1.7
*/
- public void getMergeinfoLog(int kind, String pathOrUrl,
- Revision pegRevision,
- String mergeSourceUrl,
- Revision srcPegRevision,
- boolean discoverChangedPaths,
- int depth,
- Set<String> revProps,
- LogMessageCallback callback)
- throws ClientException
- {
- this.getMergeinfoLog(kind, pathOrUrl, pegRevision, mergeSourceUrl,
- srcPegRevision, discoverChangedPaths, depth,
- revProps == null ? null
- : revProps.toArray(new String[revProps.size()]),
- callback);
- }
-
- private native void getMergeinfoLog(int kind, String pathOrUrl,
- Revision pegRevision,
- String mergeSourceUrl,
- Revision srcPegRevision,
- boolean discoverChangedPaths,
- int depth,
- String[] revProps,
- LogMessageCallback callback)
+ public native void getMergeinfoLog(int kind, String pathOrUrl,
+ Revision pegRevision,
+ String mergeSourceUrl,
+ Revision srcPegRevision,
+ boolean discoverChangedPaths, int depth,
+ Set<String> revProps,
+ LogMessageCallback callback)
throws ClientException;
/**