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

IDEA-76525 Git: "Branch not fully merged" dialog layout

Browse Source
This commit is contained in:
Kirill Likhodedov
2012-01-30 13:29:24 +04:00
parent b926d01af3
commit 1c9be9e282
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/ui/GitCommitListWithDiffPanel.java
+6 -5
View File
@@ -24,6 +24,7 @@ import git4idea.history.browser.GitCommit;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.awt.*;
import java.util.Collections;
import java.util.List;
@@ -35,24 +36,24 @@ import java.util.List;
*/
public class GitCommitListWithDiffPanel extends JPanel {
private final Project myProject;
private final ChangesBrowser myChangesBrowser;
private final GitCommitListPanel myCommitListPanel;
public GitCommitListWithDiffPanel(Project project, List<GitCommit> commits) {
myProject = project;
public GitCommitListWithDiffPanel(@NotNull Project project, @NotNull List<GitCommit> commits) {
super(new BorderLayout());
myCommitListPanel = new GitCommitListPanel(myProject, commits);
myCommitListPanel = new GitCommitListPanel(project, commits);
myCommitListPanel.addListSelectionListener(new Consumer<GitCommit>() {
@Override public void consume(GitCommit commit) {
myChangesBrowser.setChangesToDisplay(commit.getChanges());
}
});
myChangesBrowser = new ChangesBrowser(myProject, null, Collections.<Change>emptyList(), null, false, true, null, ChangesBrowser.MyUseCase.LOCAL_CHANGES, null);
myChangesBrowser = new ChangesBrowser(project, null, Collections.<Change>emptyList(), null, false, true, null, ChangesBrowser.MyUseCase.LOCAL_CHANGES, null);
myCommitListPanel.registerDiffAction(myChangesBrowser.getDiffAction());
Splitter splitter = new Splitter(false, 0.7f);
splitter.setHonorComponentsMinimumSize(false);
splitter.setFirstComponent(myCommitListPanel);
splitter.setSecondComponent(myChangesBrowser);
add(splitter);