1 files changed, 16 insertions, 12 deletions

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/checkout/SvnCheckoutProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/checkout/SvnCheckoutProvider.java
index 634d528c17f1..c7422ef2a220 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/checkout/SvnCheckoutProvider.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/checkout/SvnCheckoutProvider.java
@@ -44,12 +44,13 @@ import org.jetbrains.idea.svn.*;
 import org.jetbrains.idea.svn.actions.ExclusiveBackgroundVcsAction;
 import org.jetbrains.idea.svn.actions.SvnExcludingIgnoredOperation;
 import org.jetbrains.idea.svn.api.ClientFactory;
-import org.jetbrains.idea.svn.checkin.IdeaCommitHandler;
+import org.jetbrains.idea.svn.api.Depth;
+import org.jetbrains.idea.svn.api.ProgressTracker;
 import org.jetbrains.idea.svn.checkin.CommitEventHandler;
+import org.jetbrains.idea.svn.checkin.IdeaCommitHandler;
 import org.jetbrains.idea.svn.dialogs.CheckoutDialog;
 import org.jetbrains.idea.svn.dialogs.UpgradeFormatDialog;
 import org.tmatesoft.svn.core.SVNCancelException;
-import org.tmatesoft.svn.core.SVNDepth;
 import org.tmatesoft.svn.core.SVNException;
 import org.tmatesoft.svn.core.SVNURL;
 import org.tmatesoft.svn.core.wc.*;
@@ -68,8 +69,8 @@ public class SvnCheckoutProvider implements CheckoutProvider {
     dialog.show();
   }
 
-  public static void doCheckout(final Project project, final File target, final String url, final SVNRevision revision,
-                                final SVNDepth depth, final boolean ignoreExternals, @Nullable final Listener listener) {
+  public static void doCheckout(@NotNull Project project, @NotNull File target, final String url, final SVNRevision revision,
+                                final Depth depth, final boolean ignoreExternals, @Nullable final Listener listener) {
     if (! target.exists()) {
       target.mkdirs();
     }
@@ -95,7 +96,7 @@ public class SvnCheckoutProvider implements CheckoutProvider {
                                final File target,
                                final String url,
                                final SVNRevision revision,
-                               final SVNDepth depth,
+                               final Depth depth,
                                final boolean ignoreExternals,
                                final Listener listener, final WorkingCopyFormat selectedFormat) {
     final Ref<Boolean> checkoutSuccessful = new Ref<Boolean>();
@@ -108,7 +109,7 @@ public class SvnCheckoutProvider implements CheckoutProvider {
         SvnWorkingCopyFormatHolder.setPresetFormat(format);
 
         SvnVcs vcs = SvnVcs.getInstance(project);
-        ISVNEventHandler handler = new CheckoutEventHandler(vcs, false, ProgressManager.getInstance().getProgressIndicator());
+        ProgressTracker handler = new CheckoutEventHandler(vcs, false, ProgressManager.getInstance().getProgressIndicator());
         ProgressManager.progress(SvnBundle.message("progress.text.checking.out", target.getAbsolutePath()));
         try {
           getFactory(vcs, format).createCheckoutClient()
@@ -186,11 +187,11 @@ public class SvnCheckoutProvider implements CheckoutProvider {
 
   @CalledInAwt
   @NotNull
-  public static WorkingCopyFormat promptForWCopyFormat(final File target, final Project project) {
+  public static WorkingCopyFormat promptForWCopyFormat(@NotNull File target, @NotNull Project project) {
     return new CheckoutFormatFromUserProvider(project, target).prompt();
   }
 
-  public static void doExport(final Project project, final File target, final SVNURL url, final SVNDepth depth,
+  public static void doExport(final Project project, final File target, final SVNURL url, final Depth depth,
                               final boolean ignoreExternals, final boolean force, final String eolStyle) {
     try {
       final VcsException[] exception = new VcsException[1];
@@ -199,7 +200,7 @@ public class SvnCheckoutProvider implements CheckoutProvider {
       ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() {
         public void run() {
           ProgressIndicator progressIndicator = ProgressManager.getInstance().getProgressIndicator();
-          ISVNEventHandler handler = new CheckoutEventHandler(vcs, true, progressIndicator);
+          ProgressTracker handler = new CheckoutEventHandler(vcs, true, progressIndicator);
           try {
             progressIndicator.setText(SvnBundle.message("progress.text.export", target.getAbsolutePath()));
 
@@ -221,7 +222,7 @@ public class SvnCheckoutProvider implements CheckoutProvider {
     }
   }
 
-  public static void doImport(final Project project, final File target, final SVNURL url, final SVNDepth depth,
+  public static void doImport(final Project project, final File target, final SVNURL url, final Depth depth,
                               final boolean includeIgnored, final String message) {
     final Ref<String> errorMessage = new Ref<String>();
     final SvnVcs vcs = SvnVcs.getInstance(project);
@@ -312,14 +313,15 @@ public class SvnCheckoutProvider implements CheckoutProvider {
     public WorkingCopyFormat prompt() {
       assert !ApplicationManager.getApplication().isUnitTestMode();
 
-      final WorkingCopyFormat result = displayUpgradeDialog(WorkingCopyFormat.ONE_DOT_SEVEN);
+      final WorkingCopyFormat result = displayUpgradeDialog();
 
       ApplicationManager.getApplication().getMessageBus().syncPublisher(SvnVcs.WC_CONVERTED).run();
 
       return result;
     }
 
-    private WorkingCopyFormat displayUpgradeDialog(@NotNull WorkingCopyFormat defaultSelection) {
+    @NotNull
+    private WorkingCopyFormat displayUpgradeDialog() {
       final UpgradeFormatDialog dialog = new UpgradeFormatDialog(myProject, myPath, false);
       final ModalityState dialogState = ModalityState.any();
 
@@ -354,6 +356,7 @@ public class SvnCheckoutProvider implements CheckoutProvider {
       return dialog.isOK() ? dialog.getUpgradeMode() : WorkingCopyFormat.UNKNOWN;
     }
 
+    @NotNull
     private List<WorkingCopyFormat> loadSupportedFormats() {
       List<WorkingCopyFormat> result = ContainerUtil.newArrayList();
 
@@ -368,6 +371,7 @@ public class SvnCheckoutProvider implements CheckoutProvider {
       return result;
     }
 
+    @NotNull
     private static List<WorkingCopyFormat> getOtherFactoryFormats(@NotNull ClientFactory otherFactory) {
       List<WorkingCopyFormat> result;