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
116
117
118
119
120
121
122
123
124
|
/*
* Copyright 2000-2012 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.branch;
import com.intellij.openapi.application.ApplicationNamesInfo;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.ui.IdeBorderFactory;
import com.intellij.ui.components.JBLabel;
import com.intellij.util.ui.UIUtil;
import git4idea.GitPlatformFacade;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.util.concurrent.atomic.AtomicInteger;
import static com.intellij.openapi.util.text.StringUtil.capitalize;
/**
* The dialog that is shown when the error
* "Your local changes to the following files would be overwritten by merge/checkout"
* happens.
* Displays the list of these files and proposes to make a "smart" merge or checkout.
*/
public class GitSmartOperationDialog extends DialogWrapper {
public static final int SMART_EXIT_CODE = OK_EXIT_CODE;
public static final int FORCE_EXIT_CODE = NEXT_USER_EXIT_CODE;
@NotNull private final JComponent myFileBrowser;
@NotNull private final String myOperationTitle;
private final boolean myShowForceButton;
/**
* Shows the dialog with the list of local changes preventing merge/checkout and returns the dialog exit code.
*/
static int showAndGetAnswer(@NotNull final Project project, @NotNull final JComponent fileBrowser,
@NotNull final String operationTitle, final boolean showForceButton) {
final AtomicInteger exitCode = new AtomicInteger();
UIUtil.invokeAndWaitIfNeeded(new Runnable() {
@Override
public void run() {
GitSmartOperationDialog dialog = new GitSmartOperationDialog(project, fileBrowser, operationTitle, showForceButton);
ServiceManager.getService(project, GitPlatformFacade.class).showDialog(dialog);
exitCode.set(dialog.getExitCode());
}
});
return exitCode.get();
}
private GitSmartOperationDialog(@NotNull Project project, @NotNull JComponent fileBrowser, @NotNull String operationTitle,
boolean showForceButton) {
super(project);
myFileBrowser = fileBrowser;
myOperationTitle = operationTitle;
myShowForceButton = showForceButton;
String capitalizedOperation = capitalize(myOperationTitle);
setTitle("Git " + capitalizedOperation + " Problem");
setOKButtonText("Smart " + capitalizedOperation);
getOKAction().putValue(Action.SHORT_DESCRIPTION, "Stash local changes, " + operationTitle + ", unstash");
setCancelButtonText("Don't " + capitalizedOperation);
getCancelAction().putValue(FOCUSED_ACTION, Boolean.TRUE);
init();
}
@NotNull
@Override
protected Action[] createLeftSideActions() {
if (myShowForceButton) {
return new Action[] {new ForceCheckoutAction(myOperationTitle) };
}
return new Action[0];
}
@Override
protected JComponent createNorthPanel() {
JBLabel description = new JBLabel("<html>Your local changes to the following files would be overwritten by " + myOperationTitle +
".<br/>" + ApplicationNamesInfo.getInstance().getFullProductName() + " can stash the changes, "
+ myOperationTitle + " and unstash them after that.</html>");
description.setBorder(IdeBorderFactory.createEmptyBorder(0, 0, 10, 0));
return description;
}
@Override
protected JComponent createCenterPanel() {
return myFileBrowser;
}
@Override
protected String getDimensionServiceKey() {
return GitSmartOperationDialog.class.getName();
}
private class ForceCheckoutAction extends AbstractAction {
ForceCheckoutAction(@NotNull String operationTitle) {
super("&Force " + capitalize(operationTitle));
putValue(Action.SHORT_DESCRIPTION, capitalize(operationTitle) + " and overwrite local changes");
}
@Override
public void actionPerformed(ActionEvent e) {
close(FORCE_EXIT_CODE);
}
}
}
|
