MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

deprecate BlockReloadingUtil

Browse Source
This commit is contained in:
Vladimir Krivosheev
2014-10-02 09:38:06 +02:00
parent 745725ac53
commit 44ca4f0b9d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/update/BlockReloadingUtil.java
+1
View File
@@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.update;
import com.intellij.openapi.project.ex.ProjectManagerEx;
@Deprecated
public class BlockReloadingUtil {
private BlockReloadingUtil() {
}
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnIntegrateChangesTask.java
+3 -2
View File
@@ -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();
}
}