1 files changed, 21 insertions, 25 deletions

diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnParseCommandLineParseTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnParseCommandLineParseTest.java
index ec78b9fd5f55..6e0ee960b64a 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnParseCommandLineParseTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnParseCommandLineParseTest.java
@@ -24,19 +24,15 @@ import com.intellij.util.containers.Convertor;
 import com.intellij.util.containers.MultiMap;
 import junit.framework.Assert;
 import junit.framework.TestCase;
-import org.jetbrains.idea.svn.status.CmdStatusClient;
+import org.jetbrains.idea.svn.api.Depth;
+import org.jetbrains.idea.svn.api.NodeKind;
+import org.jetbrains.idea.svn.status.Status;
+import org.jetbrains.idea.svn.info.Info;
+import org.jetbrains.idea.svn.status.*;
 import org.jetbrains.idea.svn.info.SvnInfoHandler;
-import org.jetbrains.idea.svn.status.SvnStatusHandler;
-import org.jetbrains.idea.svn.info.IdeaSVNInfo;
-import org.jetbrains.idea.svn.status.PortableStatus;
-import org.tmatesoft.svn.core.SVNDepth;
 import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.SVNNodeKind;
 import org.tmatesoft.svn.core.SVNURL;
-import org.tmatesoft.svn.core.wc.ISVNStatusHandler;
-import org.tmatesoft.svn.core.wc.SVNInfo;
 import org.tmatesoft.svn.core.wc.SVNRevision;
-import org.tmatesoft.svn.core.wc.SVNStatus;
 
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
@@ -84,10 +80,10 @@ public class SvnParseCommandLineParseTest extends TestCase {
                      "</entry>\n" +
                      "</info>";
 
-    final SVNInfo[] info = new SVNInfo[1];
-    final SvnInfoHandler handler = new SvnInfoHandler(new File("C:/base/"), new Consumer<SVNInfo>() {
+    final Info[] info = new Info[1];
+    final SvnInfoHandler handler = new SvnInfoHandler(new File("C:/base/"), new Consumer<Info>() {
       @Override
-      public void consume(SVNInfo info1) {
+      public void consume(Info info1) {
         info[0] = info1;
       }
     });
@@ -574,9 +570,9 @@ public class SvnParseCommandLineParseTest extends TestCase {
       @Override
       public void switchChangeList(String newList) {
       }
-    }, new File(basePath), new Convertor<File, SVNInfo>() {
+    }, new File(basePath), new Convertor<File, Info>() {
       @Override
-      public SVNInfo convert(File o) {
+      public Info convert(File o) {
         try {
           o.getCanonicalFile();
         }
@@ -616,9 +612,9 @@ public class SvnParseCommandLineParseTest extends TestCase {
     return StringUtil.replace(s, "C:/", LINUX_ROOT);
   }
 
-  private IdeaSVNInfo createStubInfo(final String basePath, final String baseUrl) throws SVNException {
-    return new IdeaSVNInfo(basePath, SVNURL.parseURIEncoded(baseUrl), SVNRevision.HEAD, SVNNodeKind.FILE, "",
-                           SVNURL.parseURIEncoded("http://a.b.c"), 1, new Date(), "me", null, SVNDepth.EMPTY, 1);
+  private Info createStubInfo(final String basePath, final String baseUrl) throws SVNException {
+    return new Info(basePath, SVNURL.parseURIEncoded(baseUrl), SVNRevision.HEAD, NodeKind.FILE, "",
+                           SVNURL.parseURIEncoded("http://a.b.c"), 1, new Date(), "me", null, Depth.EMPTY);
   }
 
   public void testStatusInExternalMove() throws Exception {
@@ -671,9 +667,9 @@ public class SvnParseCommandLineParseTest extends TestCase {
     final String basePath = "C:\\TestProjects\\sortedProjects\\Subversion\\local2\\sep12main\\main";
     final SvnStatusHandler[] handler = new SvnStatusHandler[1];
     final File baseFile = new File(basePath);
-    final SvnStatusHandler.ExternalDataCallback callback = CmdStatusClient.createStatusCallback(new ISVNStatusHandler() {
+    final SvnStatusHandler.ExternalDataCallback callback = CmdStatusClient.createStatusCallback(new StatusConsumer() {
       @Override
-      public void handleStatus(SVNStatus status) throws SVNException {
+      public void consume(Status status) throws SVNException {
         System.out.println(status.getURL());
         if (new File(
           "C:\\TestProjects\\sortedProjects\\Subversion\\local2\\sep12main\\main\\slave\\src\\com\\slave\\MacMessagesParser.java")
@@ -686,9 +682,9 @@ public class SvnParseCommandLineParseTest extends TestCase {
         }
       }
     }, baseFile, createStubInfo(basePath, "http://mainurl/"), handler);
-    handler[0] = new SvnStatusHandler(callback, baseFile, new Convertor<File, SVNInfo>() {
+    handler[0] = new SvnStatusHandler(callback, baseFile, new Convertor<File, Info>() {
       @Override
-      public SVNInfo convert(File o) {
+      public Info convert(File o) {
         try {
           if (new File("C:\\TestProjects\\sortedProjects\\Subversion\\local2\\sep12main\\main\\slave").equals(o)) {
             return createStubInfo(o.getPath(), "http://external");
@@ -756,9 +752,9 @@ public class SvnParseCommandLineParseTest extends TestCase {
       @Override
       public void switchChangeList(String newList) {
       }
-    }, new File(basePath), new Convertor<File, SVNInfo>() {
+    }, new File(basePath), new Convertor<File, Info>() {
       @Override
-      public SVNInfo convert(File o) {
+      public Info convert(File o) {
         try {
           o.getCanonicalFile();
         }
@@ -846,9 +842,9 @@ public class SvnParseCommandLineParseTest extends TestCase {
       public void switchChangeList(String newList) {
         clName[0] = newList;
       }
-    }, new File(basePath), new Convertor<File, SVNInfo>() {
+    }, new File(basePath), new Convertor<File, Info>() {
       @Override
-      public SVNInfo convert(File o) {
+      public Info convert(File o) {
         try {
           o.getCanonicalFile();
         }