1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
/*
* Copyright 2000-2011 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package git4idea.ui.branch;
import com.intellij.dvcs.DvcsUtil;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.diff.impl.dir.FrameDialogWrapper;
import com.intellij.openapi.project.Project;
import com.intellij.ui.TabbedPaneImpl;
import git4idea.GitUtil;
import git4idea.repo.GitRepository;
import git4idea.util.GitCommitCompareInfo;
import icons.Git4ideaIcons;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
/**
* Dialog for comparing two Git branches.
*/
public class GitCompareBranchesDialog extends FrameDialogWrapper {
@NotNull private final Project myProject;
@NotNull private final JPanel myLogPanel;
@NotNull private final TabbedPaneImpl myTabbedPane;
@NotNull private final String myTitle;
@NotNull private final Mode myMode;
public GitCompareBranchesDialog(@NotNull Project project,
@NotNull String branchName,
@NotNull String currentBranchName,
@NotNull GitCommitCompareInfo compareInfo,
@NotNull GitRepository initialRepo) {
this(project, branchName, currentBranchName, compareInfo, initialRepo, false);
}
public GitCompareBranchesDialog(@NotNull Project project,
@NotNull String branchName,
@NotNull String currentBranchName,
@NotNull GitCommitCompareInfo compareInfo,
@NotNull GitRepository initialRepo,
boolean dialog) {
myProject = project;
String rootString;
if (compareInfo.getRepositories().size() == 1 && GitUtil.getRepositoryManager(myProject).moreThanOneRoot()) {
rootString = " in root " + DvcsUtil.getShortRepositoryName(initialRepo);
}
else {
rootString = "";
}
myTitle = String.format("Comparing %s with %s%s", currentBranchName, branchName, rootString);
myMode = dialog ? Mode.MODAL : Mode.FRAME;
JPanel diffPanel = new GitCompareBranchesDiffPanel(myProject, branchName, currentBranchName, compareInfo);
myLogPanel = new GitCompareBranchesLogPanel(myProject, branchName, currentBranchName, compareInfo, initialRepo);
myTabbedPane = new TabbedPaneImpl(SwingConstants.TOP);
myTabbedPane.addTab("Log", Git4ideaIcons.Branch, myLogPanel);
myTabbedPane.addTab("Diff", AllIcons.Actions.Diff, diffPanel);
myTabbedPane.setKeyboardNavigation(TabbedPaneImpl.DEFAULT_PREV_NEXT_SHORTCUTS);
}
@NotNull
@Override
protected JComponent getPanel() {
return myTabbedPane;
}
@Nullable
@Override
protected JComponent getPreferredFocusedComponent() {
return myLogPanel;
}
@Nullable
@Override
protected String getDimensionServiceKey() {
return GitCompareBranchesDialog.class.getName();
}
@NotNull
@Override
protected String getTitle() {
return myTitle;
}
@NotNull
@Override
protected Project getProject() {
return myProject;
}
@NotNull
@Override
protected Mode getMode() {
return myMode;
}
}
|
