Author: hwright
Date: Thu Jun 10 10:06:25 2010
New Revision: 953270
URL: http://svn.apache.org/viewvc?rev=953270&view=rev
Log:
JavaHL: Follow up to r953266, remove the C++ support for the old info fetching.
[ in subversion/bindings/javahl/ ]
* native/CreateJ.cpp,
native/SVNClient.h
(Info): Remove.
* native/SVNClient.cpp,
native/CreateJ.h
(info): Remove.
* native/org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_info): Remove.
Modified:
subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
subversion/trunk/subversion/bindings/javahl/native/CreateJ.h
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/CreateJ.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp?rev=953270&r1=953269&r2=953270&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Thu Jun 10
10:06:25 2010
@@ -175,91 +175,6 @@ CreateJ::ConflictVersion(const svn_wc_co
}
jobject
-CreateJ::Info(const svn_wc_entry_t *entry)
-{
- if (entry == NULL)
- return NULL;
-
- JNIEnv *env = JNIUtil::getEnv();
-
- // Create a local frame for our references
- env->PushLocalFrame(LOCAL_FRAME_SIZE);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
-
- jclass clazz = env->FindClass(JAVA_PACKAGE"/Info");
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
-
- static jmethodID mid = 0;
- if (mid == 0)
- {
- mid = env->GetMethodID(clazz, "<init>",
- "(Ljava/lang/String;Ljava/lang/String;"
- "Ljava/lang/String;Ljava/lang/String;"
- "L"JAVA_PACKAGE"/Info2$ScheduleKind;"
- "L"JAVA_PACKAGE"/NodeKind;"
- "Ljava/lang/String;JJLjava/util/Date;"
- "Ljava/util/Date;Ljava/util/Date;"
- "ZZZZJLjava/lang/String;)V");
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
- }
-
- jstring jName = JNIUtil::makeJString(entry->name);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
- jstring jUrl = JNIUtil::makeJString(entry->url);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
- jstring jUuid = JNIUtil::makeJString(entry->uuid);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
- jstring jRepository = JNIUtil::makeJString(entry->repos);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
- jobject jSchedule = EnumMapper::mapScheduleKind(entry->schedule);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
- jobject jNodeKind = EnumMapper::mapNodeKind(entry->kind);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
- jstring jAuthor = JNIUtil::makeJString(entry->cmt_author);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
- jlong jRevision = entry->revision;
- jlong jLastChangedRevision = entry->cmt_rev;
- jobject jLastChangedDate = JNIUtil::createDate(entry->cmt_date);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
- jobject jLastDateTextUpdate = JNIUtil::createDate(entry->text_time);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
- jobject jLastDatePropsUpdate = JNIUtil::createDate(entry->prop_time);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
- jboolean jCopied = entry->copied ? JNI_TRUE : JNI_FALSE;
- jboolean jDeleted = entry->deleted ? JNI_TRUE : JNI_FALSE;
- jboolean jAbsent = entry->absent ? JNI_TRUE : JNI_FALSE;
- jboolean jIncomplete = entry->incomplete ? JNI_TRUE : JNI_FALSE;
- jlong jCopyRev = entry->copyfrom_rev;
- jstring jCopyUrl = JNIUtil::makeJString(entry->copyfrom_url);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
-
- jobject jinfo = env->NewObject(clazz, mid, jName, jUrl, jUuid, jRepository,
- jSchedule, jNodeKind, jAuthor, jRevision,
- jLastChangedRevision, jLastChangedDate,
- jLastDateTextUpdate, jLastDatePropsUpdate,
- jCopied, jDeleted, jAbsent, jIncomplete,
- jCopyRev, jCopyUrl);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
-
- return env->PopLocalFrame(jinfo);
-}
-
-jobject
CreateJ::Info2(const char *path, const svn_info_t *info)
{
JNIEnv *env = JNIUtil::getEnv();
Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.h?rev=953270&r1=953269&r2=953270&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.h Thu Jun 10
10:06:25 2010
@@ -45,9 +45,6 @@ class CreateJ
ConflictDescriptor(const svn_wc_conflict_description_t *desc);
static jobject
- Info(const svn_wc_entry_t *entry);
-
- static jobject
Info2(const char *path, const svn_info_t *info);
static jobject
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=953270&r1=953269&r2=953270&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Thu Jun 10
10:06:25 2010
@@ -1885,30 +1885,6 @@ struct info_baton
apr_pool_t *pool;
};
-/**
- * Get information about a file or directory.
- */
-jobject SVNClient::info(const char *path)
-{
- SVN::Pool requestPool;
- svn_wc_adm_access_t *adm_access;
- const svn_wc_entry_t *entry;
-
- SVN_JNI_NULL_PTR_EX(path, "path", NULL);
- Path intPath(path);
- SVN_JNI_ERR(intPath.error_occured(), NULL);
-
- SVN_JNI_ERR(svn_wc_adm_probe_open3(&adm_access, NULL, intPath.c_str(),
- FALSE, 0, NULL, NULL,
- requestPool.pool()),
- NULL);
- SVN_JNI_ERR(svn_wc_entry(&entry, intPath.c_str(), adm_access, FALSE,
- requestPool.pool()),
- NULL);
-
- return CreateJ::Info(entry);
-}
-
void
SVNClient::info2(const char *path, Revision &revision, Revision &pegRevision,
svn_depth_t depth, StringArray &changelists,
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.h?rev=953270&r1=953269&r2=953270&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.h Thu Jun 10
10:06:25 2010
@@ -159,7 +159,6 @@ class SVNClient :public SVNBase
void username(const char *pi_username);
jstring getAdminDirectoryName();
jboolean isAdminDirectory(const char *name);
- jobject info(const char *path);
void addToChangelist(Targets &srcPaths, const char *changelist,
svn_depth_t depth, StringArray &changelists);
void removeFromChangelists(Targets &srcPaths, svn_depth_t depth,
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=953270&r1=953269&r2=953270&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 Jun 10 10:06:25 2010
@@ -1608,25 +1608,6 @@ Java_org_apache_subversion_javahl_SVNCli
cl->cancelOperation();
}
-JNIEXPORT jobject JNICALL
-Java_org_apache_subversion_javahl_SVNClient_info
-(JNIEnv *env, jobject jthis, jstring jpath)
-{
- JNIEntry(SVNClient, info);
- SVNClient *cl = SVNClient::getCppObject(jthis);
- if (cl == NULL)
- {
- JNIUtil::throwError("bad C++ this");
- return NULL;
- }
-
- JNIStringHolder path(jpath);
- if (JNIUtil::isExceptionThrown())
- return NULL;
-
- return cl->info(path);
-}
-
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNClient_addToChangelist
(JNIEnv *env, jobject jthis, jobject jtargets, jstring jchangelist,
