|
20 | 20 | import com.google.common.base.Strings; |
21 | 21 | import com.google.gerrit.extensions.common.ChangeInfo; |
22 | 22 | import com.google.inject.Inject; |
| 23 | +import com.intellij.dvcs.repo.VcsRepositoryManager; |
| 24 | +import com.intellij.dvcs.repo.VcsRepositoryMappingListener; |
23 | 25 | import com.intellij.openapi.actionSystem.ActionManager; |
24 | 26 | import com.intellij.openapi.actionSystem.ActionToolbar; |
25 | 27 | import com.intellij.openapi.actionSystem.Constraints; |
26 | 28 | import com.intellij.openapi.actionSystem.DefaultActionGroup; |
27 | 29 | import com.intellij.openapi.actionSystem.Separator; |
28 | | -import com.intellij.openapi.application.ApplicationManager; |
29 | 30 | import com.intellij.openapi.diagnostic.Logger; |
30 | 31 | import com.intellij.openapi.project.Project; |
31 | 32 | import com.intellij.openapi.ui.SimpleToolWindowPanel; |
32 | | -import com.intellij.openapi.vcs.ProjectLevelVcsManager; |
33 | | -import com.intellij.openapi.vcs.VcsListener; |
34 | 33 | import com.intellij.openapi.vcs.changes.committed.RepositoryChangesBrowser; |
35 | 34 | import com.intellij.ui.IdeBorderFactory; |
36 | 35 | import com.intellij.ui.JBSplitter; |
|
43 | 42 | import com.urswolfer.intellij.plugin.gerrit.ui.filter.GerritChangesFilters; |
44 | 43 | import git4idea.GitUtil; |
45 | 44 | import git4idea.repo.GitRepository; |
46 | | -import git4idea.repo.GitRepositoryManager; |
47 | 45 |
|
48 | 46 | import javax.swing.*; |
49 | 47 | import java.util.List; |
@@ -120,24 +118,13 @@ public void consume(ChangeInfo changeInfo) { |
120 | 118 | } |
121 | 119 |
|
122 | 120 | private void registerVcsChangeListener(final Project project) { |
123 | | - VcsListener vcsListener = new VcsListener() { |
| 121 | + VcsRepositoryMappingListener vcsListener = new VcsRepositoryMappingListener() { |
124 | 122 | @Override |
125 | | - public void directoryMappingChanged() { |
126 | | - forceGitRepositoryMappingInit(project); |
127 | | - } |
128 | | - }; |
129 | | - project.getMessageBus().connect().subscribe(ProjectLevelVcsManager.VCS_CONFIGURATION_CHANGED, vcsListener); |
130 | | - } |
131 | | - |
132 | | - private void forceGitRepositoryMappingInit(final Project project) { |
133 | | - ApplicationManager.getApplication().invokeLater(new Runnable() { |
134 | | - @Override |
135 | | - public void run() { |
136 | | - GitRepositoryManager repositoryManager = GitUtil.getRepositoryManager(project); |
137 | | - repositoryManager.getRepositoryForRoot(project.getBaseDir()); |
| 123 | + public void mappingChanged() { |
138 | 124 | reloadChanges(project, false); |
139 | 125 | } |
140 | | - }); |
| 126 | + }; |
| 127 | + project.getMessageBus().connect().subscribe(VcsRepositoryManager.VCS_REPOSITORY_MAPPING_UPDATED, vcsListener); |
141 | 128 | } |
142 | 129 |
|
143 | 130 | private void changeSelected(ChangeInfo changeInfo, final Project project) { |
|
0 commit comments