Skip to content

Commit

Permalink
fix random startup notification "Insufficient dependencies for Gerrit…
Browse files Browse the repository at this point in the history
  • Loading branch information
uwolfer committed Oct 22, 2017
1 parent df751f3 commit ef256e2
Showing 1 changed file with 34 additions and 1 deletion.
Expand Up @@ -25,10 +25,13 @@
import com.intellij.openapi.actionSystem.Constraints;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.openapi.actionSystem.Separator;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.diff.DiffManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.SimpleToolWindowPanel;
import com.intellij.openapi.vcs.ProjectLevelVcsManager;
import com.intellij.openapi.vcs.VcsListener;
import com.intellij.openapi.vcs.changes.committed.RepositoryChangesBrowser;
import com.intellij.ui.IdeBorderFactory;
import com.intellij.ui.JBSplitter;
Expand All @@ -40,8 +43,12 @@
import com.urswolfer.intellij.plugin.gerrit.ui.diff.CommentsDiffTool;
import com.urswolfer.intellij.plugin.gerrit.ui.filter.ChangesFilter;
import com.urswolfer.intellij.plugin.gerrit.ui.filter.GerritChangesFilters;
import git4idea.GitUtil;
import git4idea.repo.GitRepository;
import git4idea.repo.GitRepositoryManager;

import javax.swing.*;
import java.util.List;
import java.util.Observable;
import java.util.Observer;

Expand Down Expand Up @@ -107,13 +114,39 @@ public void consume(ChangeInfo changeInfo) {

panel.setContent(horizontalSplitter);

reloadChanges(project, false);
List<GitRepository> repositories = GitUtil.getRepositoryManager(project).getRepositories();
if (!repositories.isEmpty()) {
reloadChanges(project, false);
}

registerVcsChangeListener(project);

changeListPanel.showSetupHintWhenRequired(project);

return panel;
}

private void registerVcsChangeListener(final Project project) {
VcsListener vcsListener = new VcsListener() {
@Override
public void directoryMappingChanged() {
forceGitRepositoryMappingInit(project);
}
};
project.getMessageBus().connect().subscribe(ProjectLevelVcsManager.VCS_CONFIGURATION_CHANGED, vcsListener);
}

private void forceGitRepositoryMappingInit(final Project project) {
ApplicationManager.getApplication().invokeLater(new Runnable() {
@Override
public void run() {
GitRepositoryManager repositoryManager = GitUtil.getRepositoryManager(project);
repositoryManager.getRepositoryForRoot(project.getBaseDir());
reloadChanges(project, false);
}
});
}

private void changeSelected(ChangeInfo changeInfo, final Project project) {
gerritUtil.getChangeDetails(changeInfo._number, project, new Consumer<ChangeInfo>() {
@Override
Expand Down

0 comments on commit ef256e2

Please sign in to comment.