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

git log in separate action: always check (init) git version before use

Browse Source
This commit is contained in:
irengrig
2011-08-26 13:26:54 +04:00
parent 42da2f4aca
commit 38362f810d
1 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/history/wholeTree/SelectRepositoryAndShowLogAction.java
+37 -12
View File
@@ -105,7 +105,8 @@ public class SelectRepositoryAndShowLogAction extends AnAction {
final ToolWindow window = ToolWindowManager.getInstance(project).getToolWindow(ChangesViewContentManager.TOOLWINDOW_ID);
final Project finalProject = project;
Runnable showContent = new Runnable() {
final Runnable showContent = new Runnable() {
@Override
public void run() {
ContentManager cm = window.getContentManager();
@@ -142,11 +143,18 @@ public class SelectRepositoryAndShowLogAction extends AnAction {
cm.setSelectedContent(content);
}
};
if (! window.isVisible()) {
window.activate(showContent, true);
} else {
showContent.run();
}
ProgressManager.getInstance().run(new MyCheckVersion(project) {
@Override
public void onSuccess() {
if (myVersion == null) return;
if (! window.isVisible()) {
window.activate(showContent, true);
} else {
showContent.run();
}
}
});
}
}
@@ -208,6 +216,7 @@ public class SelectRepositoryAndShowLogAction extends AnAction {
private static class MyPrepareToShowForDefaultProject extends Task.Backgroundable {
private Project myProject;
private final List<VirtualFile> myCorrectRoots;
private MyCheckVersion myVersion;
private MyPrepareToShowForDefaultProject(@Nullable Project project, List<VirtualFile> correctRoots) {
super(project, ourTitle, true, BackgroundFromStartOption.getInstance());
@@ -217,20 +226,36 @@ public class SelectRepositoryAndShowLogAction extends AnAction {
@Override
public void run(@NotNull ProgressIndicator indicator) {
myProject = ProjectManager.getInstance().getDefaultProject();
GitVcs vcs = GitVcs.getInstance(myProject);
GitVersion version = vcs.getVersion();
if (version == null) {
vcs.checkVersion();
}
if (version == null) return;
myVersion = new MyCheckVersion(myProject);
myVersion.run(indicator);
}
@Override
public void onSuccess() {
if (myVersion.myVersion == null) return;
if (myProject.isDisposed()) return;
new MyDialog(myProject, myCorrectRoots).show();
}
}
private static class MyCheckVersion extends Task.Backgroundable {
protected GitVersion myVersion;
private MyCheckVersion(@Nullable Project project) {
super(project, ourTitle, true, BackgroundFromStartOption.getInstance());
}
@Override
public void run(@NotNull ProgressIndicator indicator) {
GitVcs vcs = GitVcs.getInstance(myProject);
myVersion = vcs.getVersion();
if (myVersion == null) {
vcs.checkVersion();
}
myVersion = vcs.getVersion();
if (myVersion == null) return;
}
}
private static class MyDialog extends DialogWrapper {
private GitLog myGitLog;