1 files changed, 8 insertions, 12 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/CmdUpgradeClient.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/CmdUpgradeClient.java
index 3a4e6eb6ce92..f27615423904 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/CmdUpgradeClient.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/CmdUpgradeClient.java
@@ -7,14 +7,10 @@ import com.intellij.util.containers.Convertor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.svn.WorkingCopyFormat;
-import org.jetbrains.idea.svn.api.BaseSvnClient;
-import org.jetbrains.idea.svn.api.FileStatusResultParser;
+import org.jetbrains.idea.svn.api.*;
 import org.jetbrains.idea.svn.commandLine.CommandUtil;
 import org.jetbrains.idea.svn.commandLine.LineCommandAdapter;
 import org.jetbrains.idea.svn.commandLine.SvnCommandName;
-import org.tmatesoft.svn.core.wc.ISVNEventHandler;
-import org.tmatesoft.svn.core.wc.SVNEvent;
-import org.tmatesoft.svn.core.wc.SVNEventAction;
 import org.tmatesoft.svn.core.wc2.SvnTarget;
 
 import java.io.File;
@@ -34,11 +30,11 @@ public class CmdUpgradeClient extends BaseSvnClient implements UpgradeClient {
   private static final Pattern CHANGED_PATH = Pattern.compile(STATUS + PATH);
 
   @Override
-  public void upgrade(@NotNull File path, @NotNull WorkingCopyFormat format, @Nullable ISVNEventHandler handler) throws VcsException {
+  public void upgrade(@NotNull File path, @NotNull WorkingCopyFormat format, @Nullable ProgressTracker handler) throws VcsException {
     validateFormat(format, getSupportedFormats());
 
     // fake event indicating upgrade start
-    callHandler(handler, createEvent(path, SVNEventAction.UPDATE_COMPLETED));
+    callHandler(handler, createEvent(path, EventAction.UPDATE_COMPLETED));
 
     List<String> parameters = new ArrayList<String>();
 
@@ -64,9 +60,9 @@ public class CmdUpgradeClient extends BaseSvnClient implements UpgradeClient {
     return result;
   }
 
-  private static class UpgradeStatusConvertor implements Convertor<Matcher, SVNEvent> {
+  private static class UpgradeStatusConvertor implements Convertor<Matcher, ProgressEvent> {
 
-    public SVNEvent convert(@NotNull Matcher matcher) {
+    public ProgressEvent convert(@NotNull Matcher matcher) {
       String statusMessage = matcher.group(1);
       String path = matcher.group(2);
 
@@ -74,11 +70,11 @@ public class CmdUpgradeClient extends BaseSvnClient implements UpgradeClient {
     }
 
     @Nullable
-    public static SVNEventAction createAction(@NotNull String code) {
-      SVNEventAction result = null;
+    public static EventAction createAction(@NotNull String code) {
+      EventAction result = null;
 
       if ("Upgraded".equals(code)) {
-        result = SVNEventAction.UPGRADED_PATH;
+        result = EventAction.UPGRADED_PATH;
       }
 
       return result;