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/06/09 18:06:53 UTC
svn commit: r953065 - in /subversion/trunk/subversion/bindings/javahl:
native/ 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 Jun 9 16:06:53 2010
New Revision: 953065
URL: http://svn.apache.org/viewvc?rev=953065&view=rev
Log:
JavaHL: Rename the NotifyCallback to ClientNotifyCallback, in preparation for
adding a repository version.
[ in subversion/bindings/javahl/ ]
* tests/org/apache/subversion/javahl/BasicTests.java,
tests/org/apache/subversion/javahl/SVNTests.java,
native/org_apache_subversion_javahl_SVNClient.cpp,
src/org/apache/subversion/javahl/SVNClient.java,
src/org/apache/subversion/javahl/ISVNClient.java,
src/org/tigris/subversion/javahl/SVNClient.java,
native/SVNClient.cpp,
native/SVNClient.h:
Track the rename.
* native/ClientNotifyCallback.cpp:
Renamed from NotifyCallback.cpp.
* native/NotifyCallback.h:
Renamed to ClientNotifyCallback.h.
* native/NotifyCallback.cpp:
Renamed to ClientNotifyCallback.cpp.
* native/ClientNotifyCallback.h:
Renamed from NotifyCallback.h.
* src/org/apache/subversion/javahl/callback/ClientNotifyCallback.java:
Renamed from NotifyCallback.java.
* src/org/apache/subversion/javahl/callback/NotifyCallback.java:
Renamed to ClientNotifyCallback.java.
Added:
subversion/trunk/subversion/bindings/javahl/native/ClientNotifyCallback.cpp
- copied, changed from r952874, subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/ClientNotifyCallback.h
- copied, changed from r952874, subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.h
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ClientNotifyCallback.java
- copied, changed from r951032, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/NotifyCallback.java
Removed:
subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.h
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/NotifyCallback.java
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
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
Copied: subversion/trunk/subversion/bindings/javahl/native/ClientNotifyCallback.cpp (from r952874, subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.cpp)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ClientNotifyCallback.cpp?p2=subversion/trunk/subversion/bindings/javahl/native/ClientNotifyCallback.cpp&p1=subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.cpp&r1=952874&r2=953065&rev=953065&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ClientNotifyCallback.cpp Wed Jun 9 16:06:53 2010
@@ -20,11 +20,11 @@
* ====================================================================
* @endcopyright
*
- * @file NotifyCallback.cpp
- * @brief Implementation of the class NotifyCallback
+ * @file ClientNotifyCallback.cpp
+ * @brief Implementation of the class ClientNotifyCallback
*/
-#include "NotifyCallback.h"
+#include "ClientNotifyCallback.h"
#include "JNIUtil.h"
#include "CreateJ.h"
#include "EnumMapper.h"
@@ -34,7 +34,7 @@
* Create a new object and store the Java object.
* @param notify global reference to the Java object
*/
-NotifyCallback::NotifyCallback(jobject p_notify)
+ClientNotifyCallback::ClientNotifyCallback(jobject p_notify)
{
m_notify = p_notify;
}
@@ -43,7 +43,7 @@ NotifyCallback::NotifyCallback(jobject p
* Destroy the object and delete the global reference to the Java
* object.
*/
-NotifyCallback::~NotifyCallback()
+ClientNotifyCallback::~ClientNotifyCallback()
{
if (m_notify != NULL)
{
@@ -56,7 +56,7 @@ NotifyCallback::~NotifyCallback()
* Create a C++ peer object for the Java object.
* @param notify a local reference to the Java object
*/
-NotifyCallback *NotifyCallback::makeCNotify(jobject notify)
+ClientNotifyCallback *ClientNotifyCallback::makeCNotify(jobject notify)
{
// If the Java object is null -> no C++ peer needed.
if (notify == NULL)
@@ -64,7 +64,7 @@ NotifyCallback *NotifyCallback::makeCNot
JNIEnv *env = JNIUtil::getEnv();
// Sanity check, that the object implements Notify.
- jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/NotifyCallback");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/ClientNotifyCallback");
if (JNIUtil::isJavaExceptionThrown())
return NULL;
@@ -82,7 +82,7 @@ NotifyCallback *NotifyCallback::makeCNot
return NULL;
// Create the peer.
- return new NotifyCallback(myNotify);
+ return new ClientNotifyCallback(myNotify);
}
/**
@@ -92,10 +92,10 @@ NotifyCallback *NotifyCallback::makeCNot
* @param pool an apr pool to allocated memory
*/
void
-NotifyCallback::notify(void *baton, const svn_wc_notify_t *notify, apr_pool_t *pool)
+ClientNotifyCallback::notify(void *baton, const svn_wc_notify_t *notify, apr_pool_t *pool)
{
// A Notify object is used as the baton.
- NotifyCallback *that = (NotifyCallback *) baton;
+ ClientNotifyCallback *that = (ClientNotifyCallback *) baton;
if (that) // sanity check
{
// Call our method.
@@ -110,7 +110,7 @@ NotifyCallback::notify(void *baton, cons
* @param pool an apr pool to allocated memory
*/
void
-NotifyCallback::onNotify(const svn_wc_notify_t *wcNotify, apr_pool_t *pool)
+ClientNotifyCallback::onNotify(const svn_wc_notify_t *wcNotify, apr_pool_t *pool)
{
JNIEnv *env = JNIUtil::getEnv();
@@ -119,7 +119,7 @@ NotifyCallback::onNotify(const svn_wc_no
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/NotifyCallback");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/ClientNotifyCallback");
if (JNIUtil::isJavaExceptionThrown())
return;
Copied: subversion/trunk/subversion/bindings/javahl/native/ClientNotifyCallback.h (from r952874, subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.h)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ClientNotifyCallback.h?p2=subversion/trunk/subversion/bindings/javahl/native/ClientNotifyCallback.h&p1=subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.h&r1=952874&r2=953065&rev=953065&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ClientNotifyCallback.h Wed Jun 9 16:06:53 2010
@@ -20,12 +20,12 @@
* ====================================================================
* @endcopyright
*
- * @file NotifyCallback.h
- * @brief Interface of the class NotifyCallback
+ * @file ClientNotifyCallback.h
+ * @brief Interface of the class ClientNotifyCallback
*/
-#ifndef NOTIFY2_H
-#define NOTIFY2_H
+#ifndef CLIENTNOTIFYCALLBACK_H
+#define CLIENTNOTIFYCALLBACK_H
#include <jni.h>
#include "svn_wc.h"
@@ -34,7 +34,7 @@
* This class passes notification from subversion to a Java object
* (1.2 version).
*/
-class NotifyCallback
+class ClientNotifyCallback
{
private:
/**
@@ -43,11 +43,11 @@ class NotifyCallback
* SVNClient.notification call.
*/
jobject m_notify;
- NotifyCallback(jobject p_notify);
+ ClientNotifyCallback(jobject p_notify);
public:
- static NotifyCallback *makeCNotify(jobject notify);
- ~NotifyCallback();
+ static ClientNotifyCallback *makeCNotify(jobject notify);
+ ~ClientNotifyCallback();
/**
* Implementation of the svn_wc_notify_func_t API.
@@ -70,4 +70,4 @@ class NotifyCallback
apr_pool_t *pool);
};
-#endif // NOTIFY2_H
+#endif // CLIENTNOTIFYCALLBACK_H
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=953065&r1=953064&r2=953065&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Wed Jun 9 16:06:53 2010
@@ -26,7 +26,7 @@
#include "SVNClient.h"
#include "JNIUtil.h"
-#include "NotifyCallback.h"
+#include "ClientNotifyCallback.h"
#include "CopySources.h"
#include "DiffSummaryReceiver.h"
#include "ConflictResolverCallback.h"
@@ -291,7 +291,7 @@ jlong SVNClient::checkout(const char *mo
return rev;
}
-void SVNClient::notification2(NotifyCallback *notify2)
+void SVNClient::notification2(ClientNotifyCallback *notify2)
{
delete m_notify2;
m_notify2 = notify2;
@@ -1230,7 +1230,7 @@ svn_client_ctx_t *SVNClient::getContext(
ctx->cancel_func = checkCancel;
m_cancelOperation = false;
ctx->cancel_baton = this;
- ctx->notify_func2= NotifyCallback::notify;
+ ctx->notify_func2= ClientNotifyCallback::notify;
ctx->notify_baton2 = m_notify2;
ctx->progress_func = ProgressListener::progress;
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.h?rev=953065&r1=953064&r2=953065&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.h Wed Jun 9 16:06:53 2010
@@ -34,7 +34,7 @@
class Revision;
class RevisionRange;
-class NotifyCallback;
+class ClientNotifyCallback;
class ConflictResolverCallback;
class ProgressListener;
class Targets;
@@ -143,7 +143,7 @@ class SVNClient :public SVNBase
void revert(const char *path, svn_depth_t depth, StringArray &changelists);
void remove(Targets &targets, const char *message, bool force,
bool keep_local, RevpropTable &revprops);
- void notification2(NotifyCallback *notify2);
+ void notification2(ClientNotifyCallback *notify2);
void setConflictResolver(ConflictResolverCallback *conflictResolver);
void setProgressListener(ProgressListener *progressListener);
jlong checkout(const char *moduleName, const char *destPath,
@@ -225,7 +225,7 @@ class SVNClient :public SVNBase
bool ignoreAncestry, bool noDiffDelete, bool force,
bool showCopiesAsAdds);
- NotifyCallback *m_notify2;
+ ClientNotifyCallback *m_notify2;
ConflictResolverCallback *m_conflictResolver;
ProgressListener *m_progressListener;
Prompter *m_prompter;
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=953065&r1=953064&r2=953065&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 Jun 9 16:06:53 2010
@@ -33,7 +33,7 @@
#include "Revision.h"
#include "RevisionRange.h"
#include "EnumMapper.h"
-#include "NotifyCallback.h"
+#include "ClientNotifyCallback.h"
#include "ConflictResolverCallback.h"
#include "ProgressListener.h"
#include "CommitMessage.h"
@@ -354,7 +354,7 @@ Java_org_apache_subversion_javahl_SVNCli
JNIUtil::throwError(_("bad C++ this"));
return;
}
- NotifyCallback *notify2 = NotifyCallback::makeCNotify(jnotify2);
+ ClientNotifyCallback *notify2 = ClientNotifyCallback::makeCNotify(jnotify2);
if (JNIUtil::isExceptionThrown())
return;
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=953065&r1=953064&r2=953065&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 Jun 9 16:06:53 2010
@@ -179,7 +179,7 @@ public interface ISVNClient
* file operations.
* @since 1.2
*/
- void notification2(NotifyCallback notify);
+ void notification2(ClientNotifyCallback notify);
/**
* Set the conflict resolution callback.
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=953065&r1=953064&r2=953065&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 Jun 9 16:06:53 2010
@@ -174,7 +174,7 @@ public class SVNClient implements ISVNCl
/**
* @since 1.2
*/
- public native void notification2(NotifyCallback notify);
+ public native void notification2(ClientNotifyCallback notify);
/**
* @since 1.5
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ClientNotifyCallback.java (from r951032, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/NotifyCallback.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ClientNotifyCallback.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ClientNotifyCallback.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/NotifyCallback.java&r1=951032&r2=953065&rev=953065&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/NotifyCallback.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ClientNotifyCallback.java Wed Jun 9 16:06:53 2010
@@ -36,7 +36,7 @@ import java.util.EventListener;
*
* @since 1.2
*/
-public interface NotifyCallback extends EventListener
+public interface ClientNotifyCallback extends EventListener
{
/**
* Handler for Subversion notifications.
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=953065&r1=953064&r2=953065&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 Jun 9 16:06:53 2010
@@ -603,7 +603,7 @@ public class SVNClient implements SVNCli
public void notification2(final Notify2 notify)
{
aSVNClient.notification2(
- new org.apache.subversion.javahl.callback.NotifyCallback () {
+ new org.apache.subversion.javahl.callback.ClientNotifyCallback () {
public void onNotify(
org.apache.subversion.javahl.NotifyInformation aInfo)
{
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=953065&r1=953064&r2=953065&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 Jun 9 16:06:53 2010
@@ -2395,7 +2395,7 @@ public class BasicTests extends SVNTests
// Add a "begin merge" notification handler.
final Revision[] actualRange = new Revision[2];
- NotifyCallback notify = new NotifyCallback()
+ ClientNotifyCallback notify = new ClientNotifyCallback()
{
public void onNotify(NotifyInformation info)
{
@@ -3032,7 +3032,7 @@ public class BasicTests extends SVNTests
{
// build the test setup
OneTest thisTest = new OneTest();
- NotifyCallback notify = new NotifyCallback()
+ ClientNotifyCallback notify = new ClientNotifyCallback()
{
public void onNotify(NotifyInformation info)
{
@@ -3050,7 +3050,7 @@ public class BasicTests extends SVNTests
{
// build the test setup
OneTest thisTest = new OneTest();
- NotifyCallback notify = new NotifyCallback()
+ ClientNotifyCallback notify = new ClientNotifyCallback()
{
public void onNotify(NotifyInformation info)
{
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=953065&r1=953064&r2=953065&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 Jun 9 16:06:53 2010
@@ -832,7 +832,7 @@ class SVNTests extends TestCase
}
}
- class MyNotifier implements NotifyCallback
+ class MyNotifier implements ClientNotifyCallback
{
/**