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/09/07 15:42:33 UTC
svn commit: r993356 - in /subversion/trunk/subversion/bindings/javahl:
native/ src/org/apache/subversion/javahl/ src/org/tigris/subversion/javahl/
tests/org/apache/subversion/javahl/
Author: hwright
Date: Tue Sep 7 13:42:33 2010
New Revision: 993356
URL: http://svn.apache.org/viewvc?rev=993356&view=rev
Log:
Revert r992041, as a result of this discussion:
http://svn.haxx.se/dev/archive-2010-09/0044.shtml
Modified:
subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.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=993356&r1=993355&r2=993356&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Tue Sep 7 13:42:33 2010
@@ -871,21 +871,8 @@ CreateJ::CommitItem(svn_client_commit_it
midConstructor = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;"
"L"JAVA_PACKAGE"/NodeKind;"
- "ILjava/net/URI;"
- "Ljava/net/URI;J)V");
- if (JNIUtil::isExceptionThrown())
- POP_AND_RETURN_NULL;
- }
-
- jclass clazz2 = env->FindClass("java/net/URI");
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
-
- static jmethodID mid2 = 0;
- if (mid2 == 0)
- {
- mid2 = env->GetMethodID(clazz2, "<init>",
- "(Ljava/lang/String;)V");
+ "ILjava/lang/String;"
+ "Ljava/lang/String;J)V");
if (JNIUtil::isExceptionThrown())
POP_AND_RETURN_NULL;
}
@@ -913,23 +900,13 @@ CreateJ::CommitItem(svn_client_commit_it
jstateFlags |=
org_apache_subversion_javahl_CommitItemStateFlags_IsCopy;
- jobject jurl = NULL;
- if (item->url != NULL)
- {
- jurl = env->NewObject(clazz2, mid2,
- JNIUtil::makeJString(item->url));
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
- }
+ jstring jurl = JNIUtil::makeJString(item->url);
+ if (JNIUtil::isJavaExceptionThrown())
+ POP_AND_RETURN_NULL;
- jobject jcopyUrl = NULL;
- if (item->copyfrom_url != NULL)
- {
- jcopyUrl = env->NewObject(clazz2, mid2,
- JNIUtil::makeJString(item->copyfrom_url));
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
- }
+ jstring jcopyUrl = JNIUtil::makeJString(item->copyfrom_url);
+ if (JNIUtil::isJavaExceptionThrown())
+ POP_AND_RETURN_NULL;
jlong jcopyRevision = item->revision;
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java?rev=993356&r1=993355&r2=993356&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java Tue Sep 7 13:42:33 2010
@@ -23,8 +23,6 @@
package org.apache.subversion.javahl;
-import java.net.URI;
-
/**
* This class describes a item which will be commited.
*/
@@ -57,12 +55,12 @@ public class CommitItem implements java.
/**
* the url of the item
*/
- URI url;
+ String url;
/**
* the source of the copy
*/
- URI copyUrl;
+ String copyUrl;
/**
* the revision
@@ -78,7 +76,7 @@ public class CommitItem implements java.
* @param cu copy source url
* @param r revision number
*/
- public CommitItem(String p, NodeKind nk, int sf, URI u, URI cu, long r)
+ public CommitItem(String p, NodeKind nk, int sf, String u, String cu, long r)
{
path = p;
nodeKind = nk;
@@ -127,7 +125,7 @@ public class CommitItem implements java.
* Returns the url of the item
* @return url
*/
- public URI getUrl()
+ public String getUrl()
{
return url;
}
@@ -136,7 +134,7 @@ public class CommitItem implements java.
* Returns the source url if the item is copied
* @return source url
*/
- public URI getCopyUrl()
+ public String getCopyUrl()
{
return copyUrl;
}
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java?rev=993356&r1=993355&r2=993356&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java Tue Sep 7 13:42:33 2010
@@ -23,6 +23,8 @@
package org.apache.subversion.javahl;
+import java.net.URI;
+
/**
* The description of a merge conflict, encountered during
* merge/update/switch operations.
@@ -31,14 +33,14 @@ package org.apache.subversion.javahl;
*/
public class ConflictVersion
{
- private String reposURL;
+ private URI reposURL;
private long pegRevision;
private String pathInRepos;
private NodeKind nodeKind;
/** This constructor should only be called from JNI code. */
- public ConflictVersion(String reposURL, long pegRevision, String pathInRepos,
+ public ConflictVersion(URI reposURL, long pegRevision, String pathInRepos,
NodeKind nodeKind)
{
this.reposURL = reposURL;
@@ -47,7 +49,7 @@ public class ConflictVersion
this.nodeKind = nodeKind;
}
- public String getReposURL()
+ public URI getReposURL()
{
return reposURL;
}
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java?rev=993356&r1=993355&r2=993356&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java Tue Sep 7 13:42:33 2010
@@ -92,9 +92,7 @@ public class CommitItem implements java.
public CommitItem(org.apache.subversion.javahl.CommitItem aItem)
{
this(aItem.getPath(), NodeKind.fromApache(aItem.getNodeKind()),
- aItem.getStateFlags(),
- aItem.getUrl() != null ? aItem.getUrl().toString() : null,
- aItem.getCopyUrl() != null ? aItem.getCopyUrl().toString() : null,
+ aItem.getStateFlags(), aItem.getUrl(), aItem.getCopyUrl(),
aItem.getRevision());
}
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java?rev=993356&r1=993355&r2=993356&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java Tue Sep 7 13:42:33 2010
@@ -806,7 +806,7 @@ class SVNTests extends TestCase
// path
String key;
if (commitItem.getUrl() != null)
- key = commitItem.getUrl().toString();
+ key = commitItem.getUrl();
else
key = commitItem.getPath();