From f09db3b6bb506e86928f699a09fe20b2a73ff558 Mon Sep 17 00:00:00 2001 From: irengrig Date: Mon, 11 Feb 2013 20:28:35 +0400 Subject: [PATCH] Subversion: checkout provider to work with null progress indicator --- .../jetbrains/idea/svn/checkout/SvnCheckoutProvider.java | 7 +++---- 1 file changed, 3 insertions(+), 4 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 a0d53844dead..20fe62410668 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/checkout/SvnCheckoutProvider.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/checkout/SvnCheckoutProvider.java @@ -84,20 +84,19 @@ public class SvnCheckoutProvider implements CheckoutProvider { public void run(@NotNull final ProgressIndicator indicator) { SvnWorkingCopyFormatHolder.setPresetFormat(selectedFormat); - final ProgressIndicator progressIndicator = ProgressManager.getInstance().getProgressIndicator(); final SVNUpdateClient client = SvnVcs.getInstance(project).createUpdateClient(); if (! WorkingCopyFormat.ONE_DOT_SEVEN.equals(selectedFormat)) { client.getOperationsFactory().setPrimaryWcGeneration(SvnWcGeneration.V16); } - client.setEventHandler(new CheckoutEventHandler(SvnVcs.getInstance(project), false, progressIndicator)); + client.setEventHandler(new CheckoutEventHandler(SvnVcs.getInstance(project), false, ProgressManager.getInstance().getProgressIndicator())); client.setIgnoreExternals(ignoreExternals); try { - progressIndicator.setText(SvnBundle.message("progress.text.checking.out", target.getAbsolutePath())); + ProgressManager.progress(SvnBundle.message("progress.text.checking.out", target.getAbsolutePath())); if (! WorkingCopyFormat.ONE_DOT_SEVEN.equals(SvnWorkingCopyFormatHolder.getPresetFormat())) { client.getOperationsFactory().setPrimaryWcGeneration(SvnWcGeneration.V16); } client.doCheckout(SVNURL.parseURIEncoded(url), target, SVNRevision.UNDEFINED, revision, depth, true); - progressIndicator.checkCanceled(); + ProgressManager.checkCanceled(); checkoutSuccessful.set(Boolean.TRUE); } catch (SVNCancelException ignore) {