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/09/01 22:58:58 UTC
svn commit: r991703 - in /subversion/trunk/subversion/bindings/javahl:
src/org/apache/subversion/javahl/ src/org/apache/subversion/javahl/callback/
src/org/tigris/subversion/javahl/ tests/org/apache/subversion/javahl/
Author: hwright
Date: Wed Sep 1 20:58:58 2010
New Revision: 991703
URL: http://svn.apache.org/viewvc?rev=991703&view=rev
Log:
JavaHL: For consistency, rename the CommitMessage interface to
CommitMessageCallback, and move it to the callback package.
* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java,
subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java,
subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java,
subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java:
Update references.
* subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitMessage.java:
Move from here...
* subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitMessageCallback.java:
...to here.
Added:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitMessageCallback.java
- copied, changed from r991698, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitMessage.java
Removed:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitMessage.java
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
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.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=991703&r1=991702&r2=991703&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 Wed Sep 1 20:58:58 2010
@@ -210,7 +210,7 @@ public interface ISVNClient
* @since 1.5
*/
void remove(Set<String> path, boolean force, boolean keepLocal,
- Map<String, String> revpropTable, CommitMessage handler,
+ Map<String, String> revpropTable, CommitMessageCallback handler,
CommitCallback callback)
throws ClientException;
@@ -278,7 +278,7 @@ public interface ISVNClient
*/
void commit(Set<String> path, Depth depth, boolean noUnlock,
boolean keepChangelist, Collection<String> changelists,
- Map<String, String> revpropTable, CommitMessage handler,
+ Map<String, String> revpropTable, CommitMessageCallback handler,
CommitCallback callback)
throws ClientException;
@@ -303,7 +303,7 @@ public interface ISVNClient
void copy(List<CopySource> sources, String destPath,
boolean copyAsChild, boolean makeParents,
boolean ignoreExternals, Map<String, String> revpropTable,
- CommitMessage handler, CommitCallback callback)
+ CommitMessageCallback handler, CommitCallback callback)
throws ClientException;
/**
@@ -327,7 +327,7 @@ public interface ISVNClient
void move(Set<String> srcPaths, String destPath, boolean force,
boolean moveAsChild, boolean makeParents,
Map<String, String> revpropTable,
- CommitMessage handler, CommitCallback callback)
+ CommitMessageCallback handler, CommitCallback callback)
throws ClientException;
/**
@@ -344,7 +344,7 @@ public interface ISVNClient
*/
void mkdir(Set<String> path, boolean makeParents,
Map<String, String> revpropTable,
- CommitMessage handler, CommitCallback callback)
+ CommitMessageCallback handler, CommitCallback callback)
throws ClientException;
/**
@@ -427,7 +427,7 @@ public interface ISVNClient
void doImport(String path, String url, Depth depth,
boolean noIgnore, boolean ignoreUnknownNodeTypes,
Map<String, String> revpropTable,
- CommitMessage handler, CommitCallback callback)
+ CommitMessageCallback handler, CommitCallback 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=991703&r1=991702&r2=991703&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 Wed Sep 1 20:58:58 2010
@@ -203,7 +203,7 @@ public class SVNClient implements ISVNCl
public native void remove(Set<String> paths, boolean force,
boolean keepLocal,
Map<String, String> revpropTable,
- CommitMessage handler, CommitCallback callback)
+ CommitMessageCallback handler, CommitCallback callback)
throws ClientException;
/**
@@ -236,7 +236,7 @@ public class SVNClient implements ISVNCl
boolean keepChangelist,
Collection<String> changelists,
Map<String, String> revpropTable,
- CommitMessage handler, CommitCallback callback)
+ CommitMessageCallback handler, CommitCallback callback)
throws ClientException;
/**
@@ -246,7 +246,7 @@ public class SVNClient implements ISVNCl
boolean copyAsChild, boolean makeParents,
boolean ignoreExternals,
Map<String, String> revpropTable,
- CommitMessage handler, CommitCallback callback)
+ CommitMessageCallback handler, CommitCallback callback)
throws ClientException;
/**
@@ -256,7 +256,7 @@ public class SVNClient implements ISVNCl
boolean force, boolean moveAsChild,
boolean makeParents,
Map<String, String> revpropTable,
- CommitMessage handler, CommitCallback callback)
+ CommitMessageCallback handler, CommitCallback callback)
throws ClientException;
/**
@@ -264,7 +264,7 @@ public class SVNClient implements ISVNCl
*/
public native void mkdir(Set<String> paths, boolean makeParents,
Map<String, String> revpropTable,
- CommitMessage handler, CommitCallback callback)
+ CommitMessageCallback handler, CommitCallback callback)
throws ClientException;
/**
@@ -305,7 +305,7 @@ public class SVNClient implements ISVNCl
boolean noIgnore,
boolean ignoreUnknownNodeTypes,
Map<String, String> revpropTable,
- CommitMessage handler, CommitCallback callback)
+ CommitMessageCallback handler, CommitCallback callback)
throws ClientException;
/**
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitMessageCallback.java (from r991698, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitMessage.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitMessageCallback.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitMessageCallback.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitMessage.java&r1=991698&r2=991703&rev=991703&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitMessage.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitMessageCallback.java Wed Sep 1 20:58:58 2010
@@ -21,16 +21,18 @@
* @endcopyright
*/
-package org.apache.subversion.javahl;
+package org.apache.subversion.javahl.callback;
import java.util.Set;
+import org.apache.subversion.javahl.CommitItem;
+
/**
* This is callback interface which has to implemented by the client
* to receive which files will be commited and to enter the log
* message.
*/
-public interface CommitMessage
+public interface CommitMessageCallback
{
/**
* Retrieve a commit message from the user based on the items to
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=991703&r1=991702&r2=991703&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 Wed Sep 1 20:58:58 2010
@@ -719,7 +719,7 @@ public class SVNClient implements SVNCli
public void commitMessageHandler(CommitMessage messageHandler)
{
class MyCommitMessageHandler
- implements org.apache.subversion.javahl.CommitMessage
+ implements org.apache.subversion.javahl.callback.CommitMessageCallback
{
private CommitMessage messageHandler;
@@ -752,7 +752,7 @@ public class SVNClient implements SVNCli
cachedHandler = new MyCommitMessageHandler(messageHandler);
}
- private org.apache.subversion.javahl.CommitMessage cachedHandler = null;
+ private org.apache.subversion.javahl.callback.CommitMessageCallback cachedHandler = null;
/**
* @deprecated Use {@link #remove(String[], String, boolean, boolean, Map)}
@@ -2627,7 +2627,7 @@ public class SVNClient implements SVNCli
}
private class ConstMsg
- implements org.apache.subversion.javahl.CommitMessage
+ implements org.apache.subversion.javahl.callback.CommitMessageCallback
{
private String message;
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=991703&r1=991702&r2=991703&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 Wed Sep 1 20:58:58 2010
@@ -3543,7 +3543,7 @@ public class BasicTests extends SVNTests
}
}
- private class ConstMsg implements CommitMessage
+ private class ConstMsg implements CommitMessageCallback
{
private String message;
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java?rev=991703&r1=991702&r2=991703&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java Wed Sep 1 20:58:58 2010
@@ -779,7 +779,7 @@ class SVNTests extends TestCase
* internal class to receive the request for the log messages to check if
* the expected commit items are presented
*/
- class MyCommitMessage implements CommitMessage
+ class MyCommitMessage implements CommitMessageCallback
{
/**
* Retrieve a commit message from the user based on the items