Skip to content

Commit fdaa97a

Browse files
committed
simplify code: migrate VCS_CONFIGURATION_CHANGED to VCS_REPOSITORY_MAPPING_UPDATED
see: https://intellij-support.jetbrains.com/hc/en-us/community/posts/115000667650-
1 parent 9dac85b commit fdaa97a

1 file changed

Lines changed: 6 additions & 19 deletions

File tree

src/main/java/com/urswolfer/intellij/plugin/gerrit/ui/GerritToolWindow.java

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,16 @@
2020
import com.google.common.base.Strings;
2121
import com.google.gerrit.extensions.common.ChangeInfo;
2222
import com.google.inject.Inject;
23+
import com.intellij.dvcs.repo.VcsRepositoryManager;
24+
import com.intellij.dvcs.repo.VcsRepositoryMappingListener;
2325
import com.intellij.openapi.actionSystem.ActionManager;
2426
import com.intellij.openapi.actionSystem.ActionToolbar;
2527
import com.intellij.openapi.actionSystem.Constraints;
2628
import com.intellij.openapi.actionSystem.DefaultActionGroup;
2729
import com.intellij.openapi.actionSystem.Separator;
28-
import com.intellij.openapi.application.ApplicationManager;
2930
import com.intellij.openapi.diagnostic.Logger;
3031
import com.intellij.openapi.project.Project;
3132
import com.intellij.openapi.ui.SimpleToolWindowPanel;
32-
import com.intellij.openapi.vcs.ProjectLevelVcsManager;
33-
import com.intellij.openapi.vcs.VcsListener;
3433
import com.intellij.openapi.vcs.changes.committed.RepositoryChangesBrowser;
3534
import com.intellij.ui.IdeBorderFactory;
3635
import com.intellij.ui.JBSplitter;
@@ -43,7 +42,6 @@
4342
import com.urswolfer.intellij.plugin.gerrit.ui.filter.GerritChangesFilters;
4443
import git4idea.GitUtil;
4544
import git4idea.repo.GitRepository;
46-
import git4idea.repo.GitRepositoryManager;
4745

4846
import javax.swing.*;
4947
import java.util.List;
@@ -120,24 +118,13 @@ public void consume(ChangeInfo changeInfo) {
120118
}
121119

122120
private void registerVcsChangeListener(final Project project) {
123-
VcsListener vcsListener = new VcsListener() {
121+
VcsRepositoryMappingListener vcsListener = new VcsRepositoryMappingListener() {
124122
@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() {
138124
reloadChanges(project, false);
139125
}
140-
});
126+
};
127+
project.getMessageBus().connect().subscribe(VcsRepositoryManager.VCS_REPOSITORY_MAPPING_UPDATED, vcsListener);
141128
}
142129

143130
private void changeSelected(ChangeInfo changeInfo, final Project project) {

0 commit comments

Comments
 (0)