From 44ca4f0b9dceae0014ad760ac1e63bfbf4ab7dd1 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Thu, 2 Oct 2014 09:31:45 +0200
Subject: [PATCH] deprecate BlockReloadingUtil

---
 .../com/intellij/openapi/vcs/update/BlockReloadingUtil.java  | 1 +
 .../idea/svn/integrate/SvnIntegrateChangesTask.java          | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/BlockReloadingUtil.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/BlockReloadingUtil.java
index 56308a42ce41..40ddcd5e6bc3 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/BlockReloadingUtil.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/BlockReloadingUtil.java
@@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.update;
 
 import com.intellij.openapi.project.ex.ProjectManagerEx;
 
+@Deprecated
 public class BlockReloadingUtil {
   private BlockReloadingUtil() {
   }
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnIntegrateChangesTask.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnIntegrateChangesTask.java
index 97016d4d88f1..8c76d63f1036 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnIntegrateChangesTask.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnIntegrateChangesTask.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
+import com.intellij.openapi.project.ex.ProjectManagerEx;
 import com.intellij.openapi.ui.MessageType;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Ref;
@@ -98,7 +99,7 @@ public class SvnIntegrateChangesTask extends Task.Backgroundable {
     myHandler.setProgressIndicator(ProgressManager.getInstance().getProgressIndicator());
     myResolveWorker = new ResolveWorker(myInfo.isUnderProjectRoot(), myProject);
 
-    BlockReloadingUtil.block();
+    ProjectManagerEx.getInstanceEx().blockReloadingProjectOnExternalChanges();
     myProjectLevelVcsManager.startBackgroundVcsOperation();
 
     try {
@@ -174,7 +175,7 @@ public class SvnIntegrateChangesTask extends Task.Backgroundable {
         afterExecution(wasCancelled);
       }
     } finally {
-      BlockReloadingUtil.unblock();
+      ProjectManagerEx.getInstanceEx().unblockReloadingProjectOnExternalChanges();
     }
   }