svn commit: r924969 - in /subversion/trunk/subversion/bindings/javahl/native: Notify.cpp Notify.h SVNClient.cpp SVNClient.h org_apache_subversion_javahl_SVNClient.cpp

[hw...@apache.org]

Author: hwright
Date: Thu Mar 18 19:51:28 2010
New Revision: 924969

URL: http://svn.apache.org/viewvc?rev=924969&view=rev
Log:
JavaHL: Remove the C++ Notify infrastructure, since we've also removed it on
the Java side (in favor of Notify2 and friends).

[ in subversion/bindings/javahl/ ]
* native/Notify.cpp:
  Remove.

* native/SVNClient.h:
  Remove references to the Notify type.

* native/SVNClient.cpp
  (getContext): Just null-out the notify function and baton.
  (SVNClient, ~SVNClient): Remove the notify member.

* native/Notify.h:
  Remove.

* native/org_apache_subversion_javahl_SVNClient.cpp:
  Remove reference to the Notify header.

Removed:
    subversion/trunk/subversion/bindings/javahl/native/Notify.cpp
    subversion/trunk/subversion/bindings/javahl/native/Notify.h
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=924969&r1=924968&r2=924969&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Thu Mar 18 19:51:28 2010
@@ -26,7 +26,6 @@
 
 #include "SVNClient.h"
 #include "JNIUtil.h"
-#include "Notify.h"
 #include "NotifyCallback.h"
 #include "CopySources.h"
 #include "DiffSummaryReceiver.h"
@@ -77,7 +76,6 @@ struct log_msg_baton
 
 SVNClient::SVNClient()
 {
-    m_notify = NULL;
     m_notify2 = NULL;
     m_progressListener = NULL;
     m_prompter = NULL;
@@ -87,7 +85,6 @@ SVNClient::SVNClient()
 
 SVNClient::~SVNClient()
 {
-    delete m_notify;
     delete m_notify2;
     delete m_progressListener;
     delete m_prompter;
@@ -1233,8 +1230,8 @@ svn_client_ctx_t *SVNClient::getContext(
                                m_passWord.c_str());
 
     ctx->auth_baton = ab;
-    ctx->notify_func = Notify::notify;
-    ctx->notify_baton = m_notify;
+    ctx->notify_func = NULL;
+    ctx->notify_baton = NULL;
     ctx->log_msg_func3 = getCommitMessage;
     ctx->log_msg_baton3 = getCommitMessageBaton(message);
     ctx->cancel_func = checkCancel;

Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.h?rev=924969&r1=924968&r2=924969&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.h Thu Mar 18 19:51:28 2010
@@ -34,7 +34,6 @@
 
 class Revision;
 class RevisionRange;
-class Notify;
 class NotifyCallback;
 class ConflictResolverCallback;
 class ProgressListener;
@@ -226,7 +225,6 @@ class SVNClient :public SVNBase
             bool ignoreAncestry, bool noDiffDelete, bool force,
             bool showCopiesAsAdds);
 
-  Notify *m_notify;
   NotifyCallback *m_notify2;
   ConflictResolverCallback *m_conflictResolver;
   ProgressListener *m_progressListener;

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=924969&r1=924968&r2=924969&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 Thu Mar 18 19:51:28 2010
@@ -33,7 +33,6 @@
 #include "SVNClient.h"
 #include "Revision.h"
 #include "RevisionRange.h"
-#include "Notify.h"
 #include "EnumMapper.h"
 #include "NotifyCallback.h"
 #include "ConflictResolverCallback.h"