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/11/04 19:40:18 UTC
svn commit: r1031140 - in /subversion/trunk/subversion/bindings/javahl:
native/CreateJ.cpp src/org/apache/subversion/javahl/Info2.java
Author: hwright
Date: Thu Nov 4 18:40:18 2010
New Revision: 1031140
URL: http://svn.apache.org/viewvc?rev=1031140&view=rev
Log:
JavaHL: Include the working copy root in the Info2 struct.
* subversion/bindings/javahl/native/CreateJ.cpp
(Info2): Parse and pass back the working copy path.
* subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java
(Info2.wcroot): New.
(Info2): Add param to constructor.
(getWcroot): New.
Modified:
subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java
Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp?rev=1031140&r1=1031139&r2=1031140&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Thu Nov 4 18:40:18 2010
@@ -194,7 +194,8 @@ CreateJ::Info2(const char *path, const s
if (mid == 0)
{
mid = env->GetMethodID(clazz, "<init>",
- "(Ljava/lang/String;Ljava/lang/String;J"
+ "(Ljava/lang/String;Ljava/lang/String;"
+ "Ljava/lang/String;J"
"L"JAVA_PACKAGE"/NodeKind;"
"Ljava/lang/String;Ljava/lang/String;"
"JJLjava/lang/String;"
@@ -214,6 +215,10 @@ CreateJ::Info2(const char *path, const s
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
+ jstring jwcroot = JNIUtil::makeJString(info->wcroot_abspath);
+ if (JNIUtil::isJavaExceptionThrown())
+ POP_AND_RETURN_NULL;
+
jstring jurl = JNIUtil::makeJString(info->URL);
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -280,7 +285,8 @@ CreateJ::Info2(const char *path, const s
jlong jreposSize = info->size == SVN_INFO_SIZE_UNKNOWN
? -1 : (jlong) info->size;
- jobject jinfo2 = env->NewObject(clazz, mid, jpath, jurl, (jlong) info->rev,
+ jobject jinfo2 = env->NewObject(clazz, mid, jpath, jwcroot, jurl,
+ (jlong) info->rev,
jnodeKind, jreposRootUrl, jreportUUID,
(jlong) info->last_changed_rev,
(jlong) info->last_changed_date,
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java?rev=1031140&r1=1031139&r2=1031140&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java Thu Nov 4 18:40:18 2010
@@ -47,6 +47,11 @@ public class Info2 implements java.io.Se
private String path;
/**
+ * the working copy root
+ */
+ private String wcroot;
+
+ /**
* the url of the item
*/
private String url;
@@ -187,6 +192,7 @@ public class Info2 implements java.io.Se
* constructor to build the object by native code. See fields for
* parameters
* @param path
+ * @param wcroot
* @param url
* @param rev
* @param kind
@@ -210,7 +216,7 @@ public class Info2 implements java.io.Se
* @param depth
* @param treeConflict
*/
- public Info2(String path, String url, long rev, NodeKind kind,
+ public Info2(String path, String wcroot, String url, long rev, NodeKind kind,
String reposRootUrl, String reposUUID, long lastChangedRev,
long lastChangedDate, String lastChangedAuthor, Lock lock,
boolean hasWcInfo, ScheduleKind schedule, String copyFromUrl,
@@ -220,6 +226,7 @@ public class Info2 implements java.io.Se
long reposSize, Depth depth, ConflictDescriptor treeConflict)
{
this.path = path;
+ this.wcroot = wcroot;
this.url = url;
this.rev = rev;
this.kind = kind;
@@ -256,6 +263,14 @@ public class Info2 implements java.io.Se
}
/**
+ * return the workgin copy root
+ */
+ public String getWcroot()
+ {
+ return wcroot;
+ }
+
+ /**
* return the url of the item
*/
public String getUrl()
Re: svn commit: r1031140 - in /subversion/trunk/subversion/bindings/javahl:
native/CreateJ.cpp src/org/apache/subversion/javahl/Info2.java
Posted by Blair Zajac <bl...@orcaware.com>.
On 11/04/2010 11:40 AM, hwright@apache.org wrote:
> Author: hwright
> Date: Thu Nov 4 18:40:18 2010
> New Revision: 1031140
>
> URL: http://svn.apache.org/viewvc?rev=1031140&view=rev
> Log:
> JavaHL: Include the working copy root in the Info2 struct.
>
> /**
> + * return the workgin copy root
s/workgin/working/