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/02/27 21:39:15 UTC
svn commit: r917036 - in /subversion/trunk/subversion/bindings/javahl:
src/org/apache/subversion/javahl/ src/org/tigris/subversion/javahl/
tests/org/apache/subversion/javahl/
Author: hwright
Date: Sat Feb 27 20:39:14 2010
New Revision: 917036
URL: http://svn.apache.org/viewvc?rev=917036&view=rev
Log:
JavaHL: Update revProp parameters to be Lists instead of arrays.
[ in subversion/bindings/javahl/ ]
* tests/org/apache/subversion/javahl/BasicTests.java
(testCommitRevprops, collectLogMessages): Use a Set instead of an array
for the Revprops.
* src/org/tigris/subversion/javahl/SVNClient.java
(logMessages, getMergeinfoLog): Convert the revprop array to a Set.
* src/org/apache/subversion/javahl/SVNClient.java
(logMessages, getMergeinfoLog): Make the native implementation private,
and implement the public API as a wrapper.
* src/org/apache/subversion/javahl/ISVNClient.java
(logMessages, getMergeinfoLog): Update revProps parameters to be Sets.
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=917036&r1=917035&r2=917036&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Sat Feb 27 20:39:14 2010
@@ -28,6 +28,7 @@
import java.io.OutputStream;
import java.util.Collection;
import java.util.List;
+import java.util.Set;
import java.util.Map;
/**
@@ -150,7 +151,7 @@
void logMessages(String path, Revision pegRevision,
RevisionRange[] ranges, boolean stopOnCopy,
boolean discoverPath, boolean includeMergedRevisions,
- String[] revProps, long limit,
+ Set<String> revProps, long limit,
LogMessageCallback callback)
throws ClientException;
@@ -551,7 +552,7 @@
void getMergeinfoLog(int kind, String pathOrUrl,
Revision pegRevision, String mergeSourceUrl,
Revision srcPegRevision, boolean discoverChangedPaths,
- int depth, String[] revprops,
+ int depth, Set<String> revProps,
LogMessageCallback callback)
throws ClientException;
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=917036&r1=917035&r2=917036&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 Sat Feb 27 20:39:14 2010
@@ -28,6 +28,7 @@
import java.io.OutputStream;
import java.util.Collection;
+import java.util.Set;
import java.util.List;
import java.util.Map;
@@ -163,17 +164,34 @@
/**
* @since 1.6
*/
- public native void logMessages(String path,
- Revision pegRevision,
- RevisionRange[] revisionRanges,
- boolean stopOnCopy,
- boolean discoverPath,
- boolean includeMergedRevisions,
- String[] revProps,
- long limit,
- LogMessageCallback callback)
+ public void logMessages(String path,
+ Revision pegRevision,
+ RevisionRange[] revisionRanges,
+ boolean stopOnCopy,
+ boolean discoverPath,
+ boolean includeMergedRevisions,
+ Set<String> revProps,
+ long limit,
+ LogMessageCallback callback)
+ throws ClientException
+ {
+ this.logMessages(path, pegRevision, revisionRanges, stopOnCopy,
+ discoverPath, includeMergedRevisions,
+ revProps == null ? null
+ : revProps.toArray(new String[revProps.size()]),
+ limit, callback);
+ }
+
+ private native void logMessages(String path,
+ Revision pegRevision,
+ RevisionRange[] revisionRanges,
+ boolean stopOnCopy,
+ boolean discoverPath,
+ boolean includeMergedRevisions,
+ String[] revProps,
+ long limit,
+ LogMessageCallback callback)
throws ClientException;
-
/**
* @since 1.5
*/
@@ -398,14 +416,31 @@
/**
* @since 1.7
*/
- public native void getMergeinfoLog(int kind, String pathOrUrl,
- Revision pegRevision,
- String mergeSourceUrl,
- Revision srcPegRevision,
- boolean discoverChangedPaths,
- int depth,
- String[] revprops,
- LogMessageCallback callback)
+ 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)
throws ClientException;
/**
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java?rev=917036&r1=917035&r2=917036&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java Sat Feb 27 20:39:14 2010
@@ -29,6 +29,7 @@
import java.util.Map;
import java.util.List;
+import java.util.HashSet;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Date;
@@ -539,8 +540,10 @@
aSVNClient.logMessages(path,
pegRevision == null ? null :pegRevision.toApache(),
aRevisions, stopOnCopy, discoverPath,
- includeMergedRevisions, revProps, limit,
- new aLogMessageCallback(callback));
+ includeMergedRevisions,
+ revProps == null ? null
+ : new HashSet<String>(Arrays.asList(revProps)),
+ limit, new aLogMessageCallback(callback));
}
catch (org.apache.subversion.javahl.ClientException ex)
{
@@ -1438,7 +1441,9 @@
mergeSourceUrl,
srcPegRevision == null ? null :
srcPegRevision.toApache(),
- discoverChangedPaths, depth, revprops,
+ discoverChangedPaths, depth,
+ revprops == null ? null
+ : new HashSet<String>(Arrays.asList(revprops)),
new aLogMessageCallback(callback));
}
catch (org.apache.subversion.javahl.ClientException ex)
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=917036&r1=917035&r2=917036&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Sat Feb 27 20:39:14 2010
@@ -37,6 +37,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.Map;
@@ -3487,11 +3488,13 @@
// Fetch our revprops from the server
RevpropLogCallback callback = new RevpropLogCallback();
+ Set<String> revProps = new HashSet<String>(2);
+ revProps.add("kfogel");
+ revProps.add("cmpilato");
client.logMessages(thisTest.getWCPath(), Revision.getInstance(2),
toRevisionRange(Revision.getInstance(2),
Revision.getInstance(2)),
- false, false, false,
- new String[] {"kfogel", "cmpilato"}, 0,
+ false, false, false, revProps, 0,
callback);
Map<String, String> fetchedProps = callback.getRevprops();
@@ -3784,7 +3787,10 @@
}
MyLogMessageCallback callback = new MyLogMessageCallback();
- String[] revProps = { "svn:log", "svn:date", "svn:author" };
+ Set<String> revProps = new HashSet<String>();
+ revProps.add("svn:log");
+ revProps.add("svn:date");
+ revProps.add("svn:author");
client.logMessages(path, pegRevision, revisionRanges, stopOnCopy,
discoverPath, includeMergedRevisions, revProps,
limit, callback);