~ubuntu-branches/debian/experimental/subversion/experimental

« back to all changes in this revision

Viewing changes to subversion/bindings/javahl/native/SVNRepos.cpp

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2015-07-16 19:39:54 UTC
  • mfrom: (0.1.13)
  • Revision ID: package-import@ubuntu.com-20150716193954-6ueu2w62h4h556xh
Tags: 1.9.0~rc3-1
* New upstream pre-release.
* Point the Vcs-* URLs at the right directory

Show diffs side-by-side

added added

removed removed

Lines of Context:
26
26
 
27
27
#include "SVNRepos.h"
28
28
#include "CreateJ.h"
29
 
#include "ReposNotifyCallback.h"
30
29
#include "JNIUtil.h"
31
30
#include "svn_error_codes.h"
32
31
#include "svn_repos.h"
50
49
{
51
50
  static jfieldID fid = 0;
52
51
  jlong cppAddr = SVNBase::findCppAddrForJObject(jthis, &fid,
53
 
                                                 JAVA_PACKAGE"/SVNRepos");
 
52
                                                 JAVAHL_CLASS("/SVNRepos"));
54
53
  return (cppAddr == 0 ? NULL : reinterpret_cast<SVNRepos *>(cppAddr));
55
54
}
56
55
 
57
56
void SVNRepos::dispose(jobject jthis)
58
57
{
59
58
  static jfieldID fid = 0;
60
 
  SVNBase::dispose(jthis, &fid, JAVA_PACKAGE"/SVNRepos");
 
59
  SVNBase::dispose(jthis, &fid, JAVAHL_CLASS("/SVNRepos"));
61
60
}
62
61
 
63
62
void SVNRepos::cancelOperation()
594
593
 
595
594
void
596
595
SVNRepos::verify(File &path, Revision &revisionStart, Revision &revisionEnd,
597
 
                 bool keepGoing, bool checkNormalization, bool metadataOnly,
598
 
                 ReposNotifyCallback *notifyCallback)
 
596
                 bool checkNormalization, bool metadataOnly,
 
597
                 ReposNotifyCallback *notifyCallback,
 
598
                 ReposVerifyCallback *verifyCallback)
599
599
{
600
600
  SVN::Pool requestPool;
601
601
  svn_repos_t *repos;
639
639
       _("Start revision cannot be higher than end revision")), );
640
640
 
641
641
  SVN_JNI_ERR(svn_repos_verify_fs3(repos, lower, upper,
642
 
                                   keepGoing,
643
642
                                   checkNormalization,
644
643
                                   metadataOnly,
645
 
                                   notifyCallback != NULL
646
 
                                    ? ReposNotifyCallback::notify
647
 
                                    : NULL,
 
644
                                   (!notifyCallback ? NULL
 
645
                                    : ReposNotifyCallback::notify),
648
646
                                   notifyCallback,
 
647
                                   (!verifyCallback ? NULL
 
648
                                    : ReposVerifyCallback::callback),
 
649
                                   verifyCallback,
649
650
                                   checkCancel, this /* cancel callback/baton */,
650
651
                                   requestPool.getPool()), );
651
652
}
716
717
              NULL);
717
718
 
718
719
  JNIEnv *env = JNIUtil::getEnv();
719
 
  jclass clazz = env->FindClass(JAVA_PACKAGE"/types/Lock");
 
720
  jclass clazz = env->FindClass(JAVAHL_CLASS("/types/Lock"));
720
721
  if (JNIUtil::isJavaExceptionThrown())
721
722
    return NULL;
722
723