From c2b3637ed1d69bcac11e95ef9533aa0c0fc12845 Mon Sep 17 00:00:00 2001 From: irengrig Date: Wed, 30 May 2012 21:02:52 +0400 Subject: [PATCH] IDEA-84062 Subversion: after project Sharing the CleanupWoringCopies progress dialog stays endlessly (cherry picked from commit 50ff150425241ae92c4e3f30cd44831bc3a0875e) --- .../idea/svn/actions/ShareWholeProject.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShareWholeProject.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShareWholeProject.java index 38d58a850156..46e9710b10e8 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShareWholeProject.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShareWholeProject.java @@ -16,6 +16,8 @@ package org.jetbrains.idea.svn.actions; import com.intellij.openapi.actionSystem.*; +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.AbstractVcsHelper; @@ -152,11 +154,16 @@ public class ShareWholeProject extends AnAction implements DumbAware { if (success || excThrown) { baseDir.refresh(true, true, new Runnable() { public void run() { - VcsDirtyScopeManager.getInstance(project).dirDirtyRecursively(project.getBaseDir()); - if (checker.isHadNoMappings() && SvnUtil.seemsLikeVersionedDir(baseDir)) { - final ProjectLevelVcsManager vcsManager = ProjectLevelVcsManager.getInstance(project); - vcsManager.setDirectoryMappings(Arrays.asList(new VcsDirectoryMapping("", SvnVcs.VCS_NAME))); - } + ApplicationManager.getApplication().invokeLater(new Runnable() { + @Override + public void run() { + VcsDirtyScopeManager.getInstance(project).dirDirtyRecursively(project.getBaseDir()); + if (checker.isHadNoMappings() && SvnUtil.seemsLikeVersionedDir(baseDir)) { + final ProjectLevelVcsManager vcsManager = ProjectLevelVcsManager.getInstance(project); + vcsManager.setDirectoryMappings(Arrays.asList(new VcsDirectoryMapping("", SvnVcs.VCS_NAME))); + } + } + }, ModalityState.NON_MODAL, project.getDisposed()); } }); }