svn commit: r1097551 - in /subversion/trunk/subversion/bindings/javahl/native: ClientContext.cpp CreateJ.cpp CreateJ.h

[hw...@apache.org]

Author: hwright
Date: Thu Apr 28 17:10:19 2011
New Revision: 1097551

URL: http://svn.apache.org/viewvc?rev=1097551&view=rev
Log:
JavaHL: Use svn_wc_conflict_description2_t to create a Java ConflictDescriptor.

[ in subversion/bindings/javahl/ ]
* native/CreateJ.cpp
  (ConflictDescriptor): Take a svn_wc_conflict_description2_t.
  (Status): Don't convert the conflict description in the old type.

* native/CreateJ.h
  (ConflictDescriptor): Update param type.

* native/ClientContext.cpp
  (resolve): Convert to the new type to build the descriptor.

Modified:
    subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp
    subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
    subversion/trunk/subversion/bindings/javahl/native/CreateJ.h

Modified: subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp?rev=1097551&r1=1097550&r2=1097551&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp Thu Apr 28 17:10:19 2011
@@ -25,6 +25,7 @@
  */
 
 #include "svn_client.h"
+#include "private/svn_wc_private.h"
 #include "svn_private_config.h"
 
 #include "ClientContext.h"
@@ -374,7 +375,7 @@ ClientContext::resolve(svn_wc_conflict_r
     }
 
   // Create an instance of the conflict descriptor.
-  jobject jdesc = CreateJ::ConflictDescriptor(desc);
+  jobject jdesc = CreateJ::ConflictDescriptor(svn_wc__cd_to_cd2(desc, pool));
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN(SVN_NO_ERROR);
 

Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp?rev=1097551&r1=1097550&r2=1097551&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Thu Apr 28 17:10:19 2011
@@ -38,7 +38,7 @@
 #include "private/svn_wc_private.h"
 
 jobject
-CreateJ::ConflictDescriptor(const svn_wc_conflict_description_t *desc)
+CreateJ::ConflictDescriptor(const svn_wc_conflict_description2_t *desc)
 {
   JNIEnv *env = JNIUtil::getEnv();
 
@@ -73,7 +73,7 @@ CreateJ::ConflictDescriptor(const svn_wc
         POP_AND_RETURN_NULL;
     }
 
-  jstring jpath = JNIUtil::makeJString(desc->path);
+  jstring jpath = JNIUtil::makeJString(desc->local_abspath);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
   jstring jpropertyName = JNIUtil::makeJString(desc->property_name);
@@ -82,13 +82,13 @@ CreateJ::ConflictDescriptor(const svn_wc
   jstring jmimeType = JNIUtil::makeJString(desc->mime_type);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
-  jstring jbasePath = JNIUtil::makeJString(desc->base_file);
+  jstring jbasePath = JNIUtil::makeJString(desc->base_abspath);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
-  jstring jreposPath = JNIUtil::makeJString(desc->their_file);
+  jstring jreposPath = JNIUtil::makeJString(desc->their_abspath);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
-  jstring juserPath = JNIUtil::makeJString(desc->my_file);
+  jstring juserPath = JNIUtil::makeJString(desc->my_abspath);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
   jstring jmergedPath = JNIUtil::makeJString(desc->merged_file);
@@ -528,10 +528,7 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
                                                     local_abspath, pool, pool),
                           NULL);
 
-              svn_wc_conflict_description_t *old_tree_conflict =
-                                    svn_wc__cd2_to_cd(tree_conflict, pool);
-              jConflictDescription = CreateJ::ConflictDescriptor
-                                                            (old_tree_conflict);
+              jConflictDescription = CreateJ::ConflictDescriptor(tree_conflict);
               if (JNIUtil::isJavaExceptionThrown())
                 POP_AND_RETURN_NULL;
             }

Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.h?rev=1097551&r1=1097550&r2=1097551&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.h Thu Apr 28 17:10:19 2011
@@ -43,7 +43,7 @@ class CreateJ
 {
  public:
   static jobject
-  ConflictDescriptor(const svn_wc_conflict_description_t *desc);
+  ConflictDescriptor(const svn_wc_conflict_description2_t *desc);
 
   static jobject
   Info(const char *path, const svn_info2_t *info);