svn commit: r993358 - /subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java

[hw...@apache.org]

Author: hwright
Date: Tue Sep  7 13:47:01 2010
New Revision: 993358

URL: http://svn.apache.org/viewvc?rev=993358&view=rev
Log:
Revert some changes to ConflictVersion.java accidentally committed in r993356
(which was itself a revertion of r992041.)

Modified:
    subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java

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=993358&r1=993357&r2=993358&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:47:01 2010
@@ -23,8 +23,6 @@
 
 package org.apache.subversion.javahl;
 
-import java.net.URI;
-
 /**
  * The description of a merge conflict, encountered during
  * merge/update/switch operations.
@@ -33,14 +31,14 @@ import java.net.URI;
  */
 public class ConflictVersion
 {
-    private URI reposURL;
+    private String reposURL;
     private long pegRevision;
     private String pathInRepos;
 
     private NodeKind nodeKind;
 
     /** This constructor should only be called from JNI code. */
-    public ConflictVersion(URI reposURL, long pegRevision, String pathInRepos,
+    public ConflictVersion(String reposURL, long pegRevision, String pathInRepos,
                     NodeKind nodeKind)
     {
         this.reposURL = reposURL;
@@ -49,7 +47,7 @@ public class ConflictVersion
         this.nodeKind = nodeKind;
     }
 
-    public URI getReposURL()
+    public String getReposURL()
     {
         return reposURL;
     }