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 2011/02/16 13:40:32 UTC
svn commit: r1071228 - in
/subversion/trunk/subversion/bindings/javahl/native: CopySources.cpp
CreateJ.cpp EnumMapper.cpp InfoCallback.cpp RevisionRange.cpp SVNClient.cpp
Author: hwright
Date: Wed Feb 16 12:40:32 2011
New Revision: 1071228
URL: http://svn.apache.org/viewvc?rev=1071228&view=rev
Log:
Followup to r1071214: Update the various class references in the native JavaHL
code to reflect the change in package for Info, RevisionRange, CopySource,
Mergeinfo and Property.
* subversion/bindings/javahl/native/CreateJ.cpp,
subversion/bindings/javahl/native/CopySources.cpp,
subversion/bindings/javahl/native/SVNClient.cpp,
subversion/bindings/javahl/native/RevisionRange.cpp,
subversion/bindings/javahl/native/InfoCallback.cpp,
subversion/bindings/javahl/native/EnumMapper.cpp:
Update package references for selected classes.
Modified:
subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp
subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp
subversion/trunk/subversion/bindings/javahl/native/InfoCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/RevisionRange.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
Modified: subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp?rev=1071228&r1=1071227&r2=1071228&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp Wed Feb 16 12:40:32 2011
@@ -60,7 +60,7 @@ CopySources::makeJCopySource(const char
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
- jclass clazz = env->FindClass(JAVA_PACKAGE "/CopySource");
+ jclass clazz = env->FindClass(JAVA_PACKAGE "/types/CopySource");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -88,7 +88,7 @@ CopySources::array(SVN::Pool &pool)
apr_pool_t *p = pool.pool();
JNIEnv *env = JNIUtil::getEnv();
- jclass clazz = env->FindClass(JAVA_PACKAGE "/CopySource");
+ jclass clazz = env->FindClass(JAVA_PACKAGE "/types/CopySource");
if (JNIUtil::isJavaExceptionThrown())
return NULL;
Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp?rev=1071228&r1=1071227&r2=1071228&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Wed Feb 16 12:40:32 2011
@@ -187,7 +187,7 @@ CreateJ::Info(const char *path, const sv
if (JNIUtil::isJavaExceptionThrown())
return NULL;
- jclass clazz = env->FindClass(JAVA_PACKAGE "/Info");
+ jclass clazz = env->FindClass(JAVA_PACKAGE "/types/Info");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -201,7 +201,7 @@ CreateJ::Info(const char *path, const sv
"Ljava/lang/String;Ljava/lang/String;"
"JJLjava/lang/String;"
"L"JAVA_PACKAGE"/types/Lock;Z"
- "L"JAVA_PACKAGE"/Info$ScheduleKind;"
+ "L"JAVA_PACKAGE"/types/Info$ScheduleKind;"
"Ljava/lang/String;JJJ"
"Ljava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;Ljava/lang/String;"
@@ -706,7 +706,7 @@ CreateJ::ClientNotifyInformation(const s
"L"JAVA_PACKAGE"/ClientNotifyInformation$Status;"
"L"JAVA_PACKAGE"/ClientNotifyInformation$LockStatus;"
"JLjava/lang/String;"
- "L"JAVA_PACKAGE"/RevisionRange;"
+ "L"JAVA_PACKAGE"/types/RevisionRange;"
"Ljava/lang/String;Ljava/lang/String;"
"Ljava/util/Map;JJJJJJI)V");
if (JNIUtil::isJavaExceptionThrown() || midCT == 0)
Modified: subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp?rev=1071228&r1=1071227&r2=1071228&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp Wed Feb 16 12:40:32 2011
@@ -132,7 +132,7 @@ jobject EnumMapper::mapNotifyLockState(s
jobject EnumMapper::mapScheduleKind(svn_wc_schedule_t schedule)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/Info$ScheduleKind", (int) schedule);
+ return mapEnum(JAVA_PACKAGE"/types/Info$ScheduleKind", (int) schedule);
}
/**
@@ -165,7 +165,7 @@ jobject EnumMapper::mapConflictReason(sv
int EnumMapper::toMergeinfoLogKind(jobject jLogKind)
{
- return getOrdinal(JAVA_PACKAGE"/Mergeinfo$LogKind", jLogKind);
+ return getOrdinal(JAVA_PACKAGE"/types/Mergeinfo$LogKind", jLogKind);
}
int EnumMapper::toLogLevel(jobject jLogLevel)
Modified: subversion/trunk/subversion/bindings/javahl/native/InfoCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/InfoCallback.cpp?rev=1071228&r1=1071227&r2=1071228&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/InfoCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/InfoCallback.cpp Wed Feb 16 12:40:32 2011
@@ -85,7 +85,7 @@ InfoCallback::singleInfo(const char *pat
POP_AND_RETURN(SVN_NO_ERROR);
mid = env->GetMethodID(clazz, "singleInfo",
- "(L"JAVA_PACKAGE"/Info;)V");
+ "(L"JAVA_PACKAGE"/types/Info;)V");
if (JNIUtil::isJavaExceptionThrown() || mid == 0)
POP_AND_RETURN(SVN_NO_ERROR);
}
Modified: subversion/trunk/subversion/bindings/javahl/native/RevisionRange.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/RevisionRange.cpp?rev=1071228&r1=1071227&r2=1071228&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/RevisionRange.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/RevisionRange.cpp Wed Feb 16 12:40:32 2011
@@ -48,7 +48,7 @@ const svn_opt_revision_range_t *Revision
{
JNIEnv *env = JNIUtil::getEnv();
- jclass clazz = env->FindClass(JAVA_PACKAGE"/RevisionRange");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/types/RevisionRange");
if (JNIUtil::isExceptionThrown())
return NULL;
@@ -105,7 +105,7 @@ RevisionRange::makeJRevisionRange(svn_me
{
JNIEnv *env = JNIUtil::getEnv();
- jclass rangeClazz = env->FindClass(JAVA_PACKAGE "/RevisionRange");
+ jclass rangeClazz = env->FindClass(JAVA_PACKAGE "/types/RevisionRange");
if (JNIUtil::isJavaExceptionThrown())
return NULL;
static jmethodID rangeCtor = 0;
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1071228&r1=1071227&r2=1071228&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Wed Feb 16 12:40:32 2011
@@ -720,7 +720,7 @@ SVNClient::getMergeinfo(const char *targ
return NULL;
// Transform mergeinfo into Java Mergeinfo object.
- jclass clazz = env->FindClass(JAVA_PACKAGE "/Mergeinfo");
+ jclass clazz = env->FindClass(JAVA_PACKAGE "/types/Mergeinfo");
if (JNIUtil::isJavaExceptionThrown())
return NULL;